Skip to content

Update WindowsAppSDK to 1.8 #32174

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

Open
Parent: [main] Net10.0
wants to merge 8 commits into
base: net10.0
Choose a base branch
from
+16 −9
Open

Update WindowsAppSDK to 1.8 #32174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
77e77f6
Update the Windows App SDK to 1.8
mattleibow Jul 16, 2025
8efdc78
Allow the PRI files to generate again
mattleibow Sep 30, 2025
e1de462
Fixes for packaging
mattleibow Oct 1, 2025
503352d
this
mattleibow Oct 1, 2025
e07040f
1.8.2
MartyIX Oct 17, 2025
c2f0f04
path
mattleibow Oct 23, 2025
5d79641
dupes
mattleibow Oct 23, 2025
64ada7e
YAY
mattleibow Oct 24, 2025
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: 3 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,8 @@

<!-- 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 -->
<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 @@ -69,8 +69,8 @@
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
<!-- wasdk -->
<MicrosoftWindowsAppSDKPackageVersion>1.7.250909003</MicrosoftWindowsAppSDKPackageVersion>
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
<MicrosoftWindowsAppSDKPackageVersion>1.8.251003001</MicrosoftWindowsAppSDKPackageVersion>
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.26100.4654</MicrosoftWindowsSDKBuildToolsPackageVersion>
<MicrosoftGraphicsWin2DPackageVersion>1.3.2</MicrosoftGraphicsWin2DPackageVersion>
<MicrosoftWindowsWebView2PackageVersion>1.0.3179.45</MicrosoftWindowsWebView2PackageVersion>
<!-- Everything else -->
Expand Down
5 changes: 3 additions & 2 deletions eng/devices/windows.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand All @@ -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(
Expand All @@ -120,6 +119,8 @@ Task("GenerateMsixCert")

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

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

Task("buildOnly")
Expand Down
3 changes: 0 additions & 3 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,9 +13,6 @@

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

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions 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,6 +27,7 @@

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

<ItemGroup>
Expand Down
7 changes: 5 additions & 2 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,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");

Expand Down
Loading