From 2eaeea46973b06c56d668316dbde58ced40c558b Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Tue, 5 Jul 2022 15:00:58 +0000
Subject: [PATCH 1/4] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20220705.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22314.1 -> To Version 6.0.0-servicing.22355.1
---
 NuGet.config            | 16 ++++++++++++++++
 eng/Version.Details.xml |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 4f5d25388..208608d74 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,6 +8,8 @@
     <!--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-773e8cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-773e8cc3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-773e8cc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-773e8cc3-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-773e8cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-773e8cc3-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
@@ -15,12 +17,18 @@
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-0ec02c8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0ec02c8c/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-0ec02c8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0ec02c8c-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-0ec02c8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0ec02c8c-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-int-dotnet-templating-416d9a7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-416d9a7a/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-416d9a7-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-416d9a7a-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-416d9a7-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-416d9a7a-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-657c81c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-657c81c5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-657c81c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-657c81c5-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-657c81c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-657c81c5-1/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" />
@@ -39,14 +47,22 @@
   <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-773e8cc-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-773e8cc-2" value="true" />
     <add key="darc-int-dotnet-aspnetcore-773e8cc" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-0ec02c8-1" value="true" />
+    <add key="darc-int-dotnet-runtime-0ec02c8-2" value="true" />
     <add key="darc-int-dotnet-runtime-0ec02c8" value="true" />
     <!--  Begin: Package sources from dotnet-templating -->
+    <add key="darc-int-dotnet-templating-416d9a7-1" value="true" />
+    <add key="darc-int-dotnet-templating-416d9a7-2" value="true" />
     <add key="darc-int-dotnet-templating-416d9a7" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-657c81c-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-657c81c-2" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-657c81c" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 229d3fa85..d3ecfe824 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -211,9 +211,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22314.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22355.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b</Sha>
+      <Sha>ffa2b64e8de11f0d148b7167c647fead3f2c33cb</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 f3f06aa629a4691321947c922683cabf7c550e50 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Thu, 7 Jul 2022 14:58:35 +0000
Subject: [PATCH 2/4] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20220707.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22314.1 -> To Version 6.0.0-servicing.22357.1
---
 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 d3ecfe824..bae0da4eb 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -211,9 +211,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22355.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22357.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>ffa2b64e8de11f0d148b7167c647fead3f2c33cb</Sha>
+      <Sha>9dc0c80c3c275ed32fa9aff1d86ef204550cc1f6</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 8da36a991a37cf251851962fb37ebe8d1d3c4851 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Wed, 13 Jul 2022 15:07:16 +0000
Subject: [PATCH 3/4] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20220713.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22314.1 -> To Version 6.0.0-servicing.22363.1
---
 NuGet.config            | 18 ------------------
 eng/Version.Details.xml |  4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 208608d74..a983e09b4 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -16,19 +16,10 @@
     <!--  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-0ec02c8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0ec02c8c/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-0ec02c8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0ec02c8c-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-0ec02c8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0ec02c8c-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-416d9a7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-416d9a7a/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-416d9a7-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-416d9a7a-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-416d9a7-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-416d9a7a-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-657c81c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-657c81c5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-657c81c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-657c81c5-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-657c81c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-657c81c5-1/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" />
@@ -52,18 +43,9 @@
     <add key="darc-int-dotnet-aspnetcore-773e8cc" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-0ec02c8-1" value="true" />
-    <add key="darc-int-dotnet-runtime-0ec02c8-2" value="true" />
-    <add key="darc-int-dotnet-runtime-0ec02c8" value="true" />
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-416d9a7-1" value="true" />
-    <add key="darc-int-dotnet-templating-416d9a7-2" value="true" />
-    <add key="darc-int-dotnet-templating-416d9a7" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-657c81c-1" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-657c81c-2" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-657c81c" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bae0da4eb..787c6311d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -211,9 +211,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22357.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22363.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>9dc0c80c3c275ed32fa9aff1d86ef204550cc1f6</Sha>
+      <Sha>08e4967761f81c4c40b6872a0e639b4f588b4f00</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 0933d6bb73866f1cbce73c3de1ad1ba0fbc86293 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 14 Jul 2022 16:42:40 -0700
Subject: [PATCH 4/4] Fix bad merge.

---
 NuGet.config | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 5964b8145..bfbdd60d4 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,9 +7,7 @@
     <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-773e8cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-773e8cc3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-773e8cc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-773e8cc3-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-773e8cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-773e8cc3-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-6a01dd1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6a01dd1e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
@@ -41,9 +39,7 @@
   <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-773e8cc-1" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-773e8cc-2" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-773e8cc" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-6a01dd1" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-f316191" value="true" />