Skip to content

Revert "Update WindowsAppSDK to 1.8 (#32174)" #33537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PureWeen merged 2 commits into from
Jan 14, 2026
Merged

Revert "Update WindowsAppSDK to 1.8 (#32174)" #33537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fb2d49
Initial plan
Copilot Jan 14, 2026
3b8be9a
Revert "Update WindowsAppSDK to 1.8 (#32174)"
Copilot Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
5 changes: 2 additions & 3 deletions eng/devices/windows.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Copy link

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Suggested change
Information("Cert thumbprint: " + certificateThumbprint ?? "null");
Information("Cert thumbprint: " + (certificateThumbprint ?? "null"));

Copilot uses AI. Check for mistakes.

if (string.IsNullOrEmpty(certificateThumbprint))
{
Expand All @@ -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(
Expand All @@ -119,8 +120,6 @@ Task("GenerateMsixCert")

localTrustedPeopleStore.Close();
currentUserMyStore.Close();

Information("Cert thumbprint: " + certificateThumbprint ?? "null");
});

Task("buildOnly")
Expand Down
3 changes: 3 additions & 0 deletions src/Controls/src/Xaml/Controls.Xaml.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/Essentials/src/Essentials.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down
1 change: 0 additions & 1 deletion src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<PackageReference Include="SkiaSharp.Views.WinUI" />
<PackageReference Include="Microsoft.WindowsAppSDK" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.Graphics.Win2D" />
<PackageReference Include="Microsoft.WindowsAppSDK" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 2 additions & 5 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Comment on lines +170 to +171
Copy link

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copilot uses AI. Check for mistakes.

AssetExists($"{name}_1.0.0.1_x64.msix");

Expand Down
Loading