From ce56d32622b9811a21413d2c50156eb633c91784 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Wed, 17 Nov 2021 16:45:06 -0800
Subject: [PATCH 1/8] Exclude ASP.NET  runtime packs from Android

---
 src/redist/targets/GenerateBundledVersions.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 89eddb755..676485110 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -370,6 +370,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                               TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
                               RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
                               RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
+                              RuntimePackExcludedRuntimeIdentifiers="android"
                               />
 
     <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"

From 636ee9cff9e5f832dac3dfb5f2a9b92c00018ce7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 19 Nov 2021 03:38:17 +0000
Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/sdk
 build 20211118.19 (#12715)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211116-03 to 17.1.0-preview-20211117-01 (parent: Microsoft.NET.Sdk)
---
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6094e8a68..16c5809e1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -103,14 +103,14 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>7d941613047c847c87dc8d243a54fd1a45a47de7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21568.17">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21568.19">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>07a4696dba016ed0d06805f9ed8ad9c2537c7df5</Sha>
+      <Sha>a780470224c8082961d12608542c32c848564fcf</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21568.17">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21568.19">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>07a4696dba016ed0d06805f9ed8ad9c2537c7df5</Sha>
+      <Sha>a780470224c8082961d12608542c32c848564fcf</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rtm.21523.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -130,9 +130,9 @@
       <Sha>8bdf7ac23d71d62731dbc0226ee022e5f11a0645</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211116-03" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211117-01" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>011aeee4d491580dfe11477b89696829061a2d9c</Sha>
+      <Sha>a75faf902a1a5adeb6efbf8e392795c8f7e7f94c</Sha>
       <SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21519.4" CoherentParentDependency="Microsoft.NET.Sdk">
diff --git a/eng/Versions.props b/eng/Versions.props
index 310913eef..f91639b76 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,8 +56,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21568.17</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21568.17</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21568.19</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21568.19</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -150,7 +150,7 @@
   <PropertyGroup>
     <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
     <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
-    <MicrosoftNETTestSdkVersion>17.1.0-preview-20211116-03</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>17.1.0-preview-20211117-01</MicrosoftNETTestSdkVersion>
   </PropertyGroup>
   <!-- dependencies for source-build tarball -->
   <PropertyGroup>

From 0f7cff6396b5c4dcebd3970749789d2de343e4fc Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 22 Nov 2021 07:14:44 +0000
Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/sdk
 build 20211121.3 (#12720)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21523.2 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211117-01 to 17.1.0-preview-20211119-03 (parent: Microsoft.NET.Sdk)
---
 eng/Version.Details.xml | 20 ++++++++++----------
 eng/Versions.props      |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 16c5809e1..8fd1c83bb 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -90,27 +90,27 @@
       <Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
       <SourceBuild RepoName="test-templates" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.100" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.200-alpha.1.21568.2" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>7d941613047c847c87dc8d243a54fd1a45a47de7</Sha>
+      <Sha>f1a2b70faf2ff4d95a82bc68433ee934e51b4cde</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.100-rtm.21523.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.200-alpha.1.21568.2" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>7d941613047c847c87dc8d243a54fd1a45a47de7</Sha>
+      <Sha>f1a2b70faf2ff4d95a82bc68433ee934e51b4cde</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.100" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>7d941613047c847c87dc8d243a54fd1a45a47de7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21568.19">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21571.3">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>a780470224c8082961d12608542c32c848564fcf</Sha>
+      <Sha>cfe580de7c4d4c78f3ad364bfe48a3411dd51326</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21568.19">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21571.3">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>a780470224c8082961d12608542c32c848564fcf</Sha>
+      <Sha>cfe580de7c4d4c78f3ad364bfe48a3411dd51326</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rtm.21523.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -130,9 +130,9 @@
       <Sha>8bdf7ac23d71d62731dbc0226ee022e5f11a0645</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211117-01" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211119-03" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>a75faf902a1a5adeb6efbf8e392795c8f7e7f94c</Sha>
+      <Sha>d9060f58f36e67fd65527c585a0a0fdaf56e954e</Sha>
       <SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21519.4" CoherentParentDependency="Microsoft.NET.Sdk">
diff --git a/eng/Versions.props b/eng/Versions.props
index f91639b76..1f6088c03 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -31,7 +31,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/templating -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.100</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.200-alpha.1.21568.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -56,8 +56,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21568.19</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21568.19</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21571.3</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21571.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -150,7 +150,7 @@
   <PropertyGroup>
     <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
     <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
-    <MicrosoftNETTestSdkVersion>17.1.0-preview-20211117-01</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>17.1.0-preview-20211119-03</MicrosoftNETTestSdkVersion>
   </PropertyGroup>
   <!-- dependencies for source-build tarball -->
   <PropertyGroup>

From 93918d953f0b9cbd225f2385c0708d3f3ef37cf7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 22 Nov 2021 20:07:54 +0000
Subject: [PATCH 4/8] Update dependencies from https://github.com/dotnet/sdk
 build 20211122.10 (#12721)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk)
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8fd1c83bb..0edf85451 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -90,27 +90,27 @@
       <Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
       <SourceBuild RepoName="test-templates" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.200-alpha.1.21568.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.200-alpha.1.21572.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>f1a2b70faf2ff4d95a82bc68433ee934e51b4cde</Sha>
+      <Sha>3cdf2180028076da6f06f4da4b8767e33da92157</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.200-alpha.1.21568.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.200-alpha.1.21572.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>f1a2b70faf2ff4d95a82bc68433ee934e51b4cde</Sha>
+      <Sha>3cdf2180028076da6f06f4da4b8767e33da92157</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.100" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>7d941613047c847c87dc8d243a54fd1a45a47de7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21571.3">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21572.10">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>cfe580de7c4d4c78f3ad364bfe48a3411dd51326</Sha>
+      <Sha>aa3f5cfbb4897828544599893dcb1fefef4f74d0</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21571.3">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21572.10">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>cfe580de7c4d4c78f3ad364bfe48a3411dd51326</Sha>
+      <Sha>aa3f5cfbb4897828544599893dcb1fefef4f74d0</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rtm.21523.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 1f6088c03..06c630afa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -31,7 +31,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/templating -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.200-alpha.1.21568.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.200-alpha.1.21572.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -56,8 +56,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21571.3</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21571.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21572.10</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21572.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

From 0b0e761068f634647dc2d122cf0478660b978004 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 23 Nov 2021 12:05:13 +0000
Subject: [PATCH 5/8] Update dependencies from https://github.com/dotnet/sdk
 build 20211123.1 (#12723)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 12.0.1-beta.21565.6 to 12.0.1-beta.21572.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21565.6 to 6.0.2-beta.21572.8 (parent: Microsoft.NET.Sdk)
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0edf85451..357748a4b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -103,14 +103,14 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>7d941613047c847c87dc8d243a54fd1a45a47de7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21572.10">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21573.1">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>aa3f5cfbb4897828544599893dcb1fefef4f74d0</Sha>
+      <Sha>b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21572.10">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21573.1">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>aa3f5cfbb4897828544599893dcb1fefef4f74d0</Sha>
+      <Sha>b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rtm.21523.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -121,13 +121,13 @@
       <Uri>https://github.com/dotnet/wpf</Uri>
       <Sha>3f75a67c752a116de292affae29a22bbb5b71b18</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.1-beta.21565.6" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.1-beta.21572.8" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>8bdf7ac23d71d62731dbc0226ee022e5f11a0645</Sha>
+      <Sha>44e285721013feeedfa140298ea9f172a0c6fd70</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.2-beta.21565.6" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.2-beta.21572.8" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>8bdf7ac23d71d62731dbc0226ee022e5f11a0645</Sha>
+      <Sha>44e285721013feeedfa140298ea9f172a0c6fd70</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211119-03" CoherentParentDependency="Microsoft.NET.Sdk">
diff --git a/eng/Versions.props b/eng/Versions.props
index 06c630afa..46e02f8b4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,8 +56,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21572.10</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21572.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21573.1</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21573.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

From 79f2c912848c4677b55f2328e199e9662aefe129 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 23 Nov 2021 12:56:03 +0000
Subject: [PATCH 6/8] Update dependencies from https://github.com/dotnet/sdk
 build 20211123.2 (#12724)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211119-03 to 17.1.0-preview-20211122-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21572-15 (parent: Microsoft.NET.Sdk)
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 357748a4b..74a8c330a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -103,14 +103,14 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>7d941613047c847c87dc8d243a54fd1a45a47de7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21573.1">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21573.2">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c</Sha>
+      <Sha>448f9bdeb40789a50405eb4249db0ccd1a764b04</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21573.1">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21573.2">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>b2ad8b7ad25ce266dc7ace1a08e4e4a5d3e3ff2c</Sha>
+      <Sha>448f9bdeb40789a50405eb4249db0ccd1a764b04</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rtm.21523.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -130,9 +130,9 @@
       <Sha>44e285721013feeedfa140298ea9f172a0c6fd70</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211119-03" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211122-02" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>d9060f58f36e67fd65527c585a0a0fdaf56e954e</Sha>
+      <Sha>253c1efaa0adfcbc9b4b31de736d5fe2cbf27582</Sha>
       <SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21519.4" CoherentParentDependency="Microsoft.NET.Sdk">
@@ -146,9 +146,9 @@
       <Sha>c7d6f9fab845ffd943216da465022744e7d35f22</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.1.0-preview-21567-01" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Build" Version="17.1.0-preview-21572-15" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>7434b575d12157ef98aeaad3b86c8f235f551c41</Sha>
+      <Sha>513f59ce49ffd8adc333dabf70501ad68630348d</Sha>
       <SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="NuGet.Build.Tasks" Version="6.1.0-preview.1.38" CoherentParentDependency="Microsoft.NET.Sdk">
diff --git a/eng/Versions.props b/eng/Versions.props
index 46e02f8b4..eb6240de7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,8 +56,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21573.1</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21573.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21573.2</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21573.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -150,7 +150,7 @@
   <PropertyGroup>
     <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
     <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
-    <MicrosoftNETTestSdkVersion>17.1.0-preview-20211119-03</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>17.1.0-preview-20211122-02</MicrosoftNETTestSdkVersion>
   </PropertyGroup>
   <!-- dependencies for source-build tarball -->
   <PropertyGroup>

From a2bb0dde82022f7308b0204539c534e731e2f486 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 23 Nov 2021 17:57:30 +0000
Subject: [PATCH 7/8] Update dependencies from https://github.com/dotnet/sdk
 build 20211123.4 (#12726)

[release/6.0.2xx] Update dependencies from dotnet/sdk
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 74a8c330a..c857dc480 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -103,14 +103,14 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>7d941613047c847c87dc8d243a54fd1a45a47de7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21573.2">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21573.4">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>448f9bdeb40789a50405eb4249db0ccd1a764b04</Sha>
+      <Sha>6d13c6babe527bcfbaca00f340581a1b1a72087c</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21573.2">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21573.4">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>448f9bdeb40789a50405eb4249db0ccd1a764b04</Sha>
+      <Sha>6d13c6babe527bcfbaca00f340581a1b1a72087c</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rtm.21523.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index eb6240de7..b1f55cf0c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,8 +56,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21573.2</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21573.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21573.4</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21573.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

From 2ee0e6d76e7f886c62b2a5594d7b8400855c703c Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 29 Nov 2021 08:43:14 -0600
Subject: [PATCH 8/8] source-build patches needed to get 6.0.2xx building
 (#12718)

* source-build patches needed to get 6.0.2xx building

* Patch to address msbuild prebuilts

* Remove conflicting backported patch

* Additional patches

* Additional vstest patch

* Workaround dev-cert issue in smoke-tests
---
 src/SourceBuild/tarball/content/smoke-test.sh |   5 +-
 ...2-Update-system-command-line-version.patch | 164 ++++++++++++++++++
 ...tem.Threading.Tasks.DataFlow-version.patch |  28 +++
 ...oject-target-frameworks-for-source-b.patch |  41 +++++
 4 files changed, 236 insertions(+), 2 deletions(-)
 create mode 100644 src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch
 create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch
 create mode 100644 src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch

diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh
index fc034fecc..b3815b840 100755
--- a/src/SourceBuild/tarball/content/smoke-test.sh
+++ b/src/SourceBuild/tarball/content/smoke-test.sh
@@ -6,7 +6,7 @@ TARBALL_PREFIX=dotnet-sdk-
 VERSION_PREFIX=6.0
 # See https://github.com/dotnet/source-build/issues/579, this version
 # needs to be compatible with the runtime produced from source-build
-DEV_CERTS_VERSION_DEFAULT=6.0.0-preview.6.21355.2
+DEV_CERTS_VERSION_DEFAULT=6.0.0-rtm.21573.1
 __ROOT_REPO=$(sed 's/\r$//' "$SCRIPT_ROOT/artifacts/obj/rootrepo.txt") # remove CR if mounted repo on Windows drive
 executingUserHome=${HOME:-}
 
@@ -49,7 +49,8 @@ configuration="Release"
 excludeNonWebTests=false
 excludeWebTests=false
 excludeWebNoHttpsTests=false
-excludeWebHttpsTests=false
+# Re-enable once https://github.com/dotnet/sdk/issues/22734 is fixed.
+excludeWebHttpsTests=true
 excludeLocalTests=false
 excludeOnlineTests=false
 devCertsVersion="$DEV_CERTS_VERSION_DEFAULT"
diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch
new file mode 100644
index 000000000..4d5554a71
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch
@@ -0,0 +1,164 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Simons <msimons@microsoft.com>
+Date: Fri, 19 Nov 2021 13:50:52 -0600
+Subject: [PATCH] Update system-command-line version
+
+Backported with https://github.com/dotnet/format/pull/1436
+---
+ eng/Version.Details.xml                |  8 ++++----
+ eng/Versions.props                     |  4 ++--
+ src/Commands/FormatAnalyzersCommand.cs |  4 ++--
+ src/Commands/FormatCommandCommon.cs    | 12 ++++++------
+ src/Commands/FormatStyleCommand.cs     |  4 ++--
+ src/Commands/RootFormatCommand.cs      |  4 ++--
+ 6 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
+index 48b181b..68c0b43 100644
+--- a/eng/Version.Details.xml
++++ b/eng/Version.Details.xml
+@@ -5,13 +5,13 @@
+       <Uri>https://github.com/dotnet/roslyn</Uri>
+       <Sha>95b7a0198f8c805b367f17e4639020ec21c16705</Sha>
+     </Dependency>
+-    <Dependency Name="System.CommandLine" Version="2.0.0-beta1.21473.1">
++    <Dependency Name="System.CommandLine" Version="2.0.0-beta1.21525.1">
+       <Uri>https://github.com/dotnet/command-line-api</Uri>
+-      <Sha>82273cb56c83b589e8e5b63da0ac9745ffc6e105</Sha>
++      <Sha>09a24a79ef01a0c70655919ee3c59bb54a8574df</Sha>
+     </Dependency>
+-    <Dependency Name="System.CommandLine.Rendering" Version="0.3.0-alpha.21473.1">
++    <Dependency Name="System.CommandLine.Rendering" Version="0.3.0-alpha.21525.1">
+       <Uri>https://github.com/dotnet/command-line-api</Uri>
+-      <Sha>82273cb56c83b589e8e5b63da0ac9745ffc6e105</Sha>
++      <Sha>09a24a79ef01a0c70655919ee3c59bb54a8574df</Sha>
+     </Dependency>
+   </ProductDependencies>
+   <ToolsetDependencies>
+diff --git a/eng/Versions.props b/eng/Versions.props
+index 2758207..6a02917 100644
+--- a/eng/Versions.props
++++ b/eng/Versions.props
+@@ -18,8 +18,8 @@
+     <!-- Dependencies from https://github.com/dotnet/roslyn -->
+     <MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21515.3</MicrosoftNETCoreCompilersPackageVersion>
+     <!-- Dependencies from https://github.com/dotnet/command-line-api -->
+-    <SystemCommandLineVersion>2.0.0-beta1.21473.1</SystemCommandLineVersion>
+-    <SystemCommandLineRenderingVersion>0.3.0-alpha.21473.1</SystemCommandLineRenderingVersion>
++    <SystemCommandLineVersion>2.0.0-beta1.21525.1</SystemCommandLineVersion>
++    <SystemCommandLineRenderingVersion>0.3.0-alpha.21525.1</SystemCommandLineRenderingVersion>
+   </PropertyGroup>
+   <!--
+     Other Dependency versions
+diff --git a/src/Commands/FormatAnalyzersCommand.cs b/src/Commands/FormatAnalyzersCommand.cs
+index 322397e..0be3daf 100644
+--- a/src/Commands/FormatAnalyzersCommand.cs
++++ b/src/Commands/FormatAnalyzersCommand.cs
+@@ -37,13 +37,13 @@ namespace Microsoft.CodeAnalysis.Tools.Commands
+                 formatOptions = parseResult.ParseWorkspaceOptions(formatOptions);
+ 
+                 if (parseResult.HasOption(SeverityOption) &&
+-                    parseResult.ValueForOption(SeverityOption) is string { Length: > 0 } analyzerSeverity)
++                    parseResult.GetValueForOption(SeverityOption) is string { Length: > 0 } analyzerSeverity)
+                 {
+                     formatOptions = formatOptions with { AnalyzerSeverity = GetSeverity(analyzerSeverity) };
+                 }
+ 
+                 if (parseResult.HasOption(DiagnosticsOption) &&
+-                    parseResult.ValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
++                    parseResult.GetValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
+                 {
+                     formatOptions = formatOptions with { Diagnostics = diagnostics.ToImmutableHashSet() };
+                 }
+diff --git a/src/Commands/FormatCommandCommon.cs b/src/Commands/FormatCommandCommon.cs
+index fb69853..565c2d1 100644
+--- a/src/Commands/FormatCommandCommon.cs
++++ b/src/Commands/FormatCommandCommon.cs
+@@ -137,7 +137,7 @@ namespace Microsoft.CodeAnalysis.Tools
+         public static FormatOptions ParseVerbosityOption(this ParseResult parseResult, FormatOptions formatOptions)
+         {
+             if (parseResult.HasOption(VerbosityOption) &&
+-                parseResult.ValueForOption(VerbosityOption) is string { Length: > 0 } verbosity)
++                parseResult.GetValueForOption(VerbosityOption) is string { Length: > 0 } verbosity)
+             {
+                 formatOptions = formatOptions with { LogLevel = GetLogLevel(verbosity) };
+             }
+@@ -169,8 +169,8 @@ namespace Microsoft.CodeAnalysis.Tools
+ 
+             if (parseResult.HasOption(IncludeOption) || parseResult.HasOption(ExcludeOption))
+             {
+-                var fileToInclude = parseResult.ValueForOption(IncludeOption) ?? Array.Empty<string>();
+-                var fileToExclude = parseResult.ValueForOption(ExcludeOption) ?? Array.Empty<string>();
++                var fileToInclude = parseResult.GetValueForOption(IncludeOption) ?? Array.Empty<string>();
++                var fileToExclude = parseResult.GetValueForOption(ExcludeOption) ?? Array.Empty<string>();
+                 HandleStandardInput(logger, ref fileToInclude, ref fileToExclude);
+                 formatOptions = formatOptions with { FileMatcher = SourceFileMatcher.CreateMatcher(fileToInclude, fileToExclude) };
+             }
+@@ -179,7 +179,7 @@ namespace Microsoft.CodeAnalysis.Tools
+             {
+                 formatOptions = formatOptions with { ReportPath = string.Empty };
+ 
+-                if (parseResult.ValueForOption(ReportOption) is string { Length: > 0 } reportPath)
++                if (parseResult.GetValueForOption(ReportOption) is string { Length: > 0 } reportPath)
+                 {
+                     formatOptions = formatOptions with { ReportPath = reportPath };
+                 }
+@@ -189,7 +189,7 @@ namespace Microsoft.CodeAnalysis.Tools
+             {
+                 formatOptions = formatOptions with { BinaryLogPath = "format.binlog" };
+ 
+-                if (parseResult.ValueForOption(BinarylogOption) is string { Length: > 0 } binaryLogPath)
++                if (parseResult.GetValueForOption(BinarylogOption) is string { Length: > 0 } binaryLogPath)
+                 {
+                     formatOptions = Path.GetExtension(binaryLogPath)?.Equals(".binlog") == false
+                         ? (formatOptions with { BinaryLogPath = Path.ChangeExtension(binaryLogPath, ".binlog") })
+@@ -285,7 +285,7 @@ namespace Microsoft.CodeAnalysis.Tools
+         {
+             var currentDirectory = Environment.CurrentDirectory;
+ 
+-            if (parseResult.ValueForArgument<string>(SlnOrProjectArgument) is string { Length: > 0 } slnOrProject)
++            if (parseResult.GetValueForArgument<string>(SlnOrProjectArgument) is string { Length: > 0 } slnOrProject)
+             {
+                 if (parseResult.HasOption(FolderOption))
+                 {
+diff --git a/src/Commands/FormatStyleCommand.cs b/src/Commands/FormatStyleCommand.cs
+index b44398c..7839855 100644
+--- a/src/Commands/FormatStyleCommand.cs
++++ b/src/Commands/FormatStyleCommand.cs
+@@ -37,13 +37,13 @@ namespace Microsoft.CodeAnalysis.Tools.Commands
+                 formatOptions = parseResult.ParseWorkspaceOptions(formatOptions);
+ 
+                 if (parseResult.HasOption(SeverityOption) &&
+-                    parseResult.ValueForOption(SeverityOption) is string { Length: > 0 } styleSeverity)
++                    parseResult.GetValueForOption(SeverityOption) is string { Length: > 0 } styleSeverity)
+                 {
+                     formatOptions = formatOptions with { CodeStyleSeverity = GetSeverity(styleSeverity) };
+                 }
+ 
+                 if (parseResult.HasOption(DiagnosticsOption) &&
+-                    parseResult.ValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
++                    parseResult.GetValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
+                 {
+                     formatOptions = formatOptions with { Diagnostics = diagnostics.ToImmutableHashSet() };
+                 }
+diff --git a/src/Commands/RootFormatCommand.cs b/src/Commands/RootFormatCommand.cs
+index 741effb..40f8cc8 100644
+--- a/src/Commands/RootFormatCommand.cs
++++ b/src/Commands/RootFormatCommand.cs
+@@ -40,14 +40,14 @@ namespace Microsoft.CodeAnalysis.Tools.Commands
+                 formatOptions = parseResult.ParseWorkspaceOptions(formatOptions);
+ 
+                 if (parseResult.HasOption(SeverityOption) &&
+-                    parseResult.ValueForOption(SeverityOption) is string { Length: > 0 } defaultSeverity)
++                    parseResult.GetValueForOption(SeverityOption) is string { Length: > 0 } defaultSeverity)
+                 {
+                     formatOptions = formatOptions with { AnalyzerSeverity = GetSeverity(defaultSeverity) };
+                     formatOptions = formatOptions with { CodeStyleSeverity = GetSeverity(defaultSeverity) };
+                 }
+ 
+                 if (parseResult.HasOption(DiagnosticsOption) &&
+-                    parseResult.ValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
++                    parseResult.GetValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
+                 {
+                     formatOptions = formatOptions with { Diagnostics = diagnostics.ToImmutableHashSet() };
+                 }
diff --git a/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch b/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch
new file mode 100644
index 000000000..f48a864fe
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MichaelSimons <msimons@microsoft.com>
+Date: Tue, 23 Nov 2021 16:13:36 +0000
+Subject: [PATCH] Update System.Threading.Tasks.DataFlow version
+
+Addresses:
+NuGet.Build.Tasks.csproj : error NU1605: Detected package downgrade: System.Threading.Tasks.Dataflow from 6.0.0 to 4.9.0. Reference the package directly from the project to select a different version.  [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
+NuGet.Build.Tasks.csproj : error NU1605:  NuGet.Build.Tasks -> Microsoft.Build.Tasks.Core 17.1.0-preview-21572-15 -> System.Threading.Tasks.Dataflow (>= 6.0.0)  [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
+NuGet.Build.Tasks.csproj : error NU1605:  NuGet.Build.Tasks -> System.Threading.Tasks.Dataflow (>= 4.9.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
+
+Backport issue: https://github.com/dotnet/source-build/issues/2311
+---
+ build/packages.targets | 2 +-
+ 1 file changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/build/packages.targets b/build/packages.targets
+index a0aa4cc..ef5a1cc 100644
+--- a/build/packages.targets
++++ b/build/packages.targets
+@@ -58,7 +59,7 @@
+         <PackageReference Update="System.Security.Cryptography.Cng" Version="$(CryptographyPackagesVersion)" />
+         <PackageReference Update="System.Security.Cryptography.Pkcs" Version="$(CryptographyPackagesVersion)" />
+         <PackageReference Update="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
+-        <PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.9.0" />
++        <PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
+         <PackageReference Update="VSSDK.TemplateWizardInterface" Version="12.0.4" />
+         <PackageReference Update="VsWebSite.Interop" Version="$(VSFrameworkVersion)" />
+         <PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.9.0" />
diff --git a/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch b/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch
new file mode 100644
index 000000000..729c76c4e
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MichaelSimons <msimons@microsoft.com>
+Date: Tue, 23 Nov 2021 17:45:25 +0000
+Subject: [PATCH] Update nuspec project target frameworks for source-build
+
+This patch removes prebuilts caused from targetting netcoreapp1.0
+
+Backported with https://github.com/microsoft/vstest/pull/3188
+---
+ src/package/nuspec/Microsoft.TestPlatform.Build.csproj | 3 ++-
+ src/package/nuspec/Microsoft.TestPlatform.CLI.csproj   | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
+index 038fbf8..57cde8e 100644
+--- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
++++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
+@@ -1,7 +1,8 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>netcoreapp1.0</TargetFramework>
++    <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">netcoreapp1.0</TargetFramework>
++    <TargetFramework Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFramework>
+     <CheckEolTargetFramework>false</CheckEolTargetFramework>
+     <NuspecFile>TestPlatform.Build.nuspec</NuspecFile>
+     <NuspecProperties>version=$(Version)</NuspecProperties>
+diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
+index 29198ba..19386eb 100644
+--- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
++++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
+@@ -1,7 +1,8 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>netcoreapp1.0</TargetFramework>
++    <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">netcoreapp1.0</TargetFramework>
++    <TargetFramework Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFramework>
+     <CheckEolTargetFramework>false</CheckEolTargetFramework>
+     <NuspecFile>TestPlatform.CLI.nuspec</NuspecFile>
+     <NuspecProperties>version=$(Version)</NuspecProperties>