From 77e77f69cdff636882a69d46a198b233f54fdfa7 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 16 Jul 2025 21:13:50 +0200 Subject: [PATCH 1/8] Update the Windows App SDK to 1.8 --- eng/Versions.props | 4 ++-- src/Essentials/src/Essentials.csproj | 1 + src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj | 1 + src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj | 1 + src/Graphics/src/Graphics/Graphics.csproj | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 64815c1d9513..665fdf78bdaa 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.250916003 + 10.0.26100.4654 1.3.2 1.0.3179.45 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/Graphics/src/Graphics/Graphics.csproj b/src/Graphics/src/Graphics/Graphics.csproj index f4df82ab0627..50699b1cd60d 100644 --- a/src/Graphics/src/Graphics/Graphics.csproj +++ b/src/Graphics/src/Graphics/Graphics.csproj @@ -40,6 +40,7 @@ + From 8efdc78166a777f3c8162ad9d536568ffdf0abdb Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 30 Sep 2025 15:19:59 +0200 Subject: [PATCH 2/8] Allow the PRI files to generate again --- src/Controls/src/Xaml/Controls.Xaml.csproj | 3 --- 1 file changed, 3 deletions(-) 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 From e1de4621a3192e16d713963c0e0968a48db2f361 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 1 Oct 2025 09:52:55 +0200 Subject: [PATCH 3/8] Fixes for packaging --- Directory.Build.targets | 3 +++ 1 file changed, 3 insertions(+) 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 @@ + + + From 503352d202432d7c6373690b184a3b140ee964a0 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 1 Oct 2025 11:33:53 +0200 Subject: [PATCH 4/8] this --- .../Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs index d73afc86b26c..a9916fb92eea 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs @@ -167,8 +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" : "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 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"); From e07040f26827fa57f06ccccdf4a122f8ed76a5eb Mon Sep 17 00:00:00 2001 From: MartyIX <203266+MartyIX@users.noreply.github.com> Date: Fri, 17 Oct 2025 13:32:02 +0200 Subject: [PATCH 5/8] 1.8.2 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 665fdf78bdaa..c1b73df81cdf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,7 +69,7 @@ 8.0.148 - 1.8.250916003 + 1.8.251003001 10.0.26100.4654 1.3.2 1.0.3179.45 From c2f0f043d5c93e0152d0f8231ebe6a1a0383afe9 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 23 Oct 2025 23:16:34 +0200 Subject: [PATCH 6/8] path --- .../Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs index a9916fb92eea..db70b57696cd 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs @@ -168,7 +168,10 @@ public void PublishPackaged(string id, string framework, string config, bool use $"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors."); var rid = usesRidGraph ? "win10-x64/" : ""; - var assetsRoot = Path.Combine(projectDir, $"bin/{config}/{framework}-windows10.0.19041.0/{rid}AppPackages/{name}_1.0.0.1_Test"); + 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"); From 5d796414a44663270237aeb3b4e0a3ab48d31d1b Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 24 Oct 2025 00:14:36 +0200 Subject: [PATCH 7/8] dupes --- src/Graphics/src/Graphics/Graphics.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Graphics/src/Graphics/Graphics.csproj b/src/Graphics/src/Graphics/Graphics.csproj index 50699b1cd60d..f4df82ab0627 100644 --- a/src/Graphics/src/Graphics/Graphics.csproj +++ b/src/Graphics/src/Graphics/Graphics.csproj @@ -40,7 +40,6 @@ - From 64ada7eb5c6635f7371a7919ae82cadb59bfefed Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 24 Oct 2025 18:29:53 +0200 Subject: [PATCH 8/8] YAY --- eng/devices/windows.cake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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")