From 610718e250c69a497f1d78415cbe1d83aea9127f Mon Sep 17 00:00:00 2001
From: Andrew Wang <wardengnaw@gmail.com>
Date: Tue, 17 Dec 2024 16:17:59 -0800
Subject: [PATCH 1/2] Update Nuget Packages for Compliance

VS Packages were using System.Text.Json 8.0.3, updated them to use
8.0.4.

Also updated xunit packages and removed code analysis packages to use
the built in .NET ones

Updated macOS pool for GitHub Actions but disabled testing since there
is no downloadable arm64 lldb-mi to test aganist
---
 .github/workflows/Build-And-Test.yml    |  6 +++---
 build/Analyzers.targets                 | 10 ----------
 build/package_versions.settings.targets | 18 +++++++++---------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/Build-And-Test.yml b/.github/workflows/Build-And-Test.yml
index 9fe5827ac..33766da14 100644
--- a/.github/workflows/Build-And-Test.yml
+++ b/.github/workflows/Build-And-Test.yml
@@ -150,7 +150,7 @@ jobs:
         path: ${{ github.workspace }}/bin/DebugAdapterProtocolTests/Debug/CppTests/results.trx
 
   osx_build:
-    runs-on: macos-12
+    runs-on: macos-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -168,8 +168,8 @@ jobs:
     - run: |
         ${{ github.workspace }}/eng/Scripts/CI-Build.sh
 
-    - run: |
-        ${{ github.workspace }}/eng/Scripts/CI-Test.sh
+    # - run: |
+    #    ${{ github.workspace }}/eng/Scripts/CI-Test.sh
 
     - name: 'Upload Test Results'
       uses: actions/upload-artifact@v4
diff --git a/build/Analyzers.targets b/build/Analyzers.targets
index 572fad403..a2074bfd9 100644
--- a/build/Analyzers.targets
+++ b/build/Analyzers.targets
@@ -1,18 +1,8 @@
  <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <!-- Disable Legacy FxCop -->
-    <RunCodeAnalysis>false</RunCodeAnalysis>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
 
     <!-- Point to ruleset -->
     <CodeAnalysisRuleSet>..\IDECodeAnalysis.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" PrivateAssets="all"  />
-    <PackageReference Include="Microsoft.CodeAnalysis.VersionCheckAnalyzer" Version="3.3.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="3.3.0" PrivateAssets="all"  />
-    <PackageReference Include="Microsoft.NetCore.Analyzers" Version="3.3.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.NetFramework.Analyzers" Version="3.3.0" PrivateAssets="all"  />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/package_versions.settings.targets b/build/package_versions.settings.targets
index 248548b8e..5870c79ac 100644
--- a/build/package_versions.settings.targets
+++ b/build/package_versions.settings.targets
@@ -1,14 +1,14 @@
 <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.11.40262</Microsoft_VisualStudio_Interop_Version>
+        <Microsoft_VisualStudio_Interop_Version>17.12.40391</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>
 
         <!-- Test Packages -->
         <Microsoft_NET_Test_Sdk_Version>16.7.1</Microsoft_NET_Test_Sdk_Version>
-        <xunit_Version>2.4.1</xunit_Version>
-        <xunit_runner_visualstudio_Version>2.4.3</xunit_runner_visualstudio_Version>
+        <xunit_Version>2.9.2</xunit_Version>
+        <xunit_runner_visualstudio_Version>3.0.0</xunit_runner_visualstudio_Version>
         <coverlet_collector_Version>1.3.0</coverlet_collector_Version>
         <MSTest_TestFramework_Version>2.1.2</MSTest_TestFramework_Version>
 
@@ -25,19 +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.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_15_0_Version>17.12.40392</Microsoft_VisualStudio_Shell_15_0_Version>
+        <Microsoft_VisualStudio_Shell_Framework_Version>17.12.40391</Microsoft_VisualStudio_Shell_Framework_Version>
+        <Microsoft_VisualStudio_Threading_Version>17.12.19</Microsoft_VisualStudio_Threading_Version>
+        <Microsoft_VisualStudio_Utilities_Version>17.12.40391</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.11.40262</Microsoft_VisualStudio_TextManager_Interop_Version>
+        <Microsoft_VisualStudio_TextManager_Interop_Version>17.12.40391</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>
+        <System_Text_Json_Version>8.0.5</System_Text_Json_Version>
     </PropertyGroup>
 </Project>
\ No newline at end of file

From b733631d5c2cafc45419f6bf2df950398c32d24d Mon Sep 17 00:00:00 2001
From: Andrew Wang <wardengnaw@gmail.com>
Date: Thu, 19 Dec 2024 16:21:57 -0800
Subject: [PATCH 2/2] Add comment to disablement of macOS

---
 .github/workflows/Build-And-Test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/Build-And-Test.yml b/.github/workflows/Build-And-Test.yml
index 33766da14..aec71a4df 100644
--- a/.github/workflows/Build-And-Test.yml
+++ b/.github/workflows/Build-And-Test.yml
@@ -168,6 +168,8 @@ jobs:
     - run: |
         ${{ github.workspace }}/eng/Scripts/CI-Build.sh
 
+    # Disabling lldb-mi tests since DownloadLldbMI.sh will obtain 
+    # an x64 version instead of an arm64 and test will fail.
     # - run: |
     #    ${{ github.workspace }}/eng/Scripts/CI-Test.sh