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] 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" />