diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch
new file mode 100644
index 000000000..76a1abde5
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Mon, 21 Nov 2022 22:32:04 +0000
+Subject: [PATCH] Add package version properties for source-build
+
+Backport: https://github.com/NuGet/Home/issues/12261
+---
+ Directory.Packages.props | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/Directory.Packages.props b/Directory.Packages.props
+index 8afa7dd31..0c4eaecf5 100644
+--- a/Directory.Packages.props
++++ b/Directory.Packages.props
+@@ -9,11 +9,13 @@
+     <VSFrameworkVersion>17.2.0-preview-2-32304-091</VSFrameworkVersion>
+     <VSServicesVersion>16.153.0</VSServicesVersion>
+     <!-- Default MSBuild version -->
+-    <MicrosoftBuildVersion>17.3.1</MicrosoftBuildVersion>
++    <MicrosoftBuildVersion Condition="'$(MicrosoftBuildVersion)' == ''">17.3.1</MicrosoftBuildVersion>
+     <!-- The last package version of MSBuild that works with netcoreapp3.1 or netstandard2.0 is 16.8.0.  Our assemblies are still compiled against MSBuild assembly version 15.1.0.0 which will work with all versions -->
+     <MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'netstandard2.0'">16.8.0</MicrosoftBuildVersion>
+     <!-- The last package version of MSBuild that works with net5.0 is 16.11.0.  Our assemblies are still compiled against MSBuild assembly version 15.1.0.0 which will work with all versions -->
+     <MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp5.0'">16.11.0</MicrosoftBuildVersion>
++    <MicrosoftWebXdtPackageVersion Condition="'$(MicrosoftWebXdtPackageVersion)' == ''">3.0.0</MicrosoftWebXdtPackageVersion>
++    <SystemComponentModelCompositionPackageVersion Condition="'$(SystemComponentModelCompositionPackageVersion)' == ''">4.5.0</SystemComponentModelCompositionPackageVersion>
+   </PropertyGroup>
+ 
+   <ItemGroup>
+@@ -56,7 +58,7 @@
+     <PackageVersion Include="Microsoft.VisualStudio.VCProjectEngine" Version="$(VSFrameworkVersion)" />
+     <PackageVersion Include="Microsoft.VisualStudio.Workspace.VSIntegration" Version="17.0.7-preview-0001-g5492e466a9" />
+     <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.0.1600" />
+-    <PackageVersion Include="Microsoft.Web.Xdt" Version="3.0.0" />
++    <PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)"/>
+     <PackageVersion Include="Moq" Version="4.18.1" />
+     <PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
+     <PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
+@@ -66,7 +68,7 @@
+     <PackageVersion Include="SharpZipLib" Version="1.3.3" />
+     <PackageVersion Include="System.Collections" Version="$(SystemPackagesVersion)" />
+     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+-    <PackageVersion Include="System.ComponentModel.Composition" Version="4.5.0" />
++    <PackageVersion Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionPackageVersion)" />
+     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
+     <PackageVersion Include="System.Diagnostics.Debug" Version="$(SystemPackagesVersion)" />
+     <PackageVersion Include="System.IO.FileSystem.Primitives" Version="$(SystemPackagesVersion)" />
diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch
deleted file mode 100644
index 69517f31f..000000000
--- a/src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Logan Bussell <loganbussell@microsoft.com>
-Date: Mon, 21 Nov 2022 22:32:04 +0000
-Subject: [PATCH] Fix Microsoft.Web.Xdt package version for source-build
-
-Backport: https://github.com/NuGet/Home/issues/12261
----
- Directory.Packages.props | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Directory.Packages.props b/Directory.Packages.props
-index 8afa7dd31..2ee44858d 100644
---- a/Directory.Packages.props
-+++ b/Directory.Packages.props
-@@ -14,6 +14,7 @@
-     <MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'netstandard2.0'">16.8.0</MicrosoftBuildVersion>
-     <!-- The last package version of MSBuild that works with net5.0 is 16.11.0.  Our assemblies are still compiled against MSBuild assembly version 15.1.0.0 which will work with all versions -->
-     <MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp5.0'">16.11.0</MicrosoftBuildVersion>
-+    <MicrosoftWebXdtPackageVersion Condition="'$(MicrosoftWebXdtPackageVersion)' == ''">3.0.0</MicrosoftWebXdtPackageVersion>
-   </PropertyGroup>
- 
-   <ItemGroup>
-@@ -56,7 +57,7 @@
-     <PackageVersion Include="Microsoft.VisualStudio.VCProjectEngine" Version="$(VSFrameworkVersion)" />
-     <PackageVersion Include="Microsoft.VisualStudio.Workspace.VSIntegration" Version="17.0.7-preview-0001-g5492e466a9" />
-     <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.0.1600" />
--    <PackageVersion Include="Microsoft.Web.Xdt" Version="3.0.0" />
-+    <PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)"/>
-     <PackageVersion Include="Moq" Version="4.18.1" />
-     <PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
-     <PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />