From 77311b6ec8e51c40be7f19ce0d35ead1c3e90623 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 25 Nov 2024 17:52:32 +0100
Subject: [PATCH 1/5] Update package versions and remove unnecessary EOL
 package references

---
 eng/Directory.Packages.props                  | 27 +++++--------------
 .../Roslyn.Test.PdbUtilities.csproj           |  9 -------
 src/Tools/Source/RunTests/RunTests.csproj     |  1 -
 .../TestDiscoveryWorker.csproj                |  2 --
 4 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 1466d9260850b..8357fa6acb618 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -184,7 +184,7 @@
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3" />
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.3" />
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies.net45" Version="1.0.3" />
-    <PackageVersion Include="System.Buffers" Version="4.5.1" />
+    <PackageVersion Include="System.Buffers" Version="4.6.0" />
     <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
     <PackageVersion Include="System.Composition" Version="$(SystemCompositionVersion)" />
@@ -194,18 +194,15 @@
     <PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingVersion)" />
     <PackageVersion Include="System.IO.Pipelines" Version="$(SystemIOPipelinesVersion)" />
     <PackageVersion Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
-    <PackageVersion Include="System.Memory" Version="4.5.5" />
-    <PackageVersion Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
+    <PackageVersion Include="System.Memory" Version="4.6.0" />
+    <PackageVersion Include="System.Numerics.Vectors" Version="4.6.0" />
+    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
     <PackageVersion Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsVersion)" />
     <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="$(SystemSecurityCryptographyProtectedDataVersion)" />
     <PackageVersion Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
-    <PackageVersion Include="System.Security.Principal" Version="4.3.0" />
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-    <PackageVersion Include="System.Text.Encoding.Extensions" Version="4.3.0" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowVersion)" />
-    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
     <PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsVersion)" />
 
     <!-- We need System.ValueTuple assembly version at least 4.0.3.0 on net47 to make F5 work against Dev15 - see https://github.com/dotnet/roslyn/issues/29705 -->
@@ -225,15 +222,7 @@
     <!-- Note: When updating SystemTextJsonVersion ensure that the version is no higher than what is used by MSBuild. -->
     <PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
 
-    <!--
-      Packages that are pinned to avoid component governance alerts.
-      Tracked issues:
-        https://github.com/xunit/xunit/issues/2778 
-        https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1886496
-    -->
-    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
-    <PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
+    <PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
 
     <PackageVersion Include="SQLitePCLRaw.core" Version="$(SqliteVersion)" />
     <PackageVersion Include="SQLitePCLRaw.bundle_green" Version="$(SqliteVersion)" />
@@ -266,8 +255,6 @@
     <PackageVersion Include="Microsoft.VisualStudio.Diagnostics.PerformanceProvider" Version="17.8.36726" />
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator" Version="$(MicrosoftVisualStudioExtensibilityTestingVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Testing.Xunit" Version="$(MicrosoftVisualStudioExtensibilityTestingVersion)" />
-    <PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
-    <PackageVersion Include="System.IO.FileSystem" Version="4.3.0" />
     <PackageVersion Include="System.Management" Version="7.0.0" />
     <PackageVersion Include="System.Drawing.Common" Version="8.0.0" />
     <PackageVersion Include="NuGet.SolutionRestoreManager.Interop" Version="4.8.0" />
@@ -311,7 +298,7 @@
     Microsoft.TeamFoundationServer.Client is referencing System.Data.SqlClient causing CG alert
     When it updates its referenced System.Data.SqlClient version this should be removed
     -->
-    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
+    <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
     <!-- fix of vulnerability in 6.0.0 coming via Microsoft.TeamFoundationServer.Client -->
     <PackageVersion Include="System.Security.Cryptography.Xml" Version="7.0.1" />
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
diff --git a/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj b/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj
index 78b094b4e5bbf..9290b64c955c0 100644
--- a/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj
+++ b/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj
@@ -45,15 +45,6 @@
     <PackageReference Include="System.Reflection.Metadata" />
     <PackageReference Include="xunit.assert" />
   </ItemGroup>
-  <ItemGroup>
-    <!--
-      Package references needed due to Microsoft.DiaSymReader.Converter dependency on Newtonsoft.Json 9.0.1, 
-      which doesn't have netstandard 2.0 binaries.
-    -->
-    <PackageReference Include="System.IO.FileSystem" />
-    <PackageReference Include="System.IO.FileSystem.Primitives" />
-    <PackageReference Include="System.Text.Encoding.Extensions" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
     <ProjectReference Include="..\..\Compilers\Test\Core\Microsoft.CodeAnalysis.Test.Utilities.csproj" />
diff --git a/src/Tools/Source/RunTests/RunTests.csproj b/src/Tools/Source/RunTests/RunTests.csproj
index c3c7c14e08d87..308d69d5b52ec 100644
--- a/src/Tools/Source/RunTests/RunTests.csproj
+++ b/src/Tools/Source/RunTests/RunTests.csproj
@@ -10,7 +10,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" />
-    <PackageReference Include="System.Security.Principal" />
     <PackageReference Include="System.Reflection.Metadata" />
     <PackageReference Include="System.Management" />
     <PackageReference Include="Mono.Options" />
diff --git a/src/Tools/TestDiscoveryWorker/TestDiscoveryWorker.csproj b/src/Tools/TestDiscoveryWorker/TestDiscoveryWorker.csproj
index 84032b5202050..1d6c65bf6d8ec 100644
--- a/src/Tools/TestDiscoveryWorker/TestDiscoveryWorker.csproj
+++ b/src/Tools/TestDiscoveryWorker/TestDiscoveryWorker.csproj
@@ -10,8 +10,6 @@
     <PackageReference Include="xunit.abstractions" />
     <PackageReference Include="xunit.runner.utility" />
     <PackageReference Include="xunit.extensibility.execution" />
-    <PackageReference Include="System.Private.Uri" />
-    <PackageReference Include="System.Net.Http" />
   </ItemGroup>
     
   <ItemGroup Condition="'$(TargetFramework)'=='net472'">

From 6fa50ea16ab6542ff8aeab1fd39e1f6bc38dccc2 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 25 Nov 2024 18:13:11 +0100
Subject: [PATCH 2/5] Remove one more call site

---
 .../Test/Core/Microsoft.CodeAnalysis.Test.Utilities.csproj       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Compilers/Test/Core/Microsoft.CodeAnalysis.Test.Utilities.csproj b/src/Compilers/Test/Core/Microsoft.CodeAnalysis.Test.Utilities.csproj
index 3d2b74a3c7ca2..712aaca60659f 100644
--- a/src/Compilers/Test/Core/Microsoft.CodeAnalysis.Test.Utilities.csproj
+++ b/src/Compilers/Test/Core/Microsoft.CodeAnalysis.Test.Utilities.csproj
@@ -99,7 +99,6 @@
     <PackageReference Include="xunit.assert" />
     <PackageReference Include="xunit.extensibility.core" />
     <PackageReference Include="Xunit.Combinatorial" />
-    <PackageReference Include="System.Private.Uri" />
     <PackageReference Include="ICSharpCode.Decompiler" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Microsoft.CodeAnalysis.AnalyzerUtilities" />

From ff3d06590815bfcf56d0e0b4ad0a9f4e5a68ebda Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 26 Nov 2024 12:17:40 +0100
Subject: [PATCH 3/5] Try app-local System.Memory

---
 .../SemanticSearch/BuildTask/SemanticSearch.BuildTask.csproj    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Tools/SemanticSearch/BuildTask/SemanticSearch.BuildTask.csproj b/src/Tools/SemanticSearch/BuildTask/SemanticSearch.BuildTask.csproj
index 9e28511dab63f..b3902b9f2bfd2 100644
--- a/src/Tools/SemanticSearch/BuildTask/SemanticSearch.BuildTask.csproj
+++ b/src/Tools/SemanticSearch/BuildTask/SemanticSearch.BuildTask.csproj
@@ -12,6 +12,8 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" Private="true" />
     <ProjectReference Include="..\..\..\Compilers\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.csproj" Private="true" />
+
+    <PackageReference Include="System.Memory" />
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="SemanticSearch.BuildTask.UnitTests" />

From ab2a184831e85eb5091b7ea7a9eba518a72e0896 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 27 Nov 2024 10:41:09 +0100
Subject: [PATCH 4/5] Update SemanticSearch.BuildTask.csproj

---
 .../SemanticSearch/BuildTask/SemanticSearch.BuildTask.csproj    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Tools/SemanticSearch/BuildTask/SemanticSearch.BuildTask.csproj b/src/Tools/SemanticSearch/BuildTask/SemanticSearch.BuildTask.csproj
index b3902b9f2bfd2..9e28511dab63f 100644
--- a/src/Tools/SemanticSearch/BuildTask/SemanticSearch.BuildTask.csproj
+++ b/src/Tools/SemanticSearch/BuildTask/SemanticSearch.BuildTask.csproj
@@ -12,8 +12,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" Private="true" />
     <ProjectReference Include="..\..\..\Compilers\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.csproj" Private="true" />
-
-    <PackageReference Include="System.Memory" />
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="SemanticSearch.BuildTask.UnitTests" />

From 40712539286fa72003a021acb6867def73d71f19 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 27 Nov 2024 14:54:01 +0100
Subject: [PATCH 5/5] Update RunTests.csproj

---
 src/Tools/Source/RunTests/RunTests.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Tools/Source/RunTests/RunTests.csproj b/src/Tools/Source/RunTests/RunTests.csproj
index 308d69d5b52ec..f88b6a17d7dff 100644
--- a/src/Tools/Source/RunTests/RunTests.csproj
+++ b/src/Tools/Source/RunTests/RunTests.csproj
@@ -13,7 +13,6 @@
     <PackageReference Include="System.Reflection.Metadata" />
     <PackageReference Include="System.Management" />
     <PackageReference Include="Mono.Options" />
-    <PackageReference Include="Microsoft.Win32.Registry" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Microsoft.TeamFoundationServer.Client" />
     <ProjectReference Include="..\..\..\Compilers\Test\Core\Microsoft.CodeAnalysis.Test.Utilities.csproj" />