From f67f24dc204ac213bcf07f38c3e86460d6fbf05f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 16 Dec 2021 15:16:48 +0000
Subject: [PATCH 1/4] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20211216.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.21614.3 -> To Version 6.0.0-alpha.1.21616.1
---
 NuGet.config            | 8 ++++----
 eng/Version.Details.xml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index a6823f5e3..8f64eb5d7 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,18 +7,18 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-4e7d976" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4e7d9764/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-3a25a7f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3a25a7f1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-ef15b55-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef15b555-6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-ef15b55-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef15b555-5/nuget/v3/index.json" />
     <add key="darc-int-dotnet-windowsdesktop-ef15b55" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef15b555/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -40,12 +40,12 @@
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-4e7d976" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-3a25a7f" value="true" />
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-ef15b55" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-ef15b55-5" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-ef15b55-6" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6b4d393c7..9875748d4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -211,9 +211,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.21614.3">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21616.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>371b3c7cb21a14ca703a6c6b966c4ce83d6902a2</Sha>
+      <Sha>135c9120e2cf8ff7bfc5dbccbda89a5f0ba3ab6a</Sha>
       <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

From b00ba9b79ef6069ade4da524b9604e5c5d95da9b Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 6 Jan 2022 17:46:04 -0800
Subject: [PATCH 2/4] Fix installertype path for patches

---
 src/redist/targets/GenerateMSIs.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index e0e948128..b10e2d1e8 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -167,7 +167,7 @@
                       '$(SdkMSIInstallerFile)' ^
                       '$(WixRoot)' ^
                       '$(ToolsetBrandName)' ^
-                      '$(VersionPrefix)' ^
+                      '$(CliProductBandVersion)00' ^
                       '$(MsiVersion)' ^
                       '$(SDKBundleVersion)' ^
                       '$(Version)' ^

From 351dbd3ecca181c38d2652c0738d5ca72a4b4cef Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 12 Jan 2022 03:18:18 +0000
Subject: [PATCH 3/4] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20220111.1
 (#13007)

[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
---
 NuGet.config            | 6 ------
 eng/Version.Details.xml | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 8f64eb5d7..6812f9b81 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -17,9 +17,6 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-ef15b55-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef15b555-6/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-ef15b55-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef15b555-5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-ef15b55" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef15b555/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -43,9 +40,6 @@
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-ef15b55" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-ef15b55-5" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-ef15b55-6" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9875748d4..2c123d57d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -211,9 +211,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21616.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22061.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>135c9120e2cf8ff7bfc5dbccbda89a5f0ba3ab6a</Sha>
+      <Sha>753383f8a8b0f5a7489c76252e6e383e47c97b2a</Sha>
       <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

From fbda78a56756bb7a5e5f15bbbc1a0211e750c81a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 15:49:17 +0000
Subject: [PATCH 4/4] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20220113.1
 (#13025)

[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
---
 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 2c123d57d..be14086c8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -211,9 +211,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22061.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22063.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>753383f8a8b0f5a7489c76252e6e383e47c97b2a</Sha>
+      <Sha>f5bc8bd3d3a2738be1095b2ca4f928504acb4801</Sha>
       <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">