Skip to content

Commit 492c381

Browse files
froquefroque
committed
update to support Visual Studio 1017
1 parent b8ed4ae commit 492c381

File tree

5 files changed

+39
-25
lines changed

5 files changed

+39
-25
lines changed

‎VSIXInteropFormsToolkit.sln‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27004.2006
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VSIXInteropFormsToolkit", "VSIXInteropFormsToolkit\VSIXInteropFormsToolkit.csproj", "{D1750130-1B60-4312-8AB7-AA1F89D416AC}"
77
EndProject
@@ -19,4 +19,7 @@ Global
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE
2121
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {3256C6EB-86B8-4A64-BDF8-A9FC59E0F1B0}
24+
EndGlobalSection
2225
EndGlobal

‎VSIXInteropFormsToolkit/Resource.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VSIXInteropFormsToolkit/VSIXInteropFormsToolkit.csproj‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.props')" />
3+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.props')" />
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
5+
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
66
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
77
<NuGetPackageImportStamp>
88
</NuGetPackageImportStamp>
99
<UseCodebase>true</UseCodebase>
10+
<FileUpgradeFlags>
11+
</FileUpgradeFlags>
12+
<UpgradeBackupLocation>
13+
</UpgradeBackupLocation>
14+
<OldToolsVersion>14.0</OldToolsVersion>
1015
</PropertyGroup>
1116
<PropertyGroup>
1217
<SignAssembly>true</SignAssembly>
@@ -62,7 +67,9 @@
6267
</ItemGroup>
6368
<ItemGroup>
6469
<None Include="Key.snk" />
65-
<None Include="packages.config" />
70+
<None Include="packages.config">
71+
<SubType>Designer</SubType>
72+
</None>
6673
<None Include="source.extension.vsixmanifest">
6774
<SubType>Designer</SubType>
6875
</None>
@@ -201,10 +208,10 @@
201208
<PropertyGroup>
202209
<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>
203210
</PropertyGroup>
204-
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.props'))" />
205-
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.targets'))" />
211+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.props'))" />
212+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets'))" />
206213
</Target>
207-
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.targets')" />
214+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets')" />
208215
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
209216
Other similar extension points exist, see Microsoft.Common.targets.
210217
<Target Name="BeforeBuild">

‎VSIXInteropFormsToolkit/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
<package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net452" />
1919
<package id="Microsoft.VisualStudio.Utilities" version="14.2.25123" targetFramework="net452" />
2020
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net452" />
21-
<package id="Microsoft.VSSDK.BuildTools" version="14.2.25123" targetFramework="net452" developmentDependency="true" />
21+
<package id="Microsoft.VSSDK.BuildTools" version="15.6.170" targetFramework="net452" developmentDependency="true" />
2222
</packages>

‎VSIXInteropFormsToolkit/source.extension.vsixmanifest‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
3-
<Metadata>
4-
<Identity Id="VSIXInteropFormsToolkit.Filipe Roque.2422aed9-021d-477e-b4d6-ba06c0434e69" Version="1.2" Language="en-US" Publisher="Filipe Roque" />
5-
<DisplayName>VSIXInteropFormsToolkit</DisplayName>
6-
<Description xml:space="preserve">Command tool to generate interop wrapper classes</Description>
7-
</Metadata>
8-
<Installation>
9-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
10-
</Installation>
11-
<Dependencies>
12-
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
13-
<Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0]" />
14-
</Dependencies>
15-
<Assets>
16-
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
17-
</Assets>
3+
<Metadata>
4+
<Identity Id="VSIXInteropFormsToolkit.Filipe Roque.2422aed9-021d-477e-b4d6-ba06c0434e69" Version="1.3" Language="en-US" Publisher="Filipe Roque" />
5+
<DisplayName>VSIXInteropFormsToolkit</DisplayName>
6+
<Description xml:space="preserve">Command tool to generate interop wrapper classes</Description>
7+
</Metadata>
8+
<Installation>
9+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
10+
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Community" />
11+
</Installation>
12+
<Dependencies>
13+
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
14+
<Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0]" />
15+
</Dependencies>
16+
<Assets>
17+
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
18+
</Assets>
19+
<Prerequisites>
20+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
21+
</Prerequisites>
1822
</PackageManifest>

0 commit comments

Comments
 (0)