From 4d6d79afb6c04d165d4846d3b0eb04a667717964 Mon Sep 17 00:00:00 2001
From: Andrew Wang <wardengnaw@gmail.com>
Date: Fri, 30 Aug 2024 15:29:51 -0700
Subject: [PATCH 1/2] Update Package Version for Component Governance

This PR updates to 17.11 packages and hardcodes System.Text.Json and
Microsoft.IO.Redist for CG.
---
 build/package_versions.settings.targets    | 16 ++++++++++------
 src/DebugEngineHost/DebugEngineHost.csproj |  3 +++
 src/MIDebugPackage/MIDebugPackage.csproj   |  3 +++
 src/SSHDebugPS/SSHDebugPS.csproj           |  3 +++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/build/package_versions.settings.targets b/build/package_versions.settings.targets
index 470194d01..248548b8e 100644
--- a/build/package_versions.settings.targets
+++ b/build/package_versions.settings.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <Microsoft_VisualStudio_Debugger_Interop_Portable_Version>1.0.1</Microsoft_VisualStudio_Debugger_Interop_Portable_Version>
-        <Microsoft_VisualStudio_Interop_Version>17.8.37221</Microsoft_VisualStudio_Interop_Version>
+        <Microsoft_VisualStudio_Interop_Version>17.11.40262</Microsoft_VisualStudio_Interop_Version>
         <Newtonsoft_Json_Version>13.0.3</Newtonsoft_Json_Version>
         <Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>17.2.60629.1</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>
 
@@ -25,15 +25,19 @@
         <Microsoft_VisualStudio_Debugger_Interop_15_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_15_0_Version>
         <Microsoft_VisualStudio_Debugger_Interop_16_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_16_0_Version>
         <Microsoft_VisualStudio_Debugger_InteropA_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_InteropA_Version>
-        <Microsoft_VisualStudio_Shell_15_0_Version>17.8.37221</Microsoft_VisualStudio_Shell_15_0_Version>
-        <Microsoft_VisualStudio_Shell_Framework_Version>17.8.37221</Microsoft_VisualStudio_Shell_Framework_Version>
-        <Microsoft_VisualStudio_Threading_Version>17.8.14</Microsoft_VisualStudio_Threading_Version>
-        <Microsoft_VisualStudio_Utilities_Version>17.8.37221</Microsoft_VisualStudio_Utilities_Version>
+        <Microsoft_VisualStudio_Shell_15_0_Version>17.11.40262</Microsoft_VisualStudio_Shell_15_0_Version>
+        <Microsoft_VisualStudio_Shell_Framework_Version>17.11.40262</Microsoft_VisualStudio_Shell_Framework_Version>
+        <Microsoft_VisualStudio_Threading_Version>17.11.20</Microsoft_VisualStudio_Threading_Version>
+        <Microsoft_VisualStudio_Utilities_Version>17.11.40262</Microsoft_VisualStudio_Utilities_Version>
         <Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>15.0.26932</Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>
         <Microsoft_VisualStudio_Workspace_Version>15.0.392</Microsoft_VisualStudio_Workspace_Version>
         <Microsoft_VisualStudio_Workspace_VSIntegration_Version>15.0.392</Microsoft_VisualStudio_Workspace_VSIntegration_Version>
-        <Microsoft_VisualStudio_TextManager_Interop_Version>17.8.37221</Microsoft_VisualStudio_TextManager_Interop_Version>
+        <Microsoft_VisualStudio_TextManager_Interop_Version>17.11.40262</Microsoft_VisualStudio_TextManager_Interop_Version>
         <Microsoft_VSSDK_BuildTools_Version>17.3.2093</Microsoft_VSSDK_BuildTools_Version>
         <System_Runtime_Loader_Version>4.3.0</System_Runtime_Loader_Version>
+
+        <!-- For Component Governance -->
+        <Microsoft_IO_Redist_Version>6.0.1</Microsoft_IO_Redist_Version>
+        <System_Text_Json_Version>8.0.4</System_Text_Json_Version>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/DebugEngineHost/DebugEngineHost.csproj b/src/DebugEngineHost/DebugEngineHost.csproj
index 03bd58c69..f33a68b99 100755
--- a/src/DebugEngineHost/DebugEngineHost.csproj
+++ b/src/DebugEngineHost/DebugEngineHost.csproj
@@ -88,6 +88,9 @@
       <IncludeAssets>compile</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+
+    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)" />
+    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)" />
   </ItemGroup>
 
   <ItemGroup Label="Assembly to Generate">
diff --git a/src/MIDebugPackage/MIDebugPackage.csproj b/src/MIDebugPackage/MIDebugPackage.csproj
index fe7a3a4ad..5e2e262a0 100755
--- a/src/MIDebugPackage/MIDebugPackage.csproj
+++ b/src/MIDebugPackage/MIDebugPackage.csproj
@@ -53,6 +53,9 @@
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(Microsoft_VSSDK_BuildTools_Version)" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true" />
+
+    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)" />
+    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SSHDebugPS/SSHDebugPS.csproj b/src/SSHDebugPS/SSHDebugPS.csproj
index f270e64e6..ebfa92199 100644
--- a/src/SSHDebugPS/SSHDebugPS.csproj
+++ b/src/SSHDebugPS/SSHDebugPS.csproj
@@ -28,6 +28,9 @@
     </PackageReference>
 
     <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true" />
+
+    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)" />
+    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)" />
   </ItemGroup>
 
   <ItemGroup>

From dd0bab8b18a243e4b4ed7ef831c391297525cc8c Mon Sep 17 00:00:00 2001
From: Andrew Wang <wardengnaw@gmail.com>
Date: Fri, 30 Aug 2024 19:00:06 -0700
Subject: [PATCH 2/2] Address PR issues

---
 build/version.settings.targets             | 2 +-
 src/DebugEngineHost/DebugEngineHost.csproj | 8 ++++++--
 src/MIDebugPackage/MIDebugPackage.csproj   | 8 ++++++--
 src/SSHDebugPS/SSHDebugPS.csproj           | 8 ++++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/build/version.settings.targets b/build/version.settings.targets
index f606a565b..b4b4aca63 100644
--- a/build/version.settings.targets
+++ b/build/version.settings.targets
@@ -3,7 +3,7 @@
     <!--SxS: These three properties should be changed at the start of a new version, VersionZeroYear should be the year
     before the start of the project.-->
     <MajorVersion>17</MajorVersion>
-    <MinorVersion>8</MinorVersion>
+    <MinorVersion>12</MinorVersion>
     <VersionZeroYear>2022</VersionZeroYear>
     <!-- Note: for compatibility, we leave the default assembly version of the repo at 14.0.
     If we ever decide to change this, make sure that you notify partner teams such as C++ IOT -->
diff --git a/src/DebugEngineHost/DebugEngineHost.csproj b/src/DebugEngineHost/DebugEngineHost.csproj
index f33a68b99..bed223019 100755
--- a/src/DebugEngineHost/DebugEngineHost.csproj
+++ b/src/DebugEngineHost/DebugEngineHost.csproj
@@ -89,8 +89,12 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)" />
-    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup Label="Assembly to Generate">
diff --git a/src/MIDebugPackage/MIDebugPackage.csproj b/src/MIDebugPackage/MIDebugPackage.csproj
index 5e2e262a0..c07e0a335 100755
--- a/src/MIDebugPackage/MIDebugPackage.csproj
+++ b/src/MIDebugPackage/MIDebugPackage.csproj
@@ -54,8 +54,12 @@
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(Microsoft_VSSDK_BuildTools_Version)" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true" />
 
-    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)" />
-    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SSHDebugPS/SSHDebugPS.csproj b/src/SSHDebugPS/SSHDebugPS.csproj
index ebfa92199..dd99dd6e1 100644
--- a/src/SSHDebugPS/SSHDebugPS.csproj
+++ b/src/SSHDebugPS/SSHDebugPS.csproj
@@ -29,8 +29,12 @@
 
     <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true" />
 
-    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)" />
-    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>