Change version 2.0 -> 2.1

Updated manifest to support VS2022 Added VS2022 PlatformToolset information & fixed WindowsTargetPlatformVersion to work for 2022.
Dave-Lowndes · Jul 29, 2021 · 5b1e2f7 · 5b1e2f7
1 parent 9332ca2
commit 5b1e2f7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/CppCustomVisualizer/Cpp.props b/CppCustomVisualizer/Cpp.props
@@ -11,9 +11,10 @@ of Visual Studio.
     <PlatformToolset>v140</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+    <PlatformToolset Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(VisualStudioVersion)', '17.0'))">v143</PlatformToolset>
 
-    <!--In Visual Studio 16, use the default Windows10 SDK-->
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and '$(VisualStudioVersion)' == '16.0'">10.0</WindowsTargetPlatformVersion>
+    <!--In Visual Studio 16+, use the default Windows10 SDK-->
+  <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and $([MSBuild]::VersionGreaterThanOrEquals('$(VisualStudioVersion)', '16.0'))">10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
 
   <!--In Dev14/Dev15, we need to set 'WindowsTargetPlatformVersion' to an exact build number. -->

diff --git a/CppCustomVisualizer/dll/CppCustomVisualizer.rc b/CppCustomVisualizer/dll/CppCustomVisualizer.rc
@@ -65,12 +65,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "David Lowndes"
             VALUE "FileDescription", "Dave's Custom Visualizers"
-            VALUE "FileVersion", "2.0.0.0"
+            VALUE "FileVersion", "2.1.0.0"
             VALUE "LegalCopyright", "(c) David Lowndes.  All rights reserved."
             VALUE "InternalName", "DavesCustomVisualizer.dll"
             VALUE "OriginalFilename", "DavesCustomVisualizer.dll"
             VALUE "ProductName", "Dave's Custom Visualizers"
-            VALUE "ProductVersion", "2.0.0.0"
+            VALUE "ProductVersion", "2.1.0.0"
             VALUE "OLESelfRegister", ""
         END
     END

diff --git a/CppCustomVisualizer/vsix/source.extension.vsixmanifest b/CppCustomVisualizer/vsix/source.extension.vsixmanifest
@@ -7,11 +7,16 @@
     <MoreInfo>https://github.com/Dave-Lowndes/DavesVisualStudioVisualizers/tree/master/CppCustomVisualizer</MoreInfo>
     <ReleaseNotes>https://github.com/Dave-Lowndes/DavesVisualStudioVisualizers/tree/master/CppCustomVisualizer</ReleaseNotes>
     <Tags>FILETIME;SYSTEMTIME;PROPERTYKEY;COleDateTime;CTime;CTimeSpan;LOGFONT</Tags>
-    <Version>2.0</Version>
+    <Version>2.1</Version>
   </Metadata>
   <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0, 17.0)" />
-  </Installation>
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,17.0)">
+      <ProductArchitecture>x86</ProductArchitecture>
+    </InstallationTarget>
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
+      <ProductArchitecture>amd64</ProductArchitecture>
+    </InstallationTarget>
+  </Installation>  
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Debugger" Version="[15.0,)" DisplayName="Visual Studio Debugger" />
   </Prerequisites>