Skip to content

Commit 4bd611b

Browse files
snys98snys98
committed
fix nuget packages
1 parent 79bdc4a commit 4bd611b

3 files changed

Lines changed: 51 additions & 36 deletions

File tree

‎src/TypeScriptDefinitionGenerator/TypeScriptDefinitionGenerator.csproj‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.props')" />
3+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props')" />
44
<PropertyGroup>
55
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
66
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -9,6 +9,8 @@
99
<StartArguments>/rootsuffix Exp</StartArguments>
1010
<UseCodebase>true</UseCodebase>
1111
<TargetFrameworkProfile />
12+
<NuGetPackageImportStamp>
13+
</NuGetPackageImportStamp>
1214
</PropertyGroup>
1315
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1416
<PropertyGroup>
@@ -21,7 +23,7 @@
2123
<AppDesignerFolder>Properties</AppDesignerFolder>
2224
<RootNamespace>TypeScriptDefinitionGenerator</RootNamespace>
2325
<AssemblyName>TypeScriptDefinitionGenerator</AssemblyName>
24-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
26+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
2527
<GeneratePkgDefFile>true</GeneratePkgDefFile>
2628
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
2729
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
@@ -78,6 +80,7 @@
7880
<Link>Resources\LICENSE</Link>
7981
<IncludeInVSIX>true</IncludeInVSIX>
8082
</Content>
83+
<None Include="app.config" />
8184
<None Include="packages.config" />
8285
<None Include="source.extension.vsixmanifest">
8386
<SubType>Designer</SubType>
@@ -116,23 +119,20 @@
116119
<Private>True</Private>
117120
</Reference>
118121
<Reference Include="Microsoft.VisualStudio.Imaging, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
119-
<HintPath>..\..\packages\Microsoft.VisualStudio.Imaging.15.0.26109-RC3\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
122+
<HintPath>..\..\packages\Microsoft.VisualStudio.Imaging.15.4.27004\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
120123
<Private>True</Private>
121-
<Private>False</Private>
122124
</Reference>
123125
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124-
<HintPath>..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
125-
<Private>False</Private>
126+
<HintPath>..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
127+
<Private>True</Private>
126128
</Reference>
127129
<Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
128-
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.15.0.15.0.26109-RC3\lib\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
130+
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.15.0.15.4.27004\lib\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
129131
<Private>True</Private>
130-
<Private>False</Private>
131132
</Reference>
132133
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
133-
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26109-RC3\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
134+
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Framework.15.4.27004\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
134135
<Private>True</Private>
135-
<Private>False</Private>
136136
</Reference>
137137
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
138138
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
@@ -153,6 +153,11 @@
153153
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
154154
<Private>True</Private>
155155
</Reference>
156+
<Reference Include="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
157+
<EmbedInteropTypes>True</EmbedInteropTypes>
158+
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime.15.0.26606\lib\net20\Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime.dll</HintPath>
159+
<Private>True</Private>
160+
</Reference>
156161
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
157162
<HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
158163
<Private>False</Private>
@@ -190,9 +195,8 @@
190195
<Private>False</Private>
191196
</Reference>
192197
<Reference Include="Microsoft.VisualStudio.TextTemplating.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
193-
<HintPath>..\..\packages\Microsoft.VisualStudio.TextTemplating.15.0.15.0.26105-RC3\lib\net45\Microsoft.VisualStudio.TextTemplating.15.0.dll</HintPath>
198+
<HintPath>..\..\packages\Microsoft.VisualStudio.TextTemplating.15.0.15.4.27004\lib\net45\Microsoft.VisualStudio.TextTemplating.15.0.dll</HintPath>
194199
<Private>True</Private>
195-
<Private>False</Private>
196200
</Reference>
197201
<Reference Include="Microsoft.VisualStudio.TextTemplating.Interfaces.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
198202
<HintPath>..\..\packages\Microsoft.VisualStudio.TextTemplating.Interfaces.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.TextTemplating.Interfaces.10.0.dll</HintPath>
@@ -203,23 +207,19 @@
203207
<Private>False</Private>
204208
</Reference>
205209
<Reference Include="Microsoft.VisualStudio.TextTemplating.VSHost.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
206-
<HintPath>..\..\packages\Microsoft.VisualStudio.TextTemplating.VSHost.15.0.15.0.25726-Preview5\lib\Microsoft.VisualStudio.TextTemplating.VSHost.15.0.dll</HintPath>
207-
<Private>False</Private>
208-
</Reference>
209-
<Reference Include="Microsoft.VisualStudio.Threading, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
210-
<HintPath>..\..\packages\Microsoft.VisualStudio.Threading.15.0.109-pre\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
210+
<HintPath>..\..\packages\Microsoft.VisualStudio.TextTemplating.VSHost.15.0.15.4.27004\lib\Microsoft.VisualStudio.TextTemplating.VSHost.15.0.dll</HintPath>
211211
<Private>True</Private>
212-
<Private>False</Private>
212+
</Reference>
213+
<Reference Include="Microsoft.VisualStudio.Threading, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
214+
<HintPath>..\..\packages\Microsoft.VisualStudio.Threading.15.4.4\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
213215
</Reference>
214216
<Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
215-
<HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.15.0.26109-RC3\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
217+
<HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.15.4.27004\lib\net46\Microsoft.VisualStudio.Utilities.dll</HintPath>
216218
<Private>True</Private>
217-
<Private>False</Private>
218219
</Reference>
219-
<Reference Include="Microsoft.VisualStudio.Validation, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
220-
<HintPath>..\..\packages\Microsoft.VisualStudio.Validation.15.0.55-pre\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
220+
<Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
221+
<HintPath>..\..\packages\Microsoft.VisualStudio.Validation.15.3.32\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
221222
<Private>True</Private>
222-
<Private>False</Private>
223223
</Reference>
224224
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
225225
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -264,14 +264,16 @@
264264
</ItemGroup>
265265
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
266266
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
267+
<Import Project="..\..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
267268
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
268269
<PropertyGroup>
269270
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
270271
</PropertyGroup>
271-
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.props'))" />
272-
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.targets'))" />
272+
<Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets'))" />
273+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props'))" />
274+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets'))" />
273275
</Target>
274-
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.targets')" />
276+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets')" />
275277
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
276278
Other similar extension points exist, see Microsoft.Common.targets.
277279
<Target Name="BeforeBuild">

‎src/TypeScriptDefinitionGenerator/app.config‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎src/TypeScriptDefinitionGenerator/packages.config‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
<packages>
33
<package id="Microsoft.VisualStudio.CoreUtility" version="15.4.27004" targetFramework="net46" />
44
<package id="Microsoft.VisualStudio.Editor" version="15.4.27004" targetFramework="net46" />
5-
<package id="Microsoft.VisualStudio.Imaging" version="15.0.26109-RC3" targetFramework="net46" />
6-
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
7-
<package id="Microsoft.VisualStudio.Shell.15.0" version="15.0.26109-RC3" targetFramework="net46" />
8-
<package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26109-RC3" targetFramework="net46" />
5+
<package id="Microsoft.VisualStudio.Imaging" version="15.4.27004" targetFramework="net462" />
6+
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net462" />
7+
<package id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" version="15.0.12" targetFramework="net462" />
8+
<package id="Microsoft.VisualStudio.Shell.15.0" version="15.4.27004" targetFramework="net462" />
9+
<package id="Microsoft.VisualStudio.Shell.Framework" version="15.4.27004" targetFramework="net462" />
910
<package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net46" />
1011
<package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net46" />
1112
<package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61030" targetFramework="net46" />
1213
<package id="Microsoft.VisualStudio.Shell.Interop.12.0" version="12.0.30110" targetFramework="net46" />
14+
<package id="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime" version="15.0.26606" targetFramework="net462" />
1315
<package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net46" />
1416
<package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net46" />
1517
<package id="Microsoft.VisualStudio.Text.Data" version="15.4.27004" targetFramework="net46" />
@@ -18,13 +20,13 @@
1820
<package id="Microsoft.VisualStudio.Text.UI.Wpf" version="15.4.27004" targetFramework="net46" />
1921
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net46" />
2022
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net46" />
21-
<package id="Microsoft.VisualStudio.TextTemplating.15.0" version="15.0.26105-RC3" targetFramework="net46" />
23+
<package id="Microsoft.VisualStudio.TextTemplating.15.0" version="15.4.27004" targetFramework="net462" />
2224
<package id="Microsoft.VisualStudio.TextTemplating.Interfaces.10.0" version="10.0.30319" targetFramework="net46" />
2325
<package id="Microsoft.VisualStudio.TextTemplating.Interfaces.11.0" version="11.0.50727" targetFramework="net46" />
24-
<package id="Microsoft.VisualStudio.TextTemplating.VSHost.15.0" version="15.0.25726-Preview5" targetFramework="net46" />
25-
<package id="Microsoft.VisualStudio.Threading" version="15.0.109-pre" targetFramework="net46" />
26-
<package id="Microsoft.VisualStudio.Utilities" version="15.0.26109-RC3" targetFramework="net46" />
27-
<package id="Microsoft.VisualStudio.Validation" version="15.0.55-pre" targetFramework="net46" />
28-
<package id="Microsoft.VSSDK.BuildTools" version="15.0.26109-RC3" targetFramework="net46" developmentDependency="true" />
26+
<package id="Microsoft.VisualStudio.TextTemplating.VSHost.15.0" version="15.4.27004" targetFramework="net462" />
27+
<package id="Microsoft.VisualStudio.Threading" version="15.4.4" targetFramework="net462" />
28+
<package id="Microsoft.VisualStudio.Utilities" version="15.4.27004" targetFramework="net462" />
29+
<package id="Microsoft.VisualStudio.Validation" version="15.3.32" targetFramework="net462" />
30+
<package id="Microsoft.VSSDK.BuildTools" version="15.5.72" targetFramework="net462" developmentDependency="true" />
2931
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
3032
</packages>

0 commit comments

Comments
 (0)