diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch
new file mode 100644
index 000000000..046864705
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch
@@ -0,0 +1,32 @@
+From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001
+From: Chris Rummel <crummel@microsoft.com>
+Date: Wed, 20 Oct 2021 15:19:29 -0500
+Subject: [PATCH] Restore building all TFMs for source-build to support NuGet
+ to support templating.
+
+---
+ src/Directory.Build.props | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/Directory.Build.props b/src/Directory.Build.props
+index b0e233194..7e0c7d8c8 100644
+--- a/src/Directory.Build.props
++++ b/src/Directory.Build.props
+@@ -27,13 +27,12 @@
+ 
+     <!-- Defaults for target frameworks and architecture -->
+     <LibraryTargetFrameworks>$(FullFrameworkTFM);netstandard2.0</LibraryTargetFrameworks>
+-    <LibraryTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netstandard2.0</LibraryTargetFrameworks>
+     <LibraryTargetFrameworks Condition="'$(MonoBuild)'=='true'">$(FullFrameworkTFM)</LibraryTargetFrameworks>
+     <PlatformTarget>AnyCPU</PlatformTarget>
+ 
+     <!-- Target frameworks for Exe and unit test projects (ie projects with runtime output) -->
+     <RuntimeOutputTargetFrameworks>net6.0</RuntimeOutputTargetFrameworks>
+-    <RuntimeOutputTargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(DotNetBuildFromSource)' != 'true'">$(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks)</RuntimeOutputTargetFrameworks>
++    <RuntimeOutputTargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks)</RuntimeOutputTargetFrameworks>
+     <RuntimeOutputTargetFrameworks Condition="'$(MonoBuild)' == 'true'">$(FullFrameworkTFM)</RuntimeOutputTargetFrameworks>
+ 
+     <!-- Don't automatically append target framework to output path, since we want to put the Platform Target beforehand, if it's not AnyCPU -->
+-- 
+2.31.1
+
diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch
index 6be953ae4..217b2cb43 100644
--- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch
+++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch
@@ -17,11 +17,11 @@ index 80433ed60..8acc4e0bb 100644
      <NETFXTargetFrameworkVersion>v4.7.2</NETFXTargetFrameworkVersion>
      <NETFXTargetFramework>net472</NETFXTargetFramework>
 -    <NETCoreTargetFramework>netcoreapp2.1</NETCoreTargetFramework>
-+    <NETCoreTargetFramework>net6.0</NETCoreTargetFramework>
++    <NETCoreTargetFramework>netcoreapp2.1;net6.0</NETCoreTargetFramework>
      <NETCoreTestTargetFramework>netcoreapp5.0</NETCoreTestTargetFramework>
      <IsBuildOnlyXPLATProjects>$(DotNetBuildFromSource)</IsBuildOnlyXPLATProjects>
 -    <NetStandardVersion>netstandard2.0</NetStandardVersion>
-+    <NetStandardVersion>net6.0</NetStandardVersion>
++    <NetStandardVersion>netstandard2.0;net6.0</NetStandardVersion>
      <TargetFrameworksExe>$(NETFXTargetFramework);$(NETCoreTargetFramework)</TargetFrameworksExe>
      <TargetFrameworksExe Condition="'$(IsBuildOnlyXPLATProjects)' == 'true' OR '$(IsXPlat)' == 'true'">$(NETCoreTargetFramework)</TargetFrameworksExe>
 -    <TargetFrameworksExeForSigning>$(TargetFrameworksExe);netcoreapp5.0</TargetFrameworksExeForSigning>