From 6f65bfca9ce7afc4b3a081b8f7406d046301d27e Mon Sep 17 00:00:00 2001
From: Tomas Matousek <tomat@microsoft.com>
Date: Wed, 8 May 2024 20:34:30 +0000
Subject: [PATCH 1/5] Update BuildHost STJ to 8.0.4 Update STJ shipping with
 InteractiveHost to 8.0.4

Binding redirect is auto-generated for netfx buildhost and interactive host
---
 NuGet.config                                                    | 1 +
 src/Interactive/HostProcess/x64/InteractiveHost64.csproj        | 2 ++
 src/Interactive/HostProcess/x86/InteractiveHost32.csproj        | 2 ++
 .../Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj  | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/NuGet.config b/NuGet.config
index 26a2f6f90d445..61b14406e7c25 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -21,6 +21,7 @@
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <add key="vs-impl-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl-archived/nuget/v3/index.json" />
     <add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fa5b0d8f/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/src/Interactive/HostProcess/x64/InteractiveHost64.csproj b/src/Interactive/HostProcess/x64/InteractiveHost64.csproj
index e25b24b5b5ee0..484eea7d74548 100644
--- a/src/Interactive/HostProcess/x64/InteractiveHost64.csproj
+++ b/src/Interactive/HostProcess/x64/InteractiveHost64.csproj
@@ -24,6 +24,8 @@
     <ProjectReference Include="..\..\Host\Microsoft.CodeAnalysis.InteractiveHost.csproj" />
     <Content Include="..\App.config" />
     <Compile Include="..\InteractiveHostEntryPoint.cs" />
+
+    <PackageReference Include="System.Text.Json" VersionOverride="8.0.4" />
   </ItemGroup>
 
   <Target Name="PublishProjectOutputGroup" DependsOnTargets="Publish" Returns="@(_PublishedFiles)">
diff --git a/src/Interactive/HostProcess/x86/InteractiveHost32.csproj b/src/Interactive/HostProcess/x86/InteractiveHost32.csproj
index d32f4393c6225..fabdc4fe0b788 100644
--- a/src/Interactive/HostProcess/x86/InteractiveHost32.csproj
+++ b/src/Interactive/HostProcess/x86/InteractiveHost32.csproj
@@ -18,6 +18,8 @@
     <ProjectReference Include="..\..\Host\Microsoft.CodeAnalysis.InteractiveHost.csproj" />
     <Content Include="..\App.config" />
     <Compile Include="..\InteractiveHostEntryPoint.cs" />
+
+    <PackageReference Include="System.Text.Json" VersionOverride="8.0.4" />
   </ItemGroup>
 
   <!--
diff --git a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
index 063d82e3b829a..c85a6a8c71ece 100644
--- a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
+++ b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="Microsoft.Build.Framework" VersionOverride="17.3.2" ExcludeAssets="Runtime" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" VersionOverride="17.3.2" ExcludeAssets="Runtime" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Build.Locator" PrivateAssets="All" />
-    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="System.Text.Json" VersionOverride="8.0.4" PrivateAssets="All" Condition="'$(DotnetBuildFromSource)' != 'true'"/>
     <PackageReference Include="System.CommandLine" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="Newtonsoft.Json" />

From 34458d76251f6b26233e5005468b98f40d65fa86 Mon Sep 17 00:00:00 2001
From: Tomas Matousek <tomat@microsoft.com>
Date: Thu, 9 May 2024 12:55:18 -0700
Subject: [PATCH 2/5] Revert interactive window changes

---
 src/Interactive/HostProcess/x64/InteractiveHost64.csproj | 2 --
 src/Interactive/HostProcess/x86/InteractiveHost32.csproj | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/Interactive/HostProcess/x64/InteractiveHost64.csproj b/src/Interactive/HostProcess/x64/InteractiveHost64.csproj
index 484eea7d74548..e25b24b5b5ee0 100644
--- a/src/Interactive/HostProcess/x64/InteractiveHost64.csproj
+++ b/src/Interactive/HostProcess/x64/InteractiveHost64.csproj
@@ -24,8 +24,6 @@
     <ProjectReference Include="..\..\Host\Microsoft.CodeAnalysis.InteractiveHost.csproj" />
     <Content Include="..\App.config" />
     <Compile Include="..\InteractiveHostEntryPoint.cs" />
-
-    <PackageReference Include="System.Text.Json" VersionOverride="8.0.4" />
   </ItemGroup>
 
   <Target Name="PublishProjectOutputGroup" DependsOnTargets="Publish" Returns="@(_PublishedFiles)">
diff --git a/src/Interactive/HostProcess/x86/InteractiveHost32.csproj b/src/Interactive/HostProcess/x86/InteractiveHost32.csproj
index fabdc4fe0b788..d32f4393c6225 100644
--- a/src/Interactive/HostProcess/x86/InteractiveHost32.csproj
+++ b/src/Interactive/HostProcess/x86/InteractiveHost32.csproj
@@ -18,8 +18,6 @@
     <ProjectReference Include="..\..\Host\Microsoft.CodeAnalysis.InteractiveHost.csproj" />
     <Content Include="..\App.config" />
     <Compile Include="..\InteractiveHostEntryPoint.cs" />
-
-    <PackageReference Include="System.Text.Json" VersionOverride="8.0.4" />
   </ItemGroup>
 
   <!--

From cbc06e4fd40b1d444fe169acd55662c2604c78c0 Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <mmitche@microsoft.com>
Date: Mon, 13 May 2024 13:25:38 -0700
Subject: [PATCH 3/5] add variable group and remove old one

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

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 5f681633869f5..464376831d29b 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -50,9 +50,9 @@ variables:
   # To retrieve OptProf data we need to authenticate to the VS drop storage.
   # Get access token with $dn-bot-devdiv-drop-rw-code-rw and dn-bot-dnceng-build-rw-code-rw from DotNet-VSTS-Infra-Access
   # Get $AccessToken-dotnet-build-bot-public-repo from DotNet-Versions-Publish
-  - group: DotNet-Versions-Publish
   - group: DotNet-VSTS-Infra-Access
   - group: DotNet-DevDiv-Insertion-Workflow-Variables
+  - group: AzureDevOps-Artifact-Feeds-Pats
   - name: _DevDivDropAccessToken
     value: $(dn-bot-devdiv-drop-rw-code-rw)
   - name: ArtifactServices.Drop.PAT

From 312dad66d5452299e847a970ac34bbb4c205fc64 Mon Sep 17 00:00:00 2001
From: Shen Chen <shech@microsoft.com>
Date: Thu, 18 Jul 2024 13:16:44 -0700
Subject: [PATCH 4/5] Remove the internal feed

---
 NuGet.config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NuGet.config b/NuGet.config
index 61b14406e7c25..26a2f6f90d445 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -21,7 +21,6 @@
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <add key="vs-impl-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl-archived/nuget/v3/index.json" />
     <add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fa5b0d8f/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

From ff970953118b79d937ce90db703b44ec80cd307d Mon Sep 17 00:00:00 2001
From: Shen Chen <shech@microsoft.com>
Date: Thu, 18 Jul 2024 21:51:59 -0700
Subject: [PATCH 5/5] add group back

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

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 464376831d29b..ee71193f27f7a 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -50,6 +50,7 @@ variables:
   # To retrieve OptProf data we need to authenticate to the VS drop storage.
   # Get access token with $dn-bot-devdiv-drop-rw-code-rw and dn-bot-dnceng-build-rw-code-rw from DotNet-VSTS-Infra-Access
   # Get $AccessToken-dotnet-build-bot-public-repo from DotNet-Versions-Publish
+  - group: DotNet-Versions-Publish
   - group: DotNet-VSTS-Infra-Access
   - group: DotNet-DevDiv-Insertion-Workflow-Variables
   - group: AzureDevOps-Artifact-Feeds-Pats