diff --git a/Directory.Build.targets b/Directory.Build.targets
index adcad1cc7f13..06dd01a57282 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -121,5 +121,8 @@
+
+
+
diff --git a/eng/Versions.props b/eng/Versions.props
index 64815c1d9513..c1b73df81cdf 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -69,8 +69,8 @@
8.0.148
- 1.7.250909003
- 10.0.22621.756
+ 1.8.251003001
+ 10.0.26100.4654
1.3.2
1.0.3179.45
diff --git a/eng/devices/windows.cake b/eng/devices/windows.cake
index 807ce907e536..c11461b3020f 100644
--- a/eng/devices/windows.cake
+++ b/eng/devices/windows.cake
@@ -80,7 +80,6 @@ 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))
{
@@ -100,7 +99,7 @@ Task("GenerateMsixCert")
req.CertificateExtensions.Add(new X509BasicConstraintsExtension(false, false, 0, false));
req.CertificateExtensions.Add(
new X509KeyUsageExtension(
- X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.NonRepudiation,
+ X509KeyUsageFlags.DigitalSignature,
false));
req.CertificateExtensions.Add(
@@ -120,6 +119,8 @@ 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 825bb0d11a59..33b2deef045d 100644
--- a/src/Controls/src/Xaml/Controls.Xaml.csproj
+++ b/src/Controls/src/Xaml/Controls.Xaml.csproj
@@ -13,9 +13,6 @@
$(NoWarn);CA1416
- $(DefineConstants);WINDOWS
-
- false
diff --git a/src/Essentials/src/Essentials.csproj b/src/Essentials/src/Essentials.csproj
index c2622d5151b1..48d4f24f233c 100644
--- a/src/Essentials/src/Essentials.csproj
+++ b/src/Essentials/src/Essentials.csproj
@@ -39,6 +39,7 @@
+
diff --git a/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj b/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
index d2b2ba962fe3..0b80ad841fd0 100644
--- a/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
+++ b/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
@@ -34,6 +34,7 @@
+
diff --git a/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj b/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
index 5b6bdd5fd0cd..e63ebf1ed0b7 100644
--- a/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
+++ b/src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
@@ -27,6 +27,7 @@
+
diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs
index d73afc86b26c..db70b57696cd 100644
--- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs
+++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs
@@ -167,8 +167,11 @@ 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" : "win-x64";
- var assetsRoot = Path.Combine(projectDir, $"bin/{config}/{framework}-windows10.0.19041.0/{rid}/AppPackages/{name}_1.0.0.1_Test");
+ 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");
AssetExists($"{name}_1.0.0.1_x64.msix");