Revert "Update WindowsAppSDK to 1.8 (#32174)"#33537
Revert "Update WindowsAppSDK to 1.8 (#32174)"#33537PureWeen merged 2 commits intorelease/10.0.1xx-sr3from
Conversation
This reverts commit 5a39604.
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
There was a problem hiding this comment.
Pull request overview
This PR reverts the Windows App SDK update from version 1.8 to 1.7 (originally introduced in PR #32174). The revert is necessary due to compatibility issues with the newer SDK version.
Changes:
- Downgraded Windows App SDK from 1.8.251106002 to 1.7.250909003
- Downgraded Windows SDK Build Tools from 10.0.26100.4654 to 10.0.22621.756
- Removed explicit
Microsoft.WindowsAppSDKpackage references from three projects (Essentials, Graphics.Skia, Graphics.Win2D) - Restored build configuration settings in Controls.Xaml.csproj
- Fixed integration test path logic to work with the reverted SDK
- Restored certificate key usage flags and logging order in windows.cake
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| eng/Versions.props | Downgraded WindowsAppSDK and Windows SDK Build Tools versions to 1.7 |
| src/Essentials/src/Essentials.csproj | Removed explicit Microsoft.WindowsAppSDK package reference |
| src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj | Removed explicit Microsoft.WindowsAppSDK package reference |
| src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj | Removed explicit Microsoft.WindowsAppSDK package reference |
| src/Controls/src/Xaml/Controls.Xaml.csproj | Re-added WINDOWS define constant and AppxGeneratePriEnabled=false setting |
| Directory.Build.targets | Removed GetTypeScriptCopyToOutputDirectoryItems target override |
| src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs | Simplified asset path construction for packaged Windows tests |
| eng/devices/windows.cake | Restored NonRepudiation key usage flag and moved Information log before conditional logic |
| 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"); |
There was a problem hiding this comment.
The reverted path logic uses different RID values (win10-x64 vs win-x64) depending on the usesRidGraph parameter. This logic is simpler than the original WindowsAppSDK 1.8 version but should be verified to ensure it correctly locates assets for both DotNetCurrent (net10.0, usesRidGraph=false) and DotNetPrevious (net9.0, usesRidGraph=true) test cases.
| 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"); |
There was a problem hiding this comment.
The null-coalescing operator has incorrect precedence here. Due to operator precedence, this evaluates as Information((\"Cert thumbprint: \" + certificateThumbprint) ?? \"null\") which will never use the "null" fallback since string concatenation with null produces a string. Should be Information(\"Cert thumbprint: \" + (certificateThumbprint ?? \"null\")) to correctly display "null" when certificateThumbprint is null.
| Information("Cert thumbprint: " + certificateThumbprint ?? "null"); | |
| Information("Cert thumbprint: " + (certificateThumbprint ?? "null")); |
|
WindowsAppSDK 1.7 goes out of support on March 18. Is there a timeline for when WindowsAppSDK 1.8 will be included in .NET MAUI? |
|
What was wrong with WinAppSDK 1.8, if I may ask? |
|
I have the same questions. Can you answer us, @PureWeen? Thank you. |
|
Looks like there's a new PR #33850 but it's an update from 1.8.3 to 1.8.4? |
|
Reverts the Windows App SDK update from version 1.7 to 1.8 introduced in PR #32174.
Reverted Changes
Version downgrades:
MicrosoftWindowsAppSDKPackageVersion:1.8.251106002→1.7.250909003MicrosoftWindowsSDKBuildToolsPackageVersion:10.0.26100.4654→10.0.22621.756Package references removed:
Microsoft.WindowsAppSDKfromEssentials.csproj,Graphics.Skia.csproj,Graphics.Win2D.csprojRestored configurations:
Controls.Xaml.csproj: Re-addedWINDOWSdefine constant andAppxGeneratePriEnabled=falseDirectory.Build.targets: RemovedGetTypeScriptCopyToOutputDirectoryItemstargetWindowsTemplateTest.cs: Restored original RID-based asset path logicwindows.cake: RestoredX509KeyUsageFlags.NonRepudiationin certificate generationThis reverts commit 5a39604.
Warning
Firewall rules blocked me from connecting to one or more addresses (expand for details)
I tried to connect to the following addresses, but was blocked by firewall rules:
ghcr.io/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /home/REDACTED/work/maui/maui --branch main --directory src/Controls/src/Xaml --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt(dns block)/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /tmp/dependabot-base-edeX71/repo --branch main --directory src/Essentials/src --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt(dns block)/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /home/REDACTED/work/maui/maui --branch main --directory src/Essentials/src --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt(dns block)If you need me to access, download, or install something from one of these locations, you can either:
Original prompt
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.