Skip to content

Commit 98e6dcf

Browse files
awulkiewawulkiew
committed
Add support for VS2022 and drop for older versions
Bump version to 0.5
1 parent 434b624 commit 98e6dcf

File tree

5 files changed

+52
-203
lines changed

5 files changed

+52
-203
lines changed

‎solution/GraphicalDebugging/GraphicalDebugging.csproj‎

Lines changed: 23 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
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.VSSDK.BuildTools.15.7.104\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.7.104\build\Microsoft.VSSDK.BuildTools.props')" />
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
43
<PropertyGroup>
5-
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
4+
<MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
65
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
7-
<NuGetPackageImportStamp>
8-
</NuGetPackageImportStamp>
9-
<UseCodebase>true</UseCodebase>
10-
<FileUpgradeFlags>
11-
</FileUpgradeFlags>
12-
<UpgradeBackupLocation>
13-
</UpgradeBackupLocation>
14-
<OldToolsVersion>14.0</OldToolsVersion>
15-
</PropertyGroup>
16-
<PropertyGroup>
17-
<VsixType>v3</VsixType>
18-
</PropertyGroup>
19-
<PropertyGroup>
20-
<SignAssembly>false</SignAssembly>
21-
</PropertyGroup>
22-
<PropertyGroup>
23-
<AssemblyOriginatorKeyFile>
24-
</AssemblyOriginatorKeyFile>
256
</PropertyGroup>
267
<PropertyGroup>
278
<ApplicationIcon>icon.ico</ApplicationIcon>
@@ -37,13 +18,14 @@
3718
<AppDesignerFolder>Properties</AppDesignerFolder>
3819
<RootNamespace>GraphicalDebugging</RootNamespace>
3920
<AssemblyName>GraphicalDebugging</AssemblyName>
40-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
21+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
4122
<GeneratePkgDefFile>true</GeneratePkgDefFile>
23+
<UseCodebase>true</UseCodebase>
4224
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
43-
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
44-
<IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
25+
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
26+
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
4527
<CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
46-
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
28+
<CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
4729
<StartAction>Program</StartAction>
4830
<StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
4931
<StartArguments>/rootsuffix Exp</StartArguments>
@@ -121,9 +103,6 @@
121103
<Compile Include="Wrappers.cs" />
122104
</ItemGroup>
123105
<ItemGroup>
124-
<None Include="packages.config">
125-
<SubType>Designer</SubType>
126-
</None>
127106
<None Include="source.extension.vsixmanifest">
128107
<SubType>Designer</SubType>
129108
</None>
@@ -198,113 +177,11 @@
198177
</Page>
199178
</ItemGroup>
200179
<ItemGroup>
201-
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
202-
<EmbedInteropTypes>False</EmbedInteropTypes>
203-
<HintPath>..\packages\VSSDK.DTE.7.0.4\lib\net20\envdte.dll</HintPath>
204-
<Private>True</Private>
205-
</Reference>
206-
<Reference Include="envdte80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
207-
<EmbedInteropTypes>False</EmbedInteropTypes>
208-
<HintPath>..\packages\VSSDK.DTE.8.8.0.4\lib\net20\envdte80.dll</HintPath>
209-
<Private>True</Private>
210-
</Reference>
211-
<Reference Include="Microsoft.Build.Framework" />
212-
<Reference Include="Microsoft.CSharp" />
213-
<Reference Include="Microsoft.VisualStudio.Debugger.Engine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
214-
<HintPath>..\packages\Microsoft.VisualStudio.Debugger.Engine.14.3.25422\lib\net45\Microsoft.VisualStudio.Debugger.Engine.dll</HintPath>
215-
</Reference>
216-
<Reference Include="Microsoft.VisualStudio.Debugger.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
217-
<HintPath>..\packages\Microsoft.VisualStudio.Debugger.Interop.11.0.11.0.50728\lib\net20\Microsoft.VisualStudio.Debugger.Interop.11.0.dll</HintPath>
218-
</Reference>
219-
<Reference Include="Microsoft.VisualStudio.Debugger.InteropA, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
220-
<HintPath>..\packages\Microsoft.VisualStudio.Debugger.InteropA.9.0.21023\lib\net10\Microsoft.VisualStudio.Debugger.InteropA.dll</HintPath>
221-
</Reference>
222-
<Reference Include="Microsoft.VisualStudio.GraphModel, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
223-
<HintPath>..\packages\VSSDK.GraphModel.12.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll</HintPath>
224-
<Private>False</Private>
225-
</Reference>
226-
<Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
227-
<HintPath>..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
228-
</Reference>
229-
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
230-
<HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
231-
</Reference>
232-
<Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
233-
<HintPath>..\packages\VSSDK.Shell.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
234-
<Private>False</Private>
235-
</Reference>
236-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
237-
<HintPath>..\packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
238-
<Private>True</Private>
239-
<Private>False</Private>
240-
</Reference>
241-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
242-
<HintPath>..\packages\VSSDK.Shell.Immutable.11.11.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
243-
<Private>True</Private>
244-
<Private>False</Private>
245-
</Reference>
246-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
247-
<HintPath>..\packages\VSSDK.Shell.Immutable.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
248-
<Private>True</Private>
249-
<Private>False</Private>
250-
</Reference>
251-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
252-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
253-
</Reference>
254-
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
255-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6072\lib\net11\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
256-
</Reference>
257-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
258-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30320\lib\net20\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
259-
<EmbedInteropTypes>True</EmbedInteropTypes>
260-
</Reference>
261-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
262-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61031\lib\net20\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
263-
<EmbedInteropTypes>True</EmbedInteropTypes>
264-
</Reference>
265-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
266-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30111\lib\net20\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
267-
<EmbedInteropTypes>True</EmbedInteropTypes>
268-
</Reference>
269-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
270-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
271-
</Reference>
272-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
273-
<HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30730\lib\net11\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
274-
</Reference>
275-
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
276-
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6071\lib\net11\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
277-
</Reference>
278-
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
279-
<HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
280-
</Reference>
281-
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
282-
<HintPath>..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
283-
</Reference>
284-
<Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
285-
<HintPath>..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
286-
</Reference>
287-
<Reference Include="Microsoft.VisualStudio.Validation, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
288-
<HintPath>..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
289-
</Reference>
290-
<Reference Include="PresentationCore" />
291-
<Reference Include="PresentationFramework" />
292-
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
293-
<EmbedInteropTypes>False</EmbedInteropTypes>
294-
<HintPath>..\packages\VSSDK.DTE.7.0.4\lib\net20\stdole.dll</HintPath>
295-
<Private>True</Private>
296-
</Reference>
297-
<Reference Include="System" />
298-
<Reference Include="System.Data" />
299-
<Reference Include="System.Design" />
300-
<Reference Include="System.Drawing" />
301-
<Reference Include="System.Transactions" />
302-
<Reference Include="System.Windows.Forms" />
303-
<Reference Include="System.Xaml" />
304-
<Reference Include="System.Xml" />
305-
<Reference Include="System.Xml.Linq" />
306-
<Reference Include="UIAutomationTypes" />
307-
<Reference Include="WindowsBase" />
180+
<PackageReference Include="Microsoft.VisualStudio.Debugger.Engine">
181+
<Version>17.0.3041101</Version>
182+
</PackageReference>
183+
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime" />
184+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.6.2164" />
308185
</ItemGroup>
309186
<ItemGroup>
310187
<EmbeddedResource Include="GeneralOptionControl.resx">
@@ -316,16 +193,19 @@
316193
<SubType>Designer</SubType>
317194
</EmbeddedResource>
318195
</ItemGroup>
196+
<ItemGroup>
197+
<Reference Include="PresentationCore" />
198+
<Reference Include="PresentationFramework" />
199+
<Reference Include="System" />
200+
<Reference Include="System.Design" />
201+
<Reference Include="System.Drawing" />
202+
<Reference Include="System.Windows" />
203+
<Reference Include="System.Windows.Forms" />
204+
<Reference Include="System.Xaml" />
205+
<Reference Include="System.Xml" />
206+
</ItemGroup>
319207
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
320208
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
321-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
322-
<PropertyGroup>
323-
<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>
324-
</PropertyGroup>
325-
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.7.104\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.7.104\build\Microsoft.VSSDK.BuildTools.props'))" />
326-
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.7.104\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.7.104\build\Microsoft.VSSDK.BuildTools.targets'))" />
327-
</Target>
328-
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.7.104\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.7.104\build\Microsoft.VSSDK.BuildTools.targets')" />
329209
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
330210
Other similar extension points exist, see Microsoft.Common.targets.
331211
<Target Name="BeforeBuild">

‎solution/GraphicalDebugging/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("Graphical Debugging")]
9-
[assembly: AssemblyDescription("Visual Studio 2013, 2015, 2017, 2019 Graphical Debugging Tools")]
9+
[assembly: AssemblyDescription("Visual Studio 2022 Graphical Debugging Tools")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("Graphical Debugging")]
@@ -29,5 +29,5 @@
2929
// You can specify all the values or you can default the Build and Revision Numbers
3030
// by using the '*' as shown below:
3131
// [assembly: AssemblyVersion("1.0.*")]
32-
[assembly: AssemblyVersion("0.34.0.0")]
33-
[assembly: AssemblyFileVersion("0.34.0.0")]
32+
[assembly: AssemblyVersion("0.50.0.0")]
33+
[assembly: AssemblyFileVersion("0.50.0.0")]

‎solution/GraphicalDebugging/packages.config‎

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

‎solution/GraphicalDebugging/release_notes.txt‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
version 0.50
2+
3+
additions:
4+
- support for Visual Studio 2022
5+
6+
breaking changes:
7+
- dropped support for Visual Studio 2013, 2015, 2017 and 2019
8+
19
version 0.34
210

311
bugfixes:
@@ -327,6 +335,7 @@ bugfixes:
327335

328336
version 0.1
329337

330-
Debug visualizers for Boost.Array, Boost.Geometry, Boost.Variant
331-
GraphicalWatch
332-
GeometryWatch
338+
additions:
339+
- debug visualizers for Boost.Array, Boost.Geometry, Boost.Variant
340+
- GraphicalWatch
341+
- GeometryWatch

0 commit comments

Comments
 (0)