From 70a697e5f1803c979bac0db52b03f1d68f72464b Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 30 Apr 2024 14:33:51 -0700
Subject: [PATCH 1/6] Update msbuild version to 17.3.4

---
 ...osoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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..bac4691c9b259 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
@@ -22,11 +22,11 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <!-- We specifically reference Microsoft.Build 17.3.2, since it's the oldest version still compatible net6.0. The version targeted is only used for build time, since
+    <!-- We specifically reference Microsoft.Build 17.3.4, since it's the oldest version still compatible net6.0. The version targeted is only used for build time, since
          we use MSBuildLocator to discover the proper version at runtime. -->
-    <PackageReference Include="Microsoft.Build" VersionOverride="17.3.2" ExcludeAssets="Runtime" PrivateAssets="All" />
-    <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" VersionOverride="17.3.4" ExcludeAssets="Runtime" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Framework" VersionOverride="17.3.4" ExcludeAssets="Runtime" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" VersionOverride="17.3.4" ExcludeAssets="Runtime" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Build.Locator" PrivateAssets="All" />
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.CommandLine" />

From e5f2d789940d71216be82dc3b6d5e68326f94686 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 30 Apr 2024 15:58:07 -0700
Subject: [PATCH 2/6] Update the source build version to 17.3.4

---
 eng/Directory.Packages.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index ea4b42a8e1785..836a54f764667 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -31,9 +31,9 @@
   -->
 
   <ItemGroup Condition="'$(DotnetBuildFromSource)' == 'true'">
-    <PackageVersion Include="Microsoft.Build" Version="17.3.2" />
-    <PackageVersion Include="Microsoft.Build.Framework" Version="17.3.2" />
-    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.3.2" />
+    <PackageVersion Include="Microsoft.Build" Version="17.3.4" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.3.4" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.3.4" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotnetBuildFromSource)' != 'true' and '$(TargetFramework)' != 'net472'">

From 04873268f236f135febc257f81becb0ed6bd0b24 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 7 May 2024 16:07:22 -0700
Subject: [PATCH 3/6] Update to the source build build with the 17.3.4 msbuild
 version Remove the xliff-tasks coherency as that dependency doesn't exist in
 arcade

---
 eng/Version.Details.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4d8f571a33d6d..62f89cdfe09f4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -8,9 +8,9 @@
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24161.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24257.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>8d6e9cf10f64ff8fc02e434b516f6ca87c4b7215</Sha>
+      <Sha>2ae84974a931d184c92865610453a65903118796</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.CommandLine" Version="2.0.0-beta4.24126.1">
@@ -125,7 +125,7 @@
       <Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.xliff-tasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.xliff-tasks" Version="1.0.0-beta.23475.1">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
       <Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />

From a67892b819e0c25c255d4a5d2f641d2197eeda8d Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 10 May 2024 14:02:39 -0700
Subject: [PATCH 4/6] try updating externals to the 8.0 version as well to see
 if that fixes source build

---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 62f89cdfe09f4..d140a42689cef 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,9 +2,9 @@
 <Dependencies>
   <ProductDependencies>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24168.3">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24256.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>b46b7e6859f4094cd7f3e00dc0471d62f5d8d051</Sha>
+      <Sha>2b7510ccda2be01e2a2b48598498dca24fb69c3a</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->

From c25070a8a6b267743640e0e319fc027b4e5cb25e Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 13 May 2024 17:33:17 +0000
Subject: [PATCH 5/6] Add allowed prebuilts for assemblies declared in
 Version.Details.xml as non-Source-build

---
 eng/SourceBuildPrebuiltBaseline.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 592d3954059e8..29af91095af97 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -22,16 +22,21 @@
     <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0*" />
 
      <!-- This is upgraded to latest version in full source-build and can be baselined for repo build -->
+    <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces*/8.0*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions*/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Configuration*/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Logging*/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Options.ConfigurationExtension*/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Options/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/8.0*" />
-    <UsagePattern IdentityGlob="System.Composition*/7.0*" />
+    <UsagePattern IdentityGlob="System.Collections.Immutable*/8.0*" />
+    <UsagePattern IdentityGlob="System.Composition*/8.0*" />
     <UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/8.0*" />
     <UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/8.0*" />
     <UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0*" />
+    <UsagePattern IdentityGlob="System.IO.Pipelines/8.0*" />
+    <UsagePattern IdentityGlob="System.Reflection.Metadata/8.0*" />
     <UsagePattern IdentityGlob="System.Resources.Extensions/8.0*" />
     <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/8.0*" />
     <UsagePattern IdentityGlob="System.Security.Permissions/8.0*" />

From 7f68dc41aadea272b37f4a255d242517e39270a1 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 13 May 2024 19:23:12 +0000
Subject: [PATCH 6/6] Add System.Threading.Tasks.Dataflow product dependency

---
 eng/Directory.Packages.props        | 2 +-
 eng/SourceBuildPrebuiltBaseline.xml | 7 ++++---
 eng/Version.Details.xml             | 4 ++++
 eng/Versions.props                  | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 836a54f764667..63bbd6c066812 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -202,7 +202,7 @@
     <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="8.0.0" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowVersion)" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsVersion)" />
 
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 29af91095af97..2f6e57b3eb31a 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -22,15 +22,15 @@
     <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0*" />
 
      <!-- This is upgraded to latest version in full source-build and can be baselined for repo build -->
-    <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces*/8.0*" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions*/8.0*" />
+    <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/8.0*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Configuration*/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Logging*/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Options.ConfigurationExtension*/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Options/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/8.0*" />
-    <UsagePattern IdentityGlob="System.Collections.Immutable*/8.0*" />
+    <UsagePattern IdentityGlob="System.Collections.Immutable/8.0*" />
     <UsagePattern IdentityGlob="System.Composition*/8.0*" />
     <UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/8.0*" />
     <UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/8.0*" />
@@ -42,6 +42,7 @@
     <UsagePattern IdentityGlob="System.Security.Permissions/8.0*" />
     <UsagePattern IdentityGlob="System.Text.Encodings.Web/8.0*" />
     <UsagePattern IdentityGlob="System.Text.Json/8.0*" />
+    <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/8.0*" />
     <UsagePattern IdentityGlob="System.Windows.Extensions/8.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Configuration*/7.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Logging*/7.0*" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d140a42689cef..9b4e291689f1a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -84,6 +84,10 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
+    <Dependency Name="System.Threading.Tasks.Dataflow" Version="8.0.0">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+    </Dependency>
     <Dependency Name="System.Reflection.Metadata" Version="8.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index ca2c67bff31aa..45e129c7d68b7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,6 +34,7 @@
     <!-- Note: When updating SystemTextJsonVersion ensure that the version is no higher than what is used by MSBuild. -->
     <SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
     <SystemTextJsonVersion>8.0.0</SystemTextJsonVersion>
+    <SystemThreadingTasksDataflowVersion>8.0.0</SystemThreadingTasksDataflowVersion>
     <SystemWindowsExtensionsVersion>8.0.0</SystemWindowsExtensionsVersion>
     <MicrosoftBclAsyncInterfacesVersion>8.0.0</MicrosoftBclAsyncInterfacesVersion>
     <MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>