diff --git a/eng/Versions.props b/eng/Versions.props
index 6651fae03..1b7f35177 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -160,7 +160,7 @@
removed. See https://github.com/dotnet/source-build/issues/2295 -->
15.7.179
15.7.179
- 0.1.0-6.0.100-bootstrap.11
+ 0.1.0-6.0.100-bootstrap.16
0.1.0-6.0.100-19
diff --git a/src/SourceBuild/tarball/content/TemporaryBootstrapPackageVersions.props b/src/SourceBuild/tarball/content/TemporaryBootstrapPackageVersions.props
deleted file mode 100755
index ae68936ec..000000000
--- a/src/SourceBuild/tarball/content/TemporaryBootstrapPackageVersions.props
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- 6.0.0-preview.6.21352.12
- 3.1.0
- 3.1.0
- 6.0.0-preview.7.21377.19
- 6.0.0-preview.7.21377.19
- 5.0.0
- 5.0.0
- 6.0.0-rc.1.21415.6
- 6.0.0-rc.1.21415.6
- 6.0.0-preview.7.21356.2
-
-
diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props
index a43c34cd5..34a90269c 100644
--- a/src/SourceBuild/tarball/content/eng/Versions.props
+++ b/src/SourceBuild/tarball/content/eng/Versions.props
@@ -21,7 +21,7 @@
- 0.1.0-6.0.100-bootstrap.11
+ 0.1.0-6.0.100-bootstrap.16
0.1.0-6.0.100-
19
diff --git a/src/SourceBuild/tarball/content/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch b/src/SourceBuild/tarball/content/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch
new file mode 100644
index 000000000..f14acf094
--- /dev/null
+++ b/src/SourceBuild/tarball/content/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch
@@ -0,0 +1,41 @@
+From 3610fdc1ac6437973d539177c1427ed7f4f65c2e Mon Sep 17 00:00:00 2001
+From: Michael Simons
+Date: Fri, 27 Aug 2021 13:34:55 +0000
+Subject: [PATCH] Build Microsoft.DotNet.Build.Tasks.Workloads for net6.0
+
+---
+ .../src/Microsoft.DotNet.Build.Tasks.Workloads.csproj | 1 +
+ .../src/VisualStudioComponent.cs | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
+index ae34705a..bda5d581 100644
+--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
++++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
+@@ -2,6 +2,7 @@
+
+
+ net472;netcoreapp3.1
++ net6.0
+ true
+ Latest
+ true
+diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs
+index ee7e9d6d..b69b6823 100644
+--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs
++++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs
+@@ -247,7 +247,11 @@ public TaskItem Generate(string projectPath)
+ // processing direct pack dependencies
+ if (workload.Extends?.Count() > 0)
+ {
++#if NET6_0
++ foreach (WorkloadId dependency in workload.Extends)
++#else
+ foreach (WorkloadDefinitionId dependency in workload.Extends)
++#endif
+ {
+ // Component dependencies, aka. workload extensions only have minimum version dependencies.
+ component.AddDependency($"{Utils.ToSafeId(dependency.ToString())}", new Version("1.0.0.0"), maxVersion: null);
+--
+2.29.2
+
diff --git a/src/SourceBuild/tarball/content/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch b/src/SourceBuild/tarball/content/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch
new file mode 100644
index 000000000..acb46223f
--- /dev/null
+++ b/src/SourceBuild/tarball/content/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch
@@ -0,0 +1,25 @@
+From 4577f60202649281d2c96c4d8b67d331b7e71c35 Mon Sep 17 00:00:00 2001
+From: Michael Simons
+Date: Fri, 10 Sep 2021 13:52:54 +0000
+Subject: [PATCH] Respond to WorkloadDefinition breaking API change
+
+See https://github.com/dotnet/arcade/issues/7880 for details
+---
+ .../src/GenerateWorkloadMsis.cs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs
+index 50340821..a65453f2 100644
+--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs
++++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs
+@@ -121,6 +121,7 @@ private IEnumerable GetWorkloadPacks()
+ // platform includes Windows
+ var workloads = manifests.SelectMany(m => m.Workloads).
+ Select(w => w.Value).
++ OfType().
+ Where(wd => (wd.Platforms == null) || wd.Platforms.Any(p => p.StartsWith("win")));
+
+ var packIds = workloads.Where(w => w.Packs != null).SelectMany(w => w.Packs).Distinct();
+--
+2.29.2
+
diff --git a/src/SourceBuild/tarball/content/patches/arcade/0008-Bootstrapping-workaround.patch b/src/SourceBuild/tarball/content/patches/arcade/0008-Bootstrapping-workaround.patch
new file mode 100644
index 000000000..6aba415a7
--- /dev/null
+++ b/src/SourceBuild/tarball/content/patches/arcade/0008-Bootstrapping-workaround.patch
@@ -0,0 +1,32 @@
+From 1d34d8396b9c2968163802036ed102e18ef14605 Mon Sep 17 00:00:00 2001
+From: Michael Simons
+Date: Fri, 10 Sep 2021 13:57:38 +0000
+Subject: [PATCH] Bootstrapping workaround
+
+Temporary workaround until source-build is built with recent source-built.
+ /repos/tarball1/src/arcade.474307e526160c813c9fd58060eb8356ccca6099/artifacts/source-build/self/src/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj : error NU1603: Microsoft.CodeAnalysis.Common 4.0.0-5.21453.15 depends on System.Runtime.CompilerServices.Unsafe (>= 6.0.0-rc.1.21415.6) but System.Runtime.CompilerServices.Unsafe 6.0.0-rc.1.21415.6 was not found. An approximate best match of System.Runtime.CompilerServices.Unsafe 6.0.0-rc.2.21457.6 was resolved. [/repos/tarball1/src/arcade.474307e526160c813c9fd58060eb8356ccca6099/artifacts/source-build/self/src/Arcade.sln]
+ /repos/tarball1/src/arcade.474307e526160c813c9fd58060eb8356ccca6099/artifacts/source-build/self/src/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj : error NU1603: Microsoft.CodeAnalysis.Common 4.0.0-5.21453.15 depends on System.Runtime.CompilerServices.Unsafe (>= 6.0.0-rc.1.21415.6) but System.Runtime.CompilerServices.Unsafe 6.0.0-rc.1.21415.6 was not found. An approximate best match of System.Runtime.CompilerServices.Unsafe 6.0.0-rc.2.21457.6 was resolved. [/repos/tarball1/src/arcade.474307e526160c813c9fd58060eb8356ccca6099/artifacts/source-build/self/src/Arcade.sln]
+ /repos/tarball1/src/arcade.474307e526160c813c9fd58060eb8356ccca6099/artifacts/source-build/self/src/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj : error NU1603: Microsoft.CodeAnalysis.Common 4.0.0-5.21453.15 depends on System.Runtime.CompilerServices.Unsafe (>= 6.0.0-rc.1.21415.6) but System.Runtime.CompilerServices.Unsafe 6.0.0-rc.1.21415.6 was not found. An approximate best match of System.Runtime.CompilerServices.Unsafe 6.0.0-rc.2.21457.6 was resolved. [/repos/tarball1/src/arcade.474307e526160c813c9fd58060eb8356ccca6099/artifacts/source-build/self/src/Arcade.sln]
+
+---
+ Directory.Build.props | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index 960eb6c9..fa87aaac 100644
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -18,6 +18,10 @@
+ false
+
+
++
++ $(NoWarn);NU1603
++
++
+
+
-
-
-
]]>