Updates for VS 2022 17.6+

aberus · Jan 30, 2024 · 55b7ef1 · 55b7ef1
1 parent 26ab615
commit 55b7ef1
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 60 deletions.
diff --git a/src/ImageVisualizer14/ImageVisualizer.cs b/src/ImageVisualizer14/ImageVisualizer.cs
@@ -30,6 +30,14 @@ namespace Aberus.VisualStudio.Debugger.ImageVisualizer
     /// </summary>
     public class ImageVisualizer : DialogDebuggerVisualizer
     {
+
+#if VS17
+        public ImageVisualizer() : base(FormatterPolicy.Legacy)
+        {
+
+        }
+#endif
+
         protected override void Show(IDialogVisualizerService windowService, IVisualizerObjectProvider objectProvider)
         {
             if (windowService == null)
@@ -42,7 +50,6 @@ protected override void Show(IDialogVisualizerService windowService, IVisualizer
 #endif
             using (var imageForm = new ImageForm(objectProvider))
             {
-
                  windowService.ShowDialog(imageForm);
             }
         }

diff --git a/src/ImageVisualizer14/Properties/AssemblyInfo.cs b/src/ImageVisualizer14/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/src/ImageVisualizer16.DebuggeeSide/ImageVisualizer16.DebuggeeSide.csproj b/src/ImageVisualizer16.DebuggeeSide/ImageVisualizer16.DebuggeeSide.csproj
@@ -32,7 +32,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
     <PackageReference Include="System.Drawing.Common">
-      <Version>4.5.0</Version>
+      <Version>4.7.2</Version>
     </PackageReference>
   </ItemGroup>
 

diff --git a/src/ImageVisualizer17.Common/ImageVisualizer17.Common.csproj b/src/ImageVisualizer17.Common/ImageVisualizer17.Common.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
     <PackageReference Include="System.Drawing.Common">
-      <Version>4.5.0</Version>
+      <Version>4.7.2</Version>
     </PackageReference>
   </ItemGroup>
 

diff --git a/src/ImageVisualizer17.DebuggeeSide/ImageVisualizer17.DebuggeeSide.csproj b/src/ImageVisualizer17.DebuggeeSide/ImageVisualizer17.DebuggeeSide.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0;net40</TargetFrameworks>
@@ -20,20 +20,20 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
     <Reference Include="Microsoft.VisualStudio.DebuggerVisualizers">
       <Private>False</Private>
-      <HintPath>C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\Packages\Debugger\Visualizers\netstandard2.0\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
+      <HintPath>C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Packages\Debugger\Visualizers\netstandard2.0\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
     </Reference>
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
     <Reference Include="Microsoft.VisualStudio.DebuggerVisualizers">
       <Private>False</Private>
-      <HintPath>C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\Packages\Debugger\Visualizers\net2.0\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
+      <HintPath>C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Packages\Debugger\Visualizers\net2.0\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
     </Reference>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
     <PackageReference Include="System.Drawing.Common">
-      <Version>4.5.0</Version>
+      <Version>4.7.2</Version>
     </PackageReference>
   </ItemGroup>
 

diff --git a/src/ImageVisualizer17.UI/ImageVisualizer17.UI.csproj b/src/ImageVisualizer17.UI/ImageVisualizer17.UI.csproj
@@ -39,7 +39,7 @@
     </Reference>
     <Reference Include="Microsoft.VisualStudio.DebuggerVisualizers, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <Private>False</Private>
-      <HintPath>C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
+      <HintPath>C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -95,14 +95,14 @@
       <Project>{14eeba2b-b2b1-491b-800e-bcc181cfb8fc}</Project>
       <Name>ImageVisualizer17.Common</Name>
     </ProjectReference>
-	<ProjectReference Include="..\ImageVisualizer17.DebuggeeSide\ImageVisualizer17.DebuggeeSide.csproj">
+    <ProjectReference Include="..\ImageVisualizer17.DebuggeeSide\ImageVisualizer17.DebuggeeSide.csproj">
       <Project>{2faa5bdc-192b-4eb7-a7d1-f69f74be8223}</Project>
       <Name>ImageVisualizer17.DebuggeeSide</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.DpiAwareness">
-      <Version>7.1.32210</Version>
+      <Version>7.5.33428</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/ImageVisualizerPackage/ImageVisualizerPackage.csproj b/src/ImageVisualizerPackage/ImageVisualizerPackage.csproj
@@ -53,7 +53,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.3.1061-preview2" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.6.2164">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Logo_128x.png">

diff --git a/src/ImageVisualizerPackage/Properties/AssemblyInfo.cs b/src/ImageVisualizerPackage/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/src/ImageVisualizerPackage/source.extension.vsixmanifest b/src/ImageVisualizerPackage/source.extension.vsixmanifest
@@ -1,39 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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">
-	<Metadata>
-		<Identity Id="2443c97f-77f2-47ea-b473-7f34832b2f86" Version="1.0.1" Language="en-US" Publisher="Aleksander Berus" />
-		<DisplayName>Debugger Image Visualizer</DisplayName>
-		<Description xml:space="preserve">A debug visualizer for Visual Studio that allows you to visually view the graphic content of images during debugging.</Description>
-		<MoreInfo>https://github.com/aberus/ImageVisualizer</MoreInfo>
-		<Icon>Logo_128x.png</Icon>
-		<PreviewImage>Preview_200x.png</PreviewImage>
-	</Metadata>
-	<Installation InstalledByMsi="true" AllUsers="true">
-		<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[11.0,17.0)">
-			<ProductArchitecture>x86</ProductArchitecture>
-		</InstallationTarget>
-		<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,17.0)">
-			<ProductArchitecture>x86</ProductArchitecture>
-		</InstallationTarget>
-		<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[11.0,17.0)">
-			<ProductArchitecture>x86</ProductArchitecture>
-		</InstallationTarget>
-		<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
-			<ProductArchitecture>amd64</ProductArchitecture>
-		</InstallationTarget>
-		<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0,18.0)">
-			<ProductArchitecture>amd64</ProductArchitecture>
-		</InstallationTarget>
-		<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0,18.0)">
-			<ProductArchitecture>amd64</ProductArchitecture>
-		</InstallationTarget>
-	</Installation>
-	<Dependencies>
-		<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.0,)" />
-	</Dependencies>
-	<Prerequisites>
-		<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,18.0)" DisplayName="Visual Studio core editor" />
-	</Prerequisites>
-	<Assets>
-	</Assets>
+    <Metadata>
+        <Identity Id="2443c97f-77f2-47ea-b473-7f34832b2f86" Version="1.1.0" Language="en-US" Publisher="Aleksander Berus" />
+        <DisplayName>Debugger Image Visualizer</DisplayName>
+        <Description xml:space="preserve">A debug visualizer for Visual Studio that allows you to visually view the graphic content of images during debugging.</Description>
+        <MoreInfo>https://github.com/aberus/ImageVisualizer</MoreInfo>
+        <Icon>Logo_128x.png</Icon>
+        <PreviewImage>Preview_200x.png</PreviewImage>
+    </Metadata>
+    <Installation InstalledByMsi="true" AllUsers="true">
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[11.0,17.0)">
+            <ProductArchitecture>x86</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,17.0)">
+            <ProductArchitecture>x86</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[11.0,17.0)">
+            <ProductArchitecture>x86</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0,18.0)">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0,18.0)">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+      <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
+        <ProductArchitecture>arm64</ProductArchitecture>
+      </InstallationTarget>
+      <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0,18.0)">
+        <ProductArchitecture>arm64</ProductArchitecture>
+      </InstallationTarget>
+      <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0,18.0)">
+        <ProductArchitecture>arm64</ProductArchitecture>
+      </InstallationTarget>
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.0,)" />
+    </Dependencies>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,18.0)" DisplayName="Visual Studio core editor" />
+    </Prerequisites>
+    <Assets>
+    </Assets>
 </PackageManifest>
diff --git a/src/SetupVisualizer/Product.wxs b/src/SetupVisualizer/Product.wxs
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?define ProductVersion = "1.0.1"?>
+<?define ProductVersion = "1.1.0"?>
 <?define ProductUpgradeCode = "5a2e7ccd-6ced-4a6b-9745-d8d73ed070cc"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:VSExtension="http://schemas.microsoft.com/wix/VSExtension">
   <Product Id="*" Name="Debugger Image Visualizer for Visual Studio" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Aleksander Berus" UpgradeCode="$(var.ProductUpgradeCode)">
@@ -124,7 +124,7 @@
       <Feature Id="ProductFeature17" Title="Microsoft Visual Studio 2022" Level="2">
         <Condition Level="1"><![CDATA[VS2022_ROOT_FOLDER AND VS2022DEVENV]]></Condition>
         <ComponentGroupRef Id="ImageVisualizer2022Components" />
-        <ComponentGroupRef Id="ImageVisualizer2022Net20Components" />
+        <ComponentGroupRef Id="ImageVisualizer2022Net462Components" />
         <ComponentGroupRef Id="ImageVisualizer2022NetCoreAppComponents" />
         <ComponentGroupRef Id="ImageVisualizer2022VsixComponents"/>
       </Feature>
@@ -246,8 +246,8 @@
                     <Directory Id="Packages_2022" Name="Packages">
                         <Directory Id="Debugger_2022" Name="Debugger">
                             <Directory Id="Visualizers_2022" Name="Visualizers">
-                                <Directory Id="Visualizers_2022_Net20" Name="net2.0" />
-                                <Directory Id="Visualizers_2022_NetCoreApp" Name="netcoreapp" />
+                                <Directory Id="Visualizers_2022_Net462" Name="net4.6.2" />
+                              <Directory Id="Visualizers_2022_NetCoreApp" Name="netcoreapp" />
                             </Directory>
                         </Directory>
                     </Directory>
@@ -413,10 +413,10 @@
         <File Id="ImageVisualizer2022CommonDll" Name="Aberus.VisualStudio.Debugger.ImageVisualizer.Common.dll" Source="$(var.ImageVisualizer17.UI.TargetDir)Aberus.VisualStudio.Debugger.ImageVisualizer.Common.dll" Checksum="yes" />
       </Component>
     </ComponentGroup>
-      <ComponentGroup Id="ImageVisualizer2022Net20Components" Directory="Visualizers_2022_Net20">
-      <Component Id="ImageVisualizer2022Net20DllComponent" Guid="6AA83B51-E746-4711-B7DA-63FEADF3FAB3" Transitive="yes" Win64="yes">
-        <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" />
-        <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" />
+      <ComponentGroup Id="ImageVisualizer2022Net462Components" Directory="Visualizers_2022_Net462">
+      <Component Id="ImageVisualizer2022Net462DllComponent" Guid="6AA83B51-E746-4711-B7DA-63FEADF3FAB3" Transitive="yes" Win64="yes">
+        <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" />
+        <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" />
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="ImageVisualizer2022NetCoreAppComponents" Directory="Visualizers_2022_NetCoreApp">

diff --git a/test/TestVisualizerCSNet60/TestVisualizerCSNet60.csproj b/test/TestVisualizerCSNet60/TestVisualizerCSNet60.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>