Skip to content

Commit e66788b

Browse files
froquefroque
authored
Merge pull request #9 from froque/support_vs2022
Add support for Visual Studio 2022
2 parents e0912b7 + dfb4afa commit e66788b

File tree

5 files changed

+32
-142
lines changed

5 files changed

+32
-142
lines changed

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ When forms with unsupported parameter types are found, the initialize method wil
2525

2626
* Visual Studio 2015
2727
* Visual Studio 2017
28+
* Visual Studio 2019
29+
* Visual Studio 2022
2830

2931
### How to Debug
3032

@@ -40,12 +42,11 @@ Open project properties
4042

4143

4244
## Upgrade
43-
* [How to: Update a Visual Studio Extension](https://msdn.microsoft.com/en-us/library/dd997169.aspx)
45+
* Update a Visual Studio extension](https://learn.microsoft.com/en-us/visualstudio/extensibility/how-to-update-a-visual-studio-extension?view=vs-2022)
4446
* edit version in source.extension.vsixmanifest
4547
* compile project
4648
* upload .vsix file to [Visual Studio Marketplace](https://visualstudiogallery.msdn.microsoft.com/)
4749

4850
## Compile from console
49-
nuget restore VSIXInteropFormsToolkit.sln
50-
"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" /t:Clean /p:Configuration=Release "VSIXInteropFormsToolkit.sln"
51-
"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" /p:Configuration=Release /p:DeployExtension=false "VSIXInteropFormsToolkit.sln"
51+
"C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" /t:Clean /p:Configuration=Release "VSIXInteropFormsToolkit.sln"
52+
"C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" /p:Configuration=Release /p:DeployExtension=false "VSIXInteropFormsToolkit.sln"

‎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: 15 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
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.15.6.170\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.props')" />
43
<PropertyGroup>
54
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
65
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -12,6 +11,7 @@
1211
<UpgradeBackupLocation>
1312
</UpgradeBackupLocation>
1413
<OldToolsVersion>14.0</OldToolsVersion>
14+
<TargetFrameworkProfile />
1515
</PropertyGroup>
1616
<PropertyGroup>
1717
<SignAssembly>true</SignAssembly>
@@ -30,7 +30,7 @@
3030
<AppDesignerFolder>Properties</AppDesignerFolder>
3131
<RootNamespace>VSIXInteropFormsToolkit</RootNamespace>
3232
<AssemblyName>VSIXInteropFormsToolkit</AssemblyName>
33-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
33+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
3434
<GeneratePkgDefFile>true</GeneratePkgDefFile>
3535
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
3636
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
@@ -67,9 +67,6 @@
6767
</ItemGroup>
6868
<ItemGroup>
6969
<None Include="Key.snk" />
70-
<None Include="packages.config">
71-
<SubType>Designer</SubType>
72-
</None>
7370
<None Include="source.extension.vsixmanifest">
7471
<SubType>Designer</SubType>
7572
</None>
@@ -85,105 +82,7 @@
8582
<Content Include="stylesheet.css" />
8683
</ItemGroup>
8784
<ItemGroup>
88-
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
89-
<EmbedInteropTypes>False</EmbedInteropTypes>
90-
</Reference>
91-
<Reference Include="EnvDTE100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
92-
<EmbedInteropTypes>False</EmbedInteropTypes>
93-
</Reference>
94-
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
95-
<EmbedInteropTypes>False</EmbedInteropTypes>
96-
</Reference>
97-
<Reference Include="EnvDTE90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
98-
<EmbedInteropTypes>False</EmbedInteropTypes>
99-
</Reference>
100-
<Reference Include="Microsoft.Build.Framework" />
10185
<Reference Include="Microsoft.CSharp" />
102-
<Reference Include="Microsoft.InteropFormTools, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
103-
<HintPath>..\packages\interopformsredist.1.0.0\lib\net20\Microsoft.InteropFormTools.dll</HintPath>
104-
<Private>True</Private>
105-
</Reference>
106-
<Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
107-
<EmbedInteropTypes>False</EmbedInteropTypes>
108-
</Reference>
109-
<Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
110-
<HintPath>..\packages\Microsoft.VisualStudio.Imaging.14.2.25123\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
111-
<Private>True</Private>
112-
</Reference>
113-
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
114-
<HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
115-
<Private>True</Private>
116-
</Reference>
117-
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
118-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.2.25123\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
119-
<Private>True</Private>
120-
</Reference>
121-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
122-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
123-
<Private>True</Private>
124-
</Reference>
125-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
126-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
127-
<Private>True</Private>
128-
</Reference>
129-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
130-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
131-
<Private>True</Private>
132-
</Reference>
133-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
134-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.2.25123\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
135-
<Private>True</Private>
136-
</Reference>
137-
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
138-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
139-
<Private>True</Private>
140-
</Reference>
141-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142-
<EmbedInteropTypes>True</EmbedInteropTypes>
143-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
144-
<Private>True</Private>
145-
</Reference>
146-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
147-
<EmbedInteropTypes>True</EmbedInteropTypes>
148-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
149-
<Private>True</Private>
150-
</Reference>
151-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
152-
<EmbedInteropTypes>True</EmbedInteropTypes>
153-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
154-
<Private>True</Private>
155-
</Reference>
156-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
157-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
158-
<Private>True</Private>
159-
</Reference>
160-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
161-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
162-
<Private>True</Private>
163-
</Reference>
164-
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
165-
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
166-
<Private>True</Private>
167-
</Reference>
168-
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
169-
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
170-
<Private>True</Private>
171-
</Reference>
172-
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
173-
<HintPath>..\packages\Microsoft.VisualStudio.Threading.14.1.111\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
174-
<Private>True</Private>
175-
</Reference>
176-
<Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
177-
<HintPath>..\packages\Microsoft.VisualStudio.Utilities.14.2.25123\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
178-
<Private>True</Private>
179-
</Reference>
180-
<Reference Include="Microsoft.VisualStudio.Validation, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
181-
<HintPath>..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
182-
<Private>True</Private>
183-
</Reference>
184-
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
185-
<EmbedInteropTypes>False</EmbedInteropTypes>
186-
</Reference>
18786
<Reference Include="System" />
18887
<Reference Include="System.Data" />
18988
<Reference Include="System.Design" />
@@ -202,16 +101,21 @@
202101
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
203102
</EmbeddedResource>
204103
</ItemGroup>
104+
<ItemGroup>
105+
<PackageReference Include="interopformsredist">
106+
<Version>1.0.0</Version>
107+
</PackageReference>
108+
<PackageReference Include="Microsoft.VisualStudio.SDK">
109+
<Version>17.7.37357</Version>
110+
</PackageReference>
111+
<PackageReference Include="Microsoft.VSSDK.BuildTools">
112+
<Version>17.7.2196</Version>
113+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
114+
<PrivateAssets>all</PrivateAssets>
115+
</PackageReference>
116+
</ItemGroup>
205117
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
206118
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
207-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
208-
<PropertyGroup>
209-
<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>
210-
</PropertyGroup>
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'))" />
213-
</Target>
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')" />
215119
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
216120
Other similar extension points exist, see Microsoft.Common.targets.
217121
<Target Name="BeforeBuild">

‎VSIXInteropFormsToolkit/packages.config‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎VSIXInteropFormsToolkit/source.extension.vsixmanifest‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
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">
33
<Metadata>
4-
<Identity Id="VSIXInteropFormsToolkit.Filipe Roque.2422aed9-021d-477e-b4d6-ba06c0434e69" Version="1.5" Language="en-US" Publisher="Filipe Roque" />
4+
<Identity Id="VSIXInteropFormsToolkit.Filipe Roque.2422aed9-021d-477e-b4d6-ba06c0434e69" Version="2.0" Language="en-US" Publisher="Filipe Roque" />
55
<DisplayName>VSIXInteropFormsToolkit</DisplayName>
66
<Description xml:space="preserve">Command tool to generate interop wrapper classes</Description>
77
</Metadata>
88
<Installation>
99
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
1010
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Community" />
11+
<InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Community">
12+
<ProductArchitecture>amd64</ProductArchitecture>
13+
</InstallationTarget>
14+
<InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Community">
15+
<ProductArchitecture>x86</ProductArchitecture>
16+
</InstallationTarget>
17+
<InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Community">
18+
<ProductArchitecture>arm64</ProductArchitecture>
19+
</InstallationTarget>
1120
</Installation>
1221
<Dependencies>
1322
<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]" />
1523
</Dependencies>
1624
<Assets>
1725
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
1826
</Assets>
1927
<Prerequisites>
20-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,17.0)" DisplayName="Visual Studio core editor" />
28+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,18.0)" DisplayName="Visual Studio core editor" />
2129
</Prerequisites>
2230
</PackageManifest>

0 commit comments

Comments
 (0)