diff --git a/Directory.Build.targets b/Directory.Build.targets
index 77feb5312b4a..b0df87ab63e6 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -122,8 +122,7 @@
 
   <!-- Tell typescript to stop deleting everything before building the next TFM -->
   <Target Name="TypeScriptDeleteOutputFromOtherConfigs" />
-  <!-- Don't add any outputs to any item group, we are embedding things manually -->
+  <!-- Don't include any JS files in the Content, we will embed it -->
   <Target Name="GetTypeScriptOutputForPublishing" />
-  <Target Name="GetTypeScriptCopyToOutputDirectoryItems" />
 
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index 572844e1b2aa..17642ab100c3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -68,8 +68,8 @@
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
     <!-- wasdk -->
-    <MicrosoftWindowsAppSDKPackageVersion>1.8.251106002</MicrosoftWindowsAppSDKPackageVersion>
-    <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.26100.4654</MicrosoftWindowsSDKBuildToolsPackageVersion>
+    <MicrosoftWindowsAppSDKPackageVersion>1.7.250909003</MicrosoftWindowsAppSDKPackageVersion>
+    <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
     <MicrosoftGraphicsWin2DPackageVersion>1.3.2</MicrosoftGraphicsWin2DPackageVersion>
     <MicrosoftWindowsWebView2PackageVersion>1.0.3179.45</MicrosoftWindowsWebView2PackageVersion>
     <!-- Everything else -->
diff --git a/eng/devices/windows.cake b/eng/devices/windows.cake
index c11461b3020f..807ce907e536 100644
--- a/eng/devices/windows.cake
+++ b/eng/devices/windows.cake
@@ -80,6 +80,7 @@ Task("GenerateMsixCert")
 	var currentUserMyStore = new X509Store("My", StoreLocation.CurrentUser);
 	currentUserMyStore.Open(OpenFlags.ReadWrite);
 	certificateThumbprint = localTrustedPeopleStore.Certificates.FirstOrDefault(c => c.Subject.Contains(certCN))?.Thumbprint;
+	Information("Cert thumbprint: " + certificateThumbprint ?? "null");
 
 	if (string.IsNullOrEmpty(certificateThumbprint))
 	{
@@ -99,7 +100,7 @@ Task("GenerateMsixCert")
 		req.CertificateExtensions.Add(new X509BasicConstraintsExtension(false, false, 0, false));
 		req.CertificateExtensions.Add(
 			new X509KeyUsageExtension(
-				X509KeyUsageFlags.DigitalSignature,
+				X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.NonRepudiation,
 				false));
 
 		req.CertificateExtensions.Add(
@@ -119,8 +120,6 @@ Task("GenerateMsixCert")
 
 	localTrustedPeopleStore.Close();
 	currentUserMyStore.Close();
-
-	Information("Cert thumbprint: " + certificateThumbprint ?? "null");
 });
 
 Task("buildOnly")
diff --git a/src/Controls/src/Xaml/Controls.Xaml.csproj b/src/Controls/src/Xaml/Controls.Xaml.csproj
index 33b2deef045d..825bb0d11a59 100644
--- a/src/Controls/src/Xaml/Controls.Xaml.csproj
+++ b/src/Controls/src/Xaml/Controls.Xaml.csproj
@@ -13,6 +13,9 @@
 
 	<PropertyGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
 		<NoWarn>$(NoWarn);CA1416</NoWarn>
+		<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
+		<!-- Disable PRI generation to avoid conflicts with Core project's PRI file -->
+		<AppxGeneratePriEnabled>false</AppxGeneratePriEnabled>
 	</PropertyGroup>
 
 	<PropertyGroup>
diff --git a/src/Essentials/src/Essentials.csproj b/src/Essentials/src/Essentials.csproj
index 48d4f24f233c..c2622d5151b1 100644
--- a/src/Essentials/src/Essentials.csproj
+++ b/src/Essentials/src/Essentials.csproj
@@ -39,7 +39,6 @@
     <Compile Include="**\*.windows.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <Compile Include="**\*.windows.*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <PackageReference Include="Microsoft.Web.WebView2" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
     <Compile Include="**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
diff --git a/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj b/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
index 0b80ad841fd0..d2b2ba962fe3 100644
--- a/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
+++ b/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
@@ -34,7 +34,6 @@
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
     <PackageReference Include="SkiaSharp.Views.WinUI" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj b/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
index e63ebf1ed0b7..5b6bdd5fd0cd 100644
--- a/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
+++ b/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
@@ -27,7 +27,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Graphics.Win2D" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs
index 7cd690c91146..be014884d823 100644
--- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs
+++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs
@@ -167,11 +167,8 @@ public void PublishPackaged(string id, string framework, string config, bool use
 		Assert.IsTrue(DotnetInternal.Publish(projectFile, config, framework: $"{framework}-windows10.0.19041.0", properties: BuildProps),
 			$"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors.");
 
-		var rid = usesRidGraph ? "win10-x64/" : "";
-		var prefix = framework == DotNetCurrent
-			? ""
-			: $"bin/{config}/{framework}-windows10.0.19041.0/";
-		var assetsRoot = Path.Combine(projectDir, $"{prefix}{rid}AppPackages/{name}_1.0.0.1_Test");
+		var rid = usesRidGraph ? "win10-x64" : "win-x64";
+		var assetsRoot = Path.Combine(projectDir, $"bin/{config}/{framework}-windows10.0.19041.0/{rid}/AppPackages/{name}_1.0.0.1_Test");
 
 		AssetExists($"{name}_1.0.0.1_x64.msix");