diff --git a/eng/Versions.props b/eng/Versions.props
index 89301817f..df930787b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -37,7 +37,8 @@
     manually enabled by updating the metadata.
   -->
   <ItemGroup>
-    <ProjectServicingConfiguration Include="Microsoft.WindowsDesktop.App.Ref" PatchVersion="0" />
+    <!-- Targeting packs are only patched when we need to patch reference assemblies, intellisense, or source generators. -->
+    <ProjectServicingConfiguration Include="Microsoft.WindowsDesktop.App.Ref" PatchVersion="2" />
   </ItemGroup>
   <!--Package versions-->
   <PropertyGroup>
diff --git a/pkg/windowsdesktop/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj b/pkg/windowsdesktop/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj
index 569b54fd3..960c2913c 100644
--- a/pkg/windowsdesktop/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj
+++ b/pkg/windowsdesktop/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj
@@ -7,6 +7,7 @@
     <InstallerName>windowsdesktop-targeting-pack</InstallerName>
     <InstallerRuntimeIdentifiers>win-x64;win-x86;win-arm64</InstallerRuntimeIdentifiers>
     <VSInsertionShortComponentName>WindowsDesktop.TargetingPack</VSInsertionShortComponentName>
+    <CreatePlatformManifest Condition="'$(PreReleaseVersionLabel)' == 'servicing'">false</CreatePlatformManifest>
   </PropertyGroup>
 
   <!-- 
@@ -72,4 +73,7 @@
   <!-- Windows Forms validation and packaging -->
   <Import Project="WindowsForms.Packaging.targets" />
 
+  <ItemGroup Condition="'$(CreatePlatformManifest)' == 'false'">
+    <FilesToPackage  Include="PlatformManifest.txt" TargetPath="data" GeneratedBuildFile="true" />
+  </ItemGroup>
 </Project>
diff --git a/pkg/windowsdesktop/sfx/PlatformManifest.txt b/pkg/windowsdesktop/sfx/PlatformManifest.txt
new file mode 100644
index 000000000..97a2c08dc
--- /dev/null
+++ b/pkg/windowsdesktop/sfx/PlatformManifest.txt
@@ -0,0 +1,75 @@
+Microsoft.VisualBasic.Forms.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Forms.Design.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Forms.Primitives.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Forms.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationCore.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationUI.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+ReachFramework.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Controls.Ribbon.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Input.Manipulations.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Xaml.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+UIAutomationClient.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+UIAutomationClientSideProviders.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+UIAutomationProvider.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+UIAutomationTypes.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+WindowsBase.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+WindowsFormsIntegration.resources.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+D3DCompiler_47_cor3.dll|Microsoft.WindowsDesktop.App.Ref||10.0.19041.685
+PenImc_cor3.dll|Microsoft.WindowsDesktop.App.Ref||6.0.21.52301
+PresentationNative_cor3.dll|Microsoft.WindowsDesktop.App.Ref||6.0.21.48001
+vcruntime140_cor3.dll|Microsoft.WindowsDesktop.App.Ref||14.29.30130.2
+wpfgfx_cor3.dll|Microsoft.WindowsDesktop.App.Ref||6.0.21.52301
+Accessibility.dll|Microsoft.WindowsDesktop.App.Ref|4.0.0.0|6.0.21.52301
+Microsoft.VisualBasic.dll|Microsoft.WindowsDesktop.App.Ref|10.1.0.0|6.0.21.52301
+System.Design.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Drawing.Design.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Drawing.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Forms.Design.Editors.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+Microsoft.Win32.Registry.AccessControl.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+Microsoft.Win32.SystemEvents.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.CodeDom.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.Configuration.ConfigurationManager.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.Diagnostics.EventLog.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.Diagnostics.PerformanceCounter.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.DirectoryServices.dll|Microsoft.WindowsDesktop.App.Ref|4.0.0.0|6.0.21.52210
+System.Drawing.Common.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.IO.Packaging.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.Resources.Extensions.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.Security.Cryptography.Pkcs.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.Security.Cryptography.ProtectedData.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.Security.Cryptography.Xml.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.Security.Permissions.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.Threading.AccessControl.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+System.Windows.Extensions.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52210
+Microsoft.VisualBasic.Forms.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Forms.Design.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Forms.Primitives.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Forms.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+DirectWriteForwarder.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationCore.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework-SystemCore.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework-SystemData.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework-SystemDrawing.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework-SystemXml.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework-SystemXmlLinq.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework.Aero.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework.Aero2.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework.AeroLite.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework.Classic.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework.Luna.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework.Royale.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationFramework.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+PresentationUI.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+ReachFramework.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Printing.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Controls.Ribbon.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Input.Manipulations.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Windows.Presentation.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+System.Xaml.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+UIAutomationClient.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+UIAutomationClientSideProviders.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+UIAutomationProvider.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+UIAutomationTypes.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+WindowsBase.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301
+WindowsFormsIntegration.dll|Microsoft.WindowsDesktop.App.Ref|6.0.0.0|6.0.21.52301