From 9df348884d6ef95d95e65632f4019715138544a9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 3 Dec 2021 16:29:58 -0600
Subject: [PATCH 1/5] [release/6.0.2xx] Update dependencies from dotnet/sdk
 (#12727)

* Update dependencies from https://github.com/dotnet/sdk build 20211123.8

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.8

Dependency coherency updates

Microsoft.Build
 From Version 17.1.0-preview-21572-15 -> To Version 17.1.0-preview-21573-03 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211123.9

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.9

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.0.0-6.21526.21 -> To Version 4.1.0-2.21573.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211123.12

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.12

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.0.0-6.21526.21 -> To Version 4.1.0-2.21573.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211123.18

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.18

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211124.1

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.1

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211124.2

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.2

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211124.12

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.12

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211124.13

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.13

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211124.15

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.15

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211124.17

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.17

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211124.18

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.18

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211125.4

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.4

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211125.7

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.7

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211125.9

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.9

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-01 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211125.12

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.12

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-03 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211126.1

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21576.1

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-03 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211126.2

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21576.2

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-03 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211128.1

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21578.1

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211126-02 (parent: Microsoft.NET.Sdk

* Resolve source-build patch conflicts

* Update dependencies from https://github.com/dotnet/sdk build 20211129.3

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21579.3

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211129.6

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21579.6

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211129.10

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21579.10

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211130.1

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.1

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211130.3

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.3

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211130.9

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.9

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211130.12

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.12

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211201.3

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21601.3

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211201.7

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21601.7

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211130-04 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
---
 eng/Version.Details.xml                       | 24 +++++++-------
 eng/Versions.props                            |  6 ++--
 ...y-on-MS.VS.Setup.Configuration.Inter.patch | 17 +---------
 ...e-powered-source-build-patches-55823.patch | 33 -------------------
 ...st-build-of-csi-vbi-for-source-build.patch |  4 +--
 5 files changed, 18 insertions(+), 66 deletions(-)
 delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c857dc480..fa0fcb268 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.4">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21601.7">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>6d13c6babe527bcfbaca00f340581a1b1a72087c</Sha>
+      <Sha>69a5d503ce8a54af2a58fc37c0adf3d3794f0801</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21573.4">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21601.7">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>6d13c6babe527bcfbaca00f340581a1b1a72087c</Sha>
+      <Sha>69a5d503ce8a54af2a58fc37c0adf3d3794f0801</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-20211122-02" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211130-04" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>253c1efaa0adfcbc9b4b31de736d5fe2cbf27582</Sha>
+      <Sha>7f3499467c833d54d1e100d33d2ee54455112bd2</Sha>
       <SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21519.4" CoherentParentDependency="Microsoft.NET.Sdk">
@@ -141,19 +141,19 @@
       <SourceBuild RepoName="linker" ManagedOnly="true" />
       <RepoName>linker</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-6.21526.21" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.1.0-2.21601.2" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>c7d6f9fab845ffd943216da465022744e7d35f22</Sha>
+      <Sha>1073bc6ce7a0eb08968656e10042970d2f7b3b1d</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.1.0-preview-21572-15" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Build" Version="17.1.0-preview-21579-05" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>513f59ce49ffd8adc333dabf70501ad68630348d</Sha>
+      <Sha>23940013c60c33c183e52547ce6ca535b6689d4c</Sha>
       <SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.1.0-preview.1.38" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.1.0-preview.1.47" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a998efecd431ec8a41536b5ac0152c16f1e2e646</Sha>
+      <Sha>c14b85a00c03933c708c7d38fefeda9898a21488</Sha>
       <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
diff --git a/eng/Versions.props b/eng/Versions.props
index b1f55cf0c..54c72d104 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.4</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21573.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21601.7</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21601.7</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-20211122-02</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>17.1.0-preview-20211130-04</MicrosoftNETTestSdkVersion>
   </PropertyGroup>
   <!-- dependencies for source-build tarball -->
   <PropertyGroup>
diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch
index 80f65c174..b82c812ab 100644
--- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch
+++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch
@@ -7,28 +7,13 @@ Removes prebuilts.
 
 Background Issue: https://github.com/dotnet/source-build/issues/2542
 ---
- eng/Packages.props                             | 3 ---
  src/Build/Microsoft.Build.csproj               | 4 +++-
  src/Directory.BeforeCommon.targets             | 2 +-
  src/Samples/Directory.Build.props              | 1 +
  src/Tasks/Microsoft.Build.Tasks.csproj         | 4 +++-
  src/Utilities/Microsoft.Build.Utilities.csproj | 2 +-
- 6 files changed, 9 insertions(+), 7 deletions(-)
+ 5 files changed, 9 insertions(+), 4 deletions(-)
 
-diff --git a/eng/Packages.props b/eng/Packages.props
-index 494c9c0..7689042 100644
---- a/eng/Packages.props
-+++ b/eng/Packages.props
-@@ -46,9 +46,6 @@
- 
-   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
-     <GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
--  </ItemGroup>
--
--  <ItemGroup>
-     <GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
-   </ItemGroup>
- 
 diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
 index d08e337c5..3b173aee5 100644
 --- a/src/Build/Microsoft.Build.csproj
diff --git a/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch
deleted file mode 100644
index 8e3884438..000000000
--- a/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1a415d2019d74bcf009134326d1c25798589de64 Mon Sep 17 00:00:00 2001
-From: Chris Rummel <crummel@microsoft.com>
-Date: Tue, 19 Oct 2021 11:39:32 -0500
-Subject: [PATCH] Apply arcade-powered source-build patches (#55823)
-
-Don't include desktop artifacts that don't exist in source-build.
-Source-build doesn't have these artifacts available, even when we eventually will
-build desktop TFMs, because Roslyn is one of the first builds in source-build.
-Instead Roslyn is picking up reference packages that don't have the `lib` directory
-which is causing a build failure.  This disables the attempt to grab these desktop
-artifacts so source-build just skips them instead.
-
-Backported to roslyn with https://github.com/dotnet/roslyn/pull/55823
----
- .../DesktopCompilerArtifacts.targets                            | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
-index c8b87ab6958..107ff051b51 100644
---- a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
-+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
-@@ -20,7 +20,7 @@
-     VS training data to the assemblies they produce.
-   -->
- 
--  <Target Name="InitializeDesktopCompilerArtifacts">
-+  <Target Name="InitializeDesktopCompilerArtifacts" Condition="'$(DotNetBuildFromSource)' != 'true'">
-     <ItemGroup>
-       
-       <!-- The Roslyn built binaries must be taken from these locations because this is the location where signing occurs -->
--- 
-2.31.1
-
diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch
index f94119820..0afe8be53 100644
--- a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch
+++ b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch
@@ -22,7 +22,7 @@ index 3970bb4e9ea..e96beb550d2 100644
 @@ -6,6 +6,7 @@
      <OutputType>Exe</OutputType>
      <RootNamespace>CSharpInteractive</RootNamespace>
-     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
+     <TargetFrameworks>net6.0;net472</TargetFrameworks>
 +    <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
    </PropertyGroup>
    <ItemGroup Label="Project References">
@@ -34,7 +34,7 @@ index 5bbdf7f03a7..5f732d71534 100644
 @@ -6,6 +6,7 @@
      <OutputType>Exe</OutputType>
      <StartupObject>Sub Main</StartupObject>
-     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
+     <TargetFrameworks>net6.0;net472</TargetFrameworks>
 +    <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
      <RootNamespace></RootNamespace>
    </PropertyGroup>

From b6a61fcd0d0a4a4acbe90e546be67cc53799088d Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 6 Dec 2021 17:17:53 -0600
Subject: [PATCH 2/5] source-build changes to support release/6.0.2xx (#12750)

* Update dotnet version used by source-build

* Additional source-build patches

* Bring in msbuild patch for committed changes that haven't flown
---
 src/SourceBuild/tarball/content/global.json   |  2 +-
 .../0007-WebHost-delegate-nullability.patch   | 43 +++++++++++++++++++
 ...y-on-MS.VS.Setup.Configuration.Inter.patch | 31 ++++++++++++-
 ...PublicApiAnalyzers-in-sourcebuild-71.patch | 26 +++++++++++
 4 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch
 create mode 100644 src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch

diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json
index 0007b6c6e..39f48573d 100644
--- a/src/SourceBuild/tarball/content/global.json
+++ b/src/SourceBuild/tarball/content/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "6.0.100"
+    "dotnet": "6.0.200-preview.21603.2"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch
new file mode 100644
index 000000000..426502e86
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MichaelSimons <msimons@microsoft.com>
+Date: Mon, 6 Dec 2021 18:39:25 +0000
+Subject: [PATCH] WebHost delegate nullability
+
+Addresses the following errors:
+
+  src/Hosting/Hosting/src/Internal/WebHost.cs(83,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func<IServiceProvider, IHostApplicationLifetime?>' (possibly because of nullability attributes).
+  src/Hosting/Hosting/src/Internal/WebHost.cs(86,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func<IServiceProvider, IApplicationLifetime?>' (possibly because of nullability attributes).
+  src/Hosting/Hosting/src/Internal/WebHost.cs(88,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func<IServiceProvider, IApplicationLifetime?>' (possibly because of nullability attributes).
+
+Cherry-pick of WebHost only changes made under https://github.com/dotnet/aspnetcore/commit/13a460820e90c8f3e90eb4fdbbb3de671389bf0c#diff-6ef451f2ae3e04d73dde362bdf9de6b101aef95e3a4f5190e5c96967d683aef9
+---
+ src/Hosting/Hosting/src/Internal/WebHost.cs | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/src/Hosting/Hosting/src/Internal/WebHost.cs b/src/Hosting/Hosting/src/Internal/WebHost.cs
+index ca52bd1f40..643d03e8af 100644
+--- a/src/Hosting/Hosting/src/Internal/WebHost.cs
++++ b/src/Hosting/Hosting/src/Internal/WebHost.cs
+@@ -79,16 +79,14 @@ namespace Microsoft.AspNetCore.Hosting
+             _hostingServiceProvider = hostingServiceProvider;
+             _applicationServiceCollection.AddSingleton<ApplicationLifetime>();
+             // There's no way to to register multiple service types per definition. See https://github.com/aspnet/DependencyInjection/issues/360
+-#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.
+-            _applicationServiceCollection.AddSingleton(services
+-                => services.GetService<ApplicationLifetime>() as IHostApplicationLifetime);
++             _applicationServiceCollection.AddSingleton<IHostApplicationLifetime>(services
++                => services.GetService<ApplicationLifetime>()!);
+ #pragma warning disable CS0618 // Type or member is obsolete
+-            _applicationServiceCollection.AddSingleton(services
+-                => services.GetService<ApplicationLifetime>() as AspNetCore.Hosting.IApplicationLifetime);
+-            _applicationServiceCollection.AddSingleton(services
+-                => services.GetService<ApplicationLifetime>() as Extensions.Hosting.IApplicationLifetime);
++            _applicationServiceCollection.AddSingleton<AspNetCore.Hosting.IApplicationLifetime>(services
++                => services.GetService<ApplicationLifetime>()!);
++            _applicationServiceCollection.AddSingleton<Extensions.Hosting.IApplicationLifetime>(services
++                => services.GetService<ApplicationLifetime>()!);
+ #pragma warning restore CS0618 // Type or member is obsolete
+-#pragma warning restore CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.
+             _applicationServiceCollection.AddSingleton<HostedServiceExecutor>();
+         }
+ 
diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch
index b82c812ab..1c6710555 100644
--- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch
+++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch
@@ -7,13 +7,29 @@ Removes prebuilts.
 
 Background Issue: https://github.com/dotnet/source-build/issues/2542
 ---
+ eng/dependabot/Packages.props                  | 3 ---
  src/Build/Microsoft.Build.csproj               | 4 +++-
  src/Directory.BeforeCommon.targets             | 2 +-
+ src/Framework/Microsoft.Build.Framework.csproj | 2 +-
  src/Samples/Directory.Build.props              | 1 +
  src/Tasks/Microsoft.Build.Tasks.csproj         | 4 +++-
  src/Utilities/Microsoft.Build.Utilities.csproj | 2 +-
- 5 files changed, 9 insertions(+), 4 deletions(-)
+ 7 files changed, 10 insertions(+), 8 deletions(-)
 
+diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props
+index a1f21de26..ff74d6e7f 100644
+--- a/eng/dependabot/Packages.props
++++ b/eng/dependabot/Packages.props
+@@ -22,9 +22,6 @@
+ 
+   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
+     <GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" />
+-  </ItemGroup>
+-
+-  <ItemGroup>
+     <GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
+   </ItemGroup>
+ 
 diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
 index d08e337c5..3b173aee5 100644
 --- a/src/Build/Microsoft.Build.csproj
@@ -43,6 +59,19 @@ index 913c97b12..320bffa56 100644
      <DefineConstants>$(DefineConstants);FEATURE_MSCOREE</DefineConstants>
    </PropertyGroup>
  
+diff --git a/src/Framework/Microsoft.Build.Framework.csproj b/src/Framework/Microsoft.Build.Framework.csproj
+index df7556447..c7edff611 100644
+--- a/src/Framework/Microsoft.Build.Framework.csproj
++++ b/src/Framework/Microsoft.Build.Framework.csproj
+@@ -31,7 +31,7 @@
+   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+     <!-- Promote CompilerServices.Unsafe from the old version we get from System.Memory on net472. -->
+     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
+-    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" />
++    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Condition="'$(DotNetBuildFromSource)' != 'true'" />
+     <Reference Include="System.Xaml" />
+   </ItemGroup>
+ 
 diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props
 index 6b9d6cd9f..317ef14a6 100644
 --- a/src/Samples/Directory.Build.props
diff --git a/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch b/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch
new file mode 100644
index 000000000..a0133a35f
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/msbuild/0005-Don-t-reference-PublicApiAnalyzers-in-sourcebuild-71.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Rainer Sigwald <raines@microsoft.com>
+Date: Fri, 3 Dec 2021 14:24:03 -0600
+Subject: [PATCH] Don't reference PublicApiAnalyzers in sourcebuild (#7118)
+
+This package is only super relevant at PR-build time so it should
+be fine to drop it from source-build scenarios. Fixes #7115.
+
+Patch created from https://github.com/dotnet/msbuild/pull/7118
+---
+ src/Directory.Build.targets | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
+index 2a840bfd7..bff6cc905 100644
+--- a/src/Directory.Build.targets
++++ b/src/Directory.Build.targets
+@@ -85,7 +85,7 @@
+ 
+   <ItemGroup Condition="'$(GenerateReferenceAssemblySource)' == 'true'">
+     <!-- Ensure API stability for shipping packages -->
+-    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="all" />
++    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="all" Condition="'$(DotNetBuildFromSource)' != 'true'" />
+ 
+     <AdditionalFiles Include="PublicAPI/$(PublicApiTfm)/PublicAPI.Shipped.txt" />
+     <AdditionalFiles Include="PublicAPI/$(PublicApiTfm)/PublicAPI.Unshipped.txt" />

From d1d94727f546bb23dba80fc6e19ac8632388ab4a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 6 Dec 2021 23:21:16 +0000
Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/sdk
 build 20211206.5 (#12749)

[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 fa0fcb268..47a49d499 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.21601.7">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21606.5">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>69a5d503ce8a54af2a58fc37c0adf3d3794f0801</Sha>
+      <Sha>31172387ab7b4bffff0291e42757d56a4750b90d</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21601.7">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21606.5">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>69a5d503ce8a54af2a58fc37c0adf3d3794f0801</Sha>
+      <Sha>31172387ab7b4bffff0291e42757d56a4750b90d</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 54c72d104..05a50313b 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.21601.7</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21601.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21606.5</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21606.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

From 438991aeba710f86640bd695e44cf894301a65f0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 7 Dec 2021 01:46:04 +0000
Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/sdk
 build 20211206.10 (#12752)

[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 47a49d499..9934f87a1 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.21606.5">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21606.10">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>31172387ab7b4bffff0291e42757d56a4750b90d</Sha>
+      <Sha>5381a5ba97dbea698e271e0cc4852a094a78672d</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21606.5">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21606.10">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>31172387ab7b4bffff0291e42757d56a4750b90d</Sha>
+      <Sha>5381a5ba97dbea698e271e0cc4852a094a78672d</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 05a50313b..1f41437c6 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.21606.5</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21606.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.200-preview.21606.10</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21606.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

From b10c4644eaf0a101d7e74161f3e2d60e70bffb04 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 6 Dec 2021 20:50:23 -0600
Subject: [PATCH 5/5] Re-enable web https smoke tests (#12739)

---
 src/SourceBuild/tarball/content/smoke-test.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh
index f39c285b4..f32e4fa3b 100755
--- a/src/SourceBuild/tarball/content/smoke-test.sh
+++ b/src/SourceBuild/tarball/content/smoke-test.sh
@@ -49,8 +49,7 @@ configuration="Release"
 excludeNonWebTests=false
 excludeWebTests=false
 excludeWebNoHttpsTests=false
-# Re-enable once https://github.com/dotnet/sdk/issues/22734 is fixed.
-excludeWebHttpsTests=true
+excludeWebHttpsTests=false
 excludeLocalTests=false
 excludeOnlineTests=false
 devCertsVersion="$DEV_CERTS_VERSION_DEFAULT"