Skip to content

Commit 28b3f34

Browse files
hurcanehurcane
committed
Update targets to support Visual Studio 2019 and remove 2012 and 2013.
1 parent 5328ca0 commit 28b3f34

5 files changed

Lines changed: 58 additions & 31 deletions

File tree

‎Microsoft.InteropFormTools.InteropFormProxyGenerator.sln‎

Lines changed: 2 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.24720.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26403.7
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Microsoft.InteropFormTools.InteropFormProxyGenerator", "Microsoft.InteropFormTools.InteropFormProxyGenerator\Microsoft.InteropFormTools.InteropFormProxyGenerator.vbproj", "{5917F213-ECA0-43FE-81F0-444A48D4CC8F}"
77
EndProject

‎Microsoft.InteropFormTools.InteropFormProxyGenerator/Microsoft.InteropFormTools.InteropFormProxyGenerator.vbproj‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" />
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\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>
1010
<VsixType>v3</VsixType>
11+
<FileUpgradeFlags>
12+
</FileUpgradeFlags>
13+
<UpgradeBackupLocation>
14+
</UpgradeBackupLocation>
15+
<OldToolsVersion>14.0</OldToolsVersion>
16+
<PublishUrl>publish\</PublishUrl>
17+
<Install>true</Install>
18+
<InstallFrom>Disk</InstallFrom>
19+
<UpdateEnabled>false</UpdateEnabled>
20+
<UpdateMode>Foreground</UpdateMode>
21+
<UpdateInterval>7</UpdateInterval>
22+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
23+
<UpdatePeriodically>false</UpdatePeriodically>
24+
<UpdateRequired>false</UpdateRequired>
25+
<MapFileExtensions>true</MapFileExtensions>
26+
<ApplicationRevision>0</ApplicationRevision>
27+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
28+
<IsWebBootstrapper>false</IsWebBootstrapper>
29+
<UseApplicationTrust>false</UseApplicationTrust>
30+
<BootstrapperEnabled>true</BootstrapperEnabled>
1131
</PropertyGroup>
1232
<PropertyGroup>
1333
<OptionExplicit>On</OptionExplicit>
@@ -49,7 +69,8 @@
4969
<DefineDebug>true</DefineDebug>
5070
<DefineTrace>true</DefineTrace>
5171
<ErrorReport>prompt</ErrorReport>
52-
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
72+
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42353,42354,42355</NoWarn>
73+
<DeployExtension>True</DeployExtension>
5374
</PropertyGroup>
5475
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5576
<DebugType>pdbonly</DebugType>
@@ -58,7 +79,7 @@
5879
<DefineDebug>false</DefineDebug>
5980
<DefineTrace>true</DefineTrace>
6081
<ErrorReport>prompt</ErrorReport>
61-
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
82+
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42353,42354,42355</NoWarn>
6283
</PropertyGroup>
6384
<ItemGroup>
6485
<None Include="Key.snk" />
@@ -206,16 +227,23 @@
206227
<ManifestResourceName>VSPackage</ManifestResourceName>
207228
</EmbeddedResource>
208229
</ItemGroup>
230+
<ItemGroup>
231+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
232+
<Visible>False</Visible>
233+
<ProductName>.NET Framework 3.5 SP1</ProductName>
234+
<Install>false</Install>
235+
</BootstrapperPackage>
236+
</ItemGroup>
209237
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
210238
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
211239
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
212240
<PropertyGroup>
213241
<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>
214242
</PropertyGroup>
215-
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props'))" />
216-
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets'))" />
243+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props'))" />
244+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets'))" />
217245
</Target>
218-
<Import Project="..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
246+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
219247
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
220248
Other similar extension points exist, see Microsoft.Common.targets.
221249
<Target Name="BeforeBuild">

‎Microsoft.InteropFormTools.InteropFormProxyGenerator/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<packages>
33
<package id="Microsoft.VisualStudio.Imaging" version="14.1.24720" targetFramework="net45" />
44
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net45" />
5-
<package id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" version="14.0.23-pre" targetFramework="net45" developmentDependency="true" />
65
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.1.24720" targetFramework="net45" />
76
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net45" />
87
<package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net45" />
@@ -19,4 +18,5 @@
1918
<package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net45" />
2019
<package id="Microsoft.VisualStudio.Utilities" version="14.1.24720" targetFramework="net45" />
2120
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net45" />
21+
<package id="Microsoft.VSSDK.BuildTools" version="15.0.26201" targetFramework="net45" developmentDependency="true" />
2222
</packages>

‎Microsoft.InteropFormTools.InteropFormProxyGenerator/source.extension.vsixmanifest‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
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="Microsoft.InteropFormTools.InteropFormProxyGenerator.Don Benson.5e81461e-5e5e-4eea-bf90-5999952fd0d9" Version="1.1" Language="en-US" Publisher="Don Benson" />
5-
<DisplayName>Microsoft Interop Form Tools Proxy Generator</DisplayName>
6-
<Description xml:space="preserve">Proxy Generator command converted from add-in with Microsoft InteropForms Toolkit 2.1.</Description>
7-
</Metadata>
8-
<Installation>
9-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[11.0,16.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" DisplayName="Visual Studio MPF" d:Source="Installed" Version="[11.0,16.0)" />
14-
</Dependencies>
15-
<Assets>
16-
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
17-
</Assets>
18-
<Prerequisites>
19-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25904.2,16.0)" DisplayName="Visual Studio core editor" />
20-
</Prerequisites>
3+
<Metadata>
4+
<Identity Id="Microsoft.InteropFormTools.InteropFormProxyGenerator.Don Benson.5e81461e-5e5e-4eea-bf90-5999952fd0d9" Version="1.2" Language="en-US" Publisher="Don Benson" />
5+
<DisplayName>Microsoft Interop Form Tools Proxy Generator</DisplayName>
6+
<Description xml:space="preserve">Proxy Generator command converted from add-in with Microsoft InteropForms Toolkit 2.1.</Description>
7+
</Metadata>
8+
<Installation>
9+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[11.0,17.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" DisplayName="Visual Studio MPF" d:Source="Installed" Version="[11.0,17.0)" />
14+
</Dependencies>
15+
<Assets>
16+
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
17+
</Assets>
18+
<Prerequisites>
19+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
20+
</Prerequisites>
2121
</PackageManifest>

‎ReadMe.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ Note: Microsoft removed the official download page. This link downloads from arc
1010

1111
Supported Environments
1212
=================================
13-
* Visual Studio 2012
14-
* Visual Studio 2013
1513
* Visual Studio 2015
1614
* Visual Studio 2017
15+
* Visual Studio 2019
1716

1817
Usage
1918
=================================

0 commit comments

Comments
 (0)