From 2ad5dea9c90aeae1d3e8e75234377bea376904be Mon Sep 17 00:00:00 2001
From: Nikolche Kolev <nikolce1kolev@gmail.com>
Date: Wed, 10 Apr 2024 17:02:33 -0700
Subject: [PATCH 1/5] Remove NuGet.Packaging.Core

---
 Directory.Build.targets                        | 1 -
 Directory.Packages.props                       | 1 -
 src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj | 1 -
 3 files changed, 3 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 4941558849..5275d9970c 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -8,7 +8,6 @@
       <PackageReference Include="NuGet.DependencyResolver.Core" ExcludeAssets="all" PrivateAssets="all" />
       <PackageReference Include="NuGet.Frameworks" ExcludeAssets="all" PrivateAssets="all" />
       <PackageReference Include="NuGet.LibraryModel" ExcludeAssets="all" PrivateAssets="all" />
-      <PackageReference Include="NuGet.Packaging.Core" ExcludeAssets="all" PrivateAssets="all" />
       <PackageReference Include="NuGet.Packaging" ExcludeAssets="all" PrivateAssets="all" />
       <PackageReference Include="NuGet.ProjectModel" ExcludeAssets="all" PrivateAssets="all" />
       <PackageReference Include="NuGet.Protocol" ExcludeAssets="all" PrivateAssets="all" />
diff --git a/Directory.Packages.props b/Directory.Packages.props
index ee9fe8fafb..ea5f54c561 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -71,7 +71,6 @@
         <PackageVersion Include="NuGet.DependencyResolver.Core" Version="$(NuGetPackageVersion)" />
         <PackageVersion Include="NuGet.Frameworks" Version="$(NuGetPackageVersion)" />
         <PackageVersion Include="NuGet.LibraryModel" Version="$(NuGetPackageVersion)" />
-        <PackageVersion Include="NuGet.Packaging.Core" Version="$(NuGetPackageVersion)" />
         <PackageVersion Include="NuGet.Packaging" Version="$(NuGetPackageVersion)" />
         <PackageVersion Include="NuGet.ProjectModel" Version="$(NuGetPackageVersion)" />
         <PackageVersion Include="NuGet.Protocol" Version="$(NuGetPackageVersion)" />
diff --git a/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj b/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj
index 3581e6dbad..a309b0e3eb 100644
--- a/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj
+++ b/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj
@@ -19,7 +19,6 @@
     <PackageReference Include="Microsoft.Build.Tasks.Core" ExcludeAssets="Runtime" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" />
-    <PackageReference Include="NuGet.Packaging.Core" />
     <PackageReference Include="NuGet.ProjectModel" />
     <PackageReference Include="NuGet.Versioning" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" />

From 6f8728750bade76efb2ef51df74e705e3653ecb6 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Thu, 27 Jun 2024 14:29:50 -0700
Subject: [PATCH 2/5] Update NuGet version

---
 Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index ea5f54c561..361c526dce 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -8,7 +8,7 @@
         <MicrosoftExtensionPackageVersion>8.0.0</MicrosoftExtensionPackageVersion>
         <MicrosoftTestPackageVersion>17.8.0</MicrosoftTestPackageVersion>
         <MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
-        <NuGetPackageVersion>6.10.0-preview.1.18</NuGetPackageVersion>
+        <NuGetPackageVersion>6.11.0-rc.110</NuGetPackageVersion>
         <RoslynPackageVersion>4.10.0-2.24112.8</RoslynPackageVersion>
         <XunitPackageVersion>2.6.1</XunitPackageVersion>
     </PropertyGroup>

From 23dccf0fc08724d2f90e77d874fdfb3cd83447a4 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Tue, 2 Jul 2024 07:49:02 -0700
Subject: [PATCH 3/5] Move to macos-12 image

macos-11 has been deprecated.
---
 .github/workflows/build.yml      | 2 +-
 .github/workflows/tests-net6.yml | 2 +-
 .github/workflows/tests.yml      | 2 +-
 azure-pipelines.yml              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c72e32c07e..96c7bcfbfd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-11]
+        os: [ubuntu-20.04, windows-2022, macos-12]
     name: 'Build'
     steps:
       - name: Checkout
diff --git a/.github/workflows/tests-net6.yml b/.github/workflows/tests-net6.yml
index 2672d41098..95e9a7e3fe 100644
--- a/.github/workflows/tests-net6.yml
+++ b/.github/workflows/tests-net6.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-11]
+        os: [ubuntu-20.04, windows-2022, macos-12]
         testProjects:
           - OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
           - OmniSharp.DotNetTest.Tests
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b7f5d7ea1f..cdf3a34616 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-11]
+        os: [ubuntu-20.04, windows-2022, macos-12]
         testProjects:
           - OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
           - OmniSharp.DotNetTest.Tests
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a10f46cdf5..72c7edfb17 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -55,7 +55,7 @@ jobs:
 
   - job: macOS
     pool:
-      vmImage: "macOS-11"
+      vmImage: "macos-12"
     dependsOn: GitVersion
     steps:
       - template: ./.pipelines/init.yml

From 66ff5f6335403989112de70f542b6904c6ff7297 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Tue, 2 Jul 2024 11:31:24 -0700
Subject: [PATCH 4/5] Fix casing

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 72c7edfb17..c95a660671 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -113,7 +113,7 @@ jobs:
 
   - job: Release
     pool:
-      vmImage: "Ubuntu-latest"
+      vmImage: "ubuntu-latest"
     dependsOn:
       - macOS
       - Linux

From 4ed2ca7217924970535a8c09b50987f4c0f58768 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Fri, 19 Jul 2024 06:23:16 -0700
Subject: [PATCH 5/5] Bump S.T.J to version 8.0.4

---
 Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 361c526dce..78587d5c43 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -88,7 +88,7 @@
         <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
         <PackageVersion Include="System.Memory" Version="4.5.5" />
         <PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
-        <PackageVersion Include="System.Text.Json" Version="8.0.0" />
+        <PackageVersion Include="System.Text.Json" Version="8.0.4" />
         <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
         <PackageVersion Include="System.ValueTuple" Version="4.5.0" />