Skip to content

Commit 55b7ef1

Browse files
aberusaberus
committed
Updates for VS 2022 17.6+
1 parent 26ab615 commit 55b7ef1

File tree

11 files changed

+79
-60
lines changed

11 files changed

+79
-60
lines changed

‎src/ImageVisualizer14/ImageVisualizer.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ namespace Aberus.VisualStudio.Debugger.ImageVisualizer
3030
/// </summary>
3131
public class ImageVisualizer : DialogDebuggerVisualizer
3232
{
33+
34+
#if VS17
35+
public ImageVisualizer() : base(FormatterPolicy.Legacy)
36+
{
37+
38+
}
39+
#endif
40+
3341
protected override void Show(IDialogVisualizerService windowService, IVisualizerObjectProvider objectProvider)
3442
{
3543
if (windowService == null)
@@ -42,7 +50,6 @@ protected override void Show(IDialogVisualizerService windowService, IVisualizer
4250
#endif
4351
using (var imageForm = new ImageForm(objectProvider))
4452
{
45-
4653
windowService.ShowDialog(imageForm);
4754
}
4855
}

‎src/ImageVisualizer14/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.1.0")]
36-
[assembly: AssemblyFileVersion("1.0.1.0")]
35+
[assembly: AssemblyVersion("1.1.0.0")]
36+
[assembly: AssemblyFileVersion("1.1.0.0")]

‎src/ImageVisualizer16.DebuggeeSide/ImageVisualizer16.DebuggeeSide.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
3434
<PackageReference Include="System.Drawing.Common">
35-
<Version>4.5.0</Version>
35+
<Version>4.7.2</Version>
3636
</PackageReference>
3737
</ItemGroup>
3838

‎src/ImageVisualizer17.Common/ImageVisualizer17.Common.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
1616
<PackageReference Include="System.Drawing.Common">
17-
<Version>4.5.0</Version>
17+
<Version>4.7.2</Version>
1818
</PackageReference>
1919
</ItemGroup>
2020

‎src/ImageVisualizer17.DebuggeeSide/ImageVisualizer17.DebuggeeSide.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>netcoreapp3.0;net40</TargetFrameworks>
@@ -20,20 +20,20 @@
2020
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
2121
<Reference Include="Microsoft.VisualStudio.DebuggerVisualizers">
2222
<Private>False</Private>
23-
<HintPath>C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\Packages\Debugger\Visualizers\netstandard2.0\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
23+
<HintPath>C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Packages\Debugger\Visualizers\netstandard2.0\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
2424
</Reference>
2525
</ItemGroup>
2626

2727
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
2828
<Reference Include="Microsoft.VisualStudio.DebuggerVisualizers">
2929
<Private>False</Private>
30-
<HintPath>C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\Packages\Debugger\Visualizers\net2.0\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
30+
<HintPath>C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Packages\Debugger\Visualizers\net2.0\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
3131
</Reference>
3232
</ItemGroup>
3333

3434
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
3535
<PackageReference Include="System.Drawing.Common">
36-
<Version>4.5.0</Version>
36+
<Version>4.7.2</Version>
3737
</PackageReference>
3838
</ItemGroup>
3939

‎src/ImageVisualizer17.UI/ImageVisualizer17.UI.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</Reference>
4040
<Reference Include="Microsoft.VisualStudio.DebuggerVisualizers, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
4141
<Private>False</Private>
42-
<HintPath>C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
42+
<HintPath>C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
4343
</Reference>
4444
<Reference Include="PresentationCore" />
4545
<Reference Include="PresentationFramework" />
@@ -95,14 +95,14 @@
9595
<Project>{14eeba2b-b2b1-491b-800e-bcc181cfb8fc}</Project>
9696
<Name>ImageVisualizer17.Common</Name>
9797
</ProjectReference>
98-
<ProjectReference Include="..\ImageVisualizer17.DebuggeeSide\ImageVisualizer17.DebuggeeSide.csproj">
98+
<ProjectReference Include="..\ImageVisualizer17.DebuggeeSide\ImageVisualizer17.DebuggeeSide.csproj">
9999
<Project>{2faa5bdc-192b-4eb7-a7d1-f69f74be8223}</Project>
100100
<Name>ImageVisualizer17.DebuggeeSide</Name>
101101
</ProjectReference>
102102
</ItemGroup>
103103
<ItemGroup>
104104
<PackageReference Include="Microsoft.VisualStudio.DpiAwareness">
105-
<Version>7.1.32210</Version>
105+
<Version>7.5.33428</Version>
106106
</PackageReference>
107107
</ItemGroup>
108108
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/ImageVisualizerPackage/ImageVisualizerPackage.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@
5353
</ItemGroup>
5454
<ItemGroup>
5555
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime" />
56-
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.3.1061-preview2" />
56+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.6.2164">
57+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
58+
<PrivateAssets>all</PrivateAssets>
59+
</PackageReference>
5760
</ItemGroup>
5861
<ItemGroup>
5962
<Content Include="Logo_128x.png">

‎src/ImageVisualizerPackage/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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("1.0.1.0")]
33-
[assembly: AssemblyFileVersion("1.0.1.0")]
32+
[assembly: AssemblyVersion("1.1.0.0")]
33+
[assembly: AssemblyFileVersion("1.1.0.0")]

‎src/ImageVisualizerPackage/source.extension.vsixmanifest‎

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,48 @@
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="2443c97f-77f2-47ea-b473-7f34832b2f86" Version="1.0.1" Language="en-US" Publisher="Aleksander Berus" />
5-
<DisplayName>Debugger Image Visualizer</DisplayName>
6-
<Description xml:space="preserve">A debug visualizer for Visual Studio that allows you to visually view the graphic content of images during debugging.</Description>
7-
<MoreInfo>https://github.com/aberus/ImageVisualizer</MoreInfo>
8-
<Icon>Logo_128x.png</Icon>
9-
<PreviewImage>Preview_200x.png</PreviewImage>
10-
</Metadata>
11-
<Installation InstalledByMsi="true" AllUsers="true">
12-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[11.0,17.0)">
13-
<ProductArchitecture>x86</ProductArchitecture>
14-
</InstallationTarget>
15-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,17.0)">
16-
<ProductArchitecture>x86</ProductArchitecture>
17-
</InstallationTarget>
18-
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[11.0,17.0)">
19-
<ProductArchitecture>x86</ProductArchitecture>
20-
</InstallationTarget>
21-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
22-
<ProductArchitecture>amd64</ProductArchitecture>
23-
</InstallationTarget>
24-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0,18.0)">
25-
<ProductArchitecture>amd64</ProductArchitecture>
26-
</InstallationTarget>
27-
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0,18.0)">
28-
<ProductArchitecture>amd64</ProductArchitecture>
29-
</InstallationTarget>
30-
</Installation>
31-
<Dependencies>
32-
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.0,)" />
33-
</Dependencies>
34-
<Prerequisites>
35-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,18.0)" DisplayName="Visual Studio core editor" />
36-
</Prerequisites>
37-
<Assets>
38-
</Assets>
3+
<Metadata>
4+
<Identity Id="2443c97f-77f2-47ea-b473-7f34832b2f86" Version="1.1.0" Language="en-US" Publisher="Aleksander Berus" />
5+
<DisplayName>Debugger Image Visualizer</DisplayName>
6+
<Description xml:space="preserve">A debug visualizer for Visual Studio that allows you to visually view the graphic content of images during debugging.</Description>
7+
<MoreInfo>https://github.com/aberus/ImageVisualizer</MoreInfo>
8+
<Icon>Logo_128x.png</Icon>
9+
<PreviewImage>Preview_200x.png</PreviewImage>
10+
</Metadata>
11+
<Installation InstalledByMsi="true" AllUsers="true">
12+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[11.0,17.0)">
13+
<ProductArchitecture>x86</ProductArchitecture>
14+
</InstallationTarget>
15+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,17.0)">
16+
<ProductArchitecture>x86</ProductArchitecture>
17+
</InstallationTarget>
18+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[11.0,17.0)">
19+
<ProductArchitecture>x86</ProductArchitecture>
20+
</InstallationTarget>
21+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
22+
<ProductArchitecture>amd64</ProductArchitecture>
23+
</InstallationTarget>
24+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0,18.0)">
25+
<ProductArchitecture>amd64</ProductArchitecture>
26+
</InstallationTarget>
27+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0,18.0)">
28+
<ProductArchitecture>amd64</ProductArchitecture>
29+
</InstallationTarget>
30+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
31+
<ProductArchitecture>arm64</ProductArchitecture>
32+
</InstallationTarget>
33+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0,18.0)">
34+
<ProductArchitecture>arm64</ProductArchitecture>
35+
</InstallationTarget>
36+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0,18.0)">
37+
<ProductArchitecture>arm64</ProductArchitecture>
38+
</InstallationTarget>
39+
</Installation>
40+
<Dependencies>
41+
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.0,)" />
42+
</Dependencies>
43+
<Prerequisites>
44+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,18.0)" DisplayName="Visual Studio core editor" />
45+
</Prerequisites>
46+
<Assets>
47+
</Assets>
3948
</PackageManifest>

‎src/SetupVisualizer/Product.wxs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<?define ProductVersion = "1.0.1"?>
2+
<?define ProductVersion = "1.1.0"?>
33
<?define ProductUpgradeCode = "5a2e7ccd-6ced-4a6b-9745-d8d73ed070cc"?>
44
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:VSExtension="http://schemas.microsoft.com/wix/VSExtension">
55
<Product Id="*" Name="Debugger Image Visualizer for Visual Studio" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Aleksander Berus" UpgradeCode="$(var.ProductUpgradeCode)">
@@ -124,7 +124,7 @@
124124
<Feature Id="ProductFeature17" Title="Microsoft Visual Studio 2022" Level="2">
125125
<Condition Level="1"><![CDATA[VS2022_ROOT_FOLDER AND VS2022DEVENV]]></Condition>
126126
<ComponentGroupRef Id="ImageVisualizer2022Components" />
127-
<ComponentGroupRef Id="ImageVisualizer2022Net20Components" />
127+
<ComponentGroupRef Id="ImageVisualizer2022Net462Components" />
128128
<ComponentGroupRef Id="ImageVisualizer2022NetCoreAppComponents" />
129129
<ComponentGroupRef Id="ImageVisualizer2022VsixComponents"/>
130130
</Feature>
@@ -246,8 +246,8 @@
246246
<Directory Id="Packages_2022" Name="Packages">
247247
<Directory Id="Debugger_2022" Name="Debugger">
248248
<Directory Id="Visualizers_2022" Name="Visualizers">
249-
<Directory Id="Visualizers_2022_Net20" Name="net2.0" />
250-
<Directory Id="Visualizers_2022_NetCoreApp" Name="netcoreapp" />
249+
<Directory Id="Visualizers_2022_Net462" Name="net4.6.2" />
250+
<Directory Id="Visualizers_2022_NetCoreApp" Name="netcoreapp" />
251251
</Directory>
252252
</Directory>
253253
</Directory>
@@ -413,10 +413,10 @@
413413
<File Id="ImageVisualizer2022CommonDll" Name="Aberus.VisualStudio.Debugger.ImageVisualizer.Common.dll" Source="$(var.ImageVisualizer17.UI.TargetDir)Aberus.VisualStudio.Debugger.ImageVisualizer.Common.dll" Checksum="yes" />
414414
</Component>
415415
</ComponentGroup>
416-
<ComponentGroup Id="ImageVisualizer2022Net20Components" Directory="Visualizers_2022_Net20">
417-
<Component Id="ImageVisualizer2022Net20DllComponent" Guid="6AA83B51-E746-4711-B7DA-63FEADF3FAB3" Transitive="yes" Win64="yes">
418-
<File Id="ImageVisualizer2022Net20CommonDll" Name="Aberus.VisualStudio.Debugger.ImageVisualizer.Common.dll" Source="$(var.ImageVisualizer17.DebuggeeSide.ProjectDir)bin\$(var.ImageVisualizer17.DebuggeeSide.Configuration)\net40\Aberus.VisualStudio.Debugger.ImageVisualizer.Common.dll" Checksum="yes" />
419-
<File Id="ImageVisualizer2022Net20DebuggeeSideDll" Name="Aberus.VisualStudio.Debugger.ImageVisualizer.DebuggeeSide.dll" Source="$(var.ImageVisualizer17.DebuggeeSide.ProjectDir)bin\$(var.ImageVisualizer17.DebuggeeSide.Configuration)\net40\Aberus.VisualStudio.Debugger.ImageVisualizer.DebuggeeSide.dll" KeyPath="yes" Checksum="yes" />
416+
<ComponentGroup Id="ImageVisualizer2022Net462Components" Directory="Visualizers_2022_Net462">
417+
<Component Id="ImageVisualizer2022Net462DllComponent" Guid="6AA83B51-E746-4711-B7DA-63FEADF3FAB3" Transitive="yes" Win64="yes">
418+
<File Id="ImageVisualizer2022Net462CommonDll" Name="Aberus.VisualStudio.Debugger.ImageVisualizer.Common.dll" Source="$(var.ImageVisualizer17.DebuggeeSide.ProjectDir)bin\$(var.ImageVisualizer17.DebuggeeSide.Configuration)\net40\Aberus.VisualStudio.Debugger.ImageVisualizer.Common.dll" Checksum="yes" />
419+
<File Id="ImageVisualizer2022Net462DebuggeeSideDll" Name="Aberus.VisualStudio.Debugger.ImageVisualizer.DebuggeeSide.dll" Source="$(var.ImageVisualizer17.DebuggeeSide.ProjectDir)bin\$(var.ImageVisualizer17.DebuggeeSide.Configuration)\net40\Aberus.VisualStudio.Debugger.ImageVisualizer.DebuggeeSide.dll" KeyPath="yes" Checksum="yes" />
420420
</Component>
421421
</ComponentGroup>
422422
<ComponentGroup Id="ImageVisualizer2022NetCoreAppComponents" Directory="Visualizers_2022_NetCoreApp">

0 commit comments

Comments
 (0)