From 4d62daf0780b61612b8a05955ae55c7e8f929088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 18 Feb 2025 15:08:13 -0800
Subject: [PATCH 1/8] Update dependencies coming from maintenance-packages

---
 NuGet.config       |  1 +
 eng/Versions.props | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index d30d1402844..3eabba42e9d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -25,6 +25,7 @@
     <add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
     <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="darc-pub-dotnet-maintenance-packages-3b65679f" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/darc-pub-dotnet-maintenance-packages-3b65679f/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/eng/Versions.props b/eng/Versions.props
index f4b5ae88140..8ca16b27235 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -71,21 +71,31 @@
     <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
     <!-- PR builds should explicitly specify a version number -->
   </PropertyGroup>
+  <!-- Packages that come from https://github.com/dotnet/maintenance-packages need to be conditionally selected: https://github.com/dotnet/sdk/issues/45155 -->
+  <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
+    <SystemRuntimeCompilerServicesUnsafeVersion>6.1.1</SystemRuntimeCompilerServicesUnsafeVersion>
+    <SystemValueTupleVersion>4.6.0</SystemValueTupleVersion>
+    <SystemMemoryVersion>4.6.0</SystemMemoryVersion>
+  </PropertyGroup>
+  <!-- Packages that come from https://github.com/dotnet/maintenance-packages need to be conditionally selected: https://github.com/dotnet/sdk/issues/45155 -->
+  <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
+    <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
+    <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
+    <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
+    <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <!-- System.* packages -->
     <!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
     updated in years, you most likely DON'T need it, please exercise caution when adding it to the list. -->
     <SystemPackageVersionVersion>8.0.0</SystemPackageVersionVersion>
-    <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
     <SystemCollectionsImmutableVersion>$(SystemPackageVersionVersion)</SystemCollectionsImmutableVersion>
     <SystemComponentModelCompositionVersion>$(SystemPackageVersionVersion)</SystemComponentModelCompositionVersion>
     <SystemCompositionVersion>$(SystemPackageVersionVersion)</SystemCompositionVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>$(SystemPackageVersionVersion)</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemMemoryVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">4.5.5</SystemMemoryVersion>
-    <SystemMemoryVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">4.6.0</SystemMemoryVersion>
     <SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
     <SystemReflectionMetadataVersion>$(SystemPackageVersionVersion)</SystemReflectionMetadataVersion>
-    <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
     <SystemThreadingTasksDataflow>$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow>
     <MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
     <!-- Versions for package groups -->

From 1303437f8c51cbe1141eca36da4432c61e76f1ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 18 Mar 2025 13:15:19 -0700
Subject: [PATCH 2/8] Remove temp feed

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

diff --git a/NuGet.config b/NuGet.config
index 3eabba42e9d..d30d1402844 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -25,7 +25,6 @@
     <add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
     <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="darc-pub-dotnet-maintenance-packages-3b65679f" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/darc-pub-dotnet-maintenance-packages-3b65679f/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

From 34e4f28ea5ed5e80d61cfaf0661f5aab90282b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 18 Mar 2025 13:15:51 -0700
Subject: [PATCH 3/8] Sort

---
 eng/Versions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 8ca16b27235..665eea43f33 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -74,16 +74,16 @@
   <!-- Packages that come from https://github.com/dotnet/maintenance-packages need to be conditionally selected: https://github.com/dotnet/sdk/issues/45155 -->
   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
     <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
+    <SystemMemoryVersion>4.6.0</SystemMemoryVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.1.1</SystemRuntimeCompilerServicesUnsafeVersion>
     <SystemValueTupleVersion>4.6.0</SystemValueTupleVersion>
-    <SystemMemoryVersion>4.6.0</SystemMemoryVersion>
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/maintenance-packages need to be conditionally selected: https://github.com/dotnet/sdk/issues/45155 -->
   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
     <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
+    <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
-    <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- System.* packages -->

From f9f3fed4b08f5d40e48bc4dfeee482c2aa2b78c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 18 Mar 2025 13:20:31 -0700
Subject: [PATCH 4/8] Push for real the changes this time

---
 eng/Versions.props                             | 14 +++-----------
 src/FSharp.Build/Microsoft.FSharp.NetSdk.props |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 665eea43f33..f8c315c0da4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -71,19 +71,11 @@
     <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
     <!-- PR builds should explicitly specify a version number -->
   </PropertyGroup>
-  <!-- Packages that come from https://github.com/dotnet/maintenance-packages need to be conditionally selected: https://github.com/dotnet/sdk/issues/45155 -->
-  <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+  <!-- Dependencies from maintenance-packages -->
+  <PropertyGroup>
     <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
-    <SystemMemoryVersion>4.6.0</SystemMemoryVersion>
+    <SystemMemoryVersion>4.6.1</SystemMemoryVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.1.1</SystemRuntimeCompilerServicesUnsafeVersion>
-    <SystemValueTupleVersion>4.6.0</SystemValueTupleVersion>
-  </PropertyGroup>
-  <!-- Packages that come from https://github.com/dotnet/maintenance-packages need to be conditionally selected: https://github.com/dotnet/sdk/issues/45155 -->
-  <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-    <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
-    <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
-    <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
-    <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- System.* packages -->
diff --git a/src/FSharp.Build/Microsoft.FSharp.NetSdk.props b/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
index 38d83cd8ab4..dd7f0364d2d 100644
--- a/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
+++ b/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
@@ -94,7 +94,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
   <Import Project="Microsoft.FSharp.Core.NetSdk.props" />                       <!-- Sets initial value of FSharp.Core -->
 
   <PropertyGroup>
-    <ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
+    <ValueTupleImplicitPackageVersion>4.6.0</ValueTupleImplicitPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

From ee568ec876d8e54b945c9cd5c652bcd3fa7b98f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Wed, 19 Mar 2025 17:42:53 -0700
Subject: [PATCH 5/8] Update to latest in nuget.org

---
 eng/Versions.props                             | 4 ++--
 src/FSharp.Build/Microsoft.FSharp.NetSdk.props | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index f8c315c0da4..b8e92fe5e67 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -73,8 +73,8 @@
   </PropertyGroup>
   <!-- Dependencies from maintenance-packages -->
   <PropertyGroup>
-    <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
-    <SystemMemoryVersion>4.6.1</SystemMemoryVersion>
+    <SystemBuffersVersion>4.6.1</SystemBuffersVersion>
+    <SystemMemoryVersion>4.6.2</SystemMemoryVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.1.1</SystemRuntimeCompilerServicesUnsafeVersion>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/FSharp.Build/Microsoft.FSharp.NetSdk.props b/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
index dd7f0364d2d..e45f864ce22 100644
--- a/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
+++ b/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
@@ -94,7 +94,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
   <Import Project="Microsoft.FSharp.Core.NetSdk.props" />                       <!-- Sets initial value of FSharp.Core -->
 
   <PropertyGroup>
-    <ValueTupleImplicitPackageVersion>4.6.0</ValueTupleImplicitPackageVersion>
+    <ValueTupleImplicitPackageVersion>4.6.1</ValueTupleImplicitPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

From c04382a1f9f345990a0d70ce4722e0d4b4c69603 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 21 Mar 2025 05:01:25 +0000
Subject: [PATCH 6/8] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250320.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.25163.3 -> To Version 9.0.0-alpha.1.25170.3
---
 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 d01cf73cceb..07e0a60188e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25163.3">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25170.3">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>27dfbb8d8a0344d845948109a5a1f0d9c7f17fa9</Sha>
+      <Sha>6968f7059f4418e985febe704a3b1320f9e5887d</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->

From eeaf85318dbe923ae1383eadf48676d54b652987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 25 Mar 2025 15:18:36 -0600
Subject: [PATCH 7/8] Bring back conditions

---
 eng/Versions.props | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index e43cf76d4c8..387a5ecf9c7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -71,12 +71,18 @@
     <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
     <!-- PR builds should explicitly specify a version number -->
   </PropertyGroup>
-  <!-- Dependencies from maintenance-packages -->
-  <PropertyGroup>
+  <!-- Dependencies from maintenance-packages, source-build specific -->
+  <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
     <SystemBuffersVersion>4.6.1</SystemBuffersVersion>
     <SystemMemoryVersion>4.6.2</SystemMemoryVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.1.1</SystemRuntimeCompilerServicesUnsafeVersion>
   </PropertyGroup>
+  <!-- Dependencies from maintenance-packages, everything else -->
+  <PropertyGroupCondition="'$(DotNetBuildSourceOnly)' != 'true'">
+    <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
+    <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
+    <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <!-- System.* packages -->
     <!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been

From a7628d1428edae1c5992a4631f595a4817ca2bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 25 Mar 2025 15:20:09 -0600
Subject: [PATCH 8/8] missing space

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 387a5ecf9c7..5ce287e802b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -78,7 +78,7 @@
     <SystemRuntimeCompilerServicesUnsafeVersion>6.1.1</SystemRuntimeCompilerServicesUnsafeVersion>
   </PropertyGroup>
   <!-- Dependencies from maintenance-packages, everything else -->
-  <PropertyGroupCondition="'$(DotNetBuildSourceOnly)' != 'true'">
+  <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
     <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
     <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
