Skip to content

[Windows] Upgrade to Windows App SDK 1.7 #28499

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
merged 4 commits into from
Apr 11, 2025
Merged

[Windows] Upgrade to Windows App SDK 1.7 #28499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
801148c
Update to Windows App SDK 1.7
MartyIX Mar 19, 2025
f20bc80
nits
MartyIX Mar 21, 2025
179c56b
Update Directory.Build.targets
mattleibow Apr 2, 2025
d0f7007
Upgrade 1.7.0 to 1.7.1
MartyIX Apr 10, 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
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- wasdk -->
<MicrosoftWindowsAppSDKPackageVersion>1.6.250228001</MicrosoftWindowsAppSDKPackageVersion>
<MicrosoftWindowsAppSDKPackageVersion>1.7.250401001</MicrosoftWindowsAppSDKPackageVersion>
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
<MicrosoftGraphicsWin2DPackageVersion>1.2.0</MicrosoftGraphicsWin2DPackageVersion>
<MicrosoftWindowsWebView2PackageVersion>1.0.2903.40</MicrosoftWindowsWebView2PackageVersion>
Expand Down
3 changes: 3 additions & 0 deletions src/Templates/tests/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
<Error Text="The build did not make use of the BuildTools package but instead ran the fallback target '_GetMakeAppxToolPath' to try and locate the tool." />
</Target>

<!-- we flip things around in the templates -->
<Target Name="VerifyLaunchSettings" />

</Project>
14 changes: 12 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 @@ -22,7 +22,9 @@ public void BuildPackaged(string id, string framework, string config)

// TODO: remove this if as we should be able to build tizen net8
if (framework != DotNetPrevious)
{
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just code style changes in this file.

EnableTizen(projectFile);
}

if (framework == DotNetPrevious)
{
Expand Down Expand Up @@ -54,7 +56,9 @@ public void BuildPackaged(string id, string framework, string config)
public void BuildWindowsAppSDKSelfContained(string id, bool wasdkself, bool netself, string packageType)
{
if (TestEnvironment.IsMacOS)
{
Assert.Ignore("This test is designed for testing a windows build.");
}

var projectDir = TestDirectory;
var projectFile = Path.Combine(projectDir, $"{Path.GetFileName(projectDir)}.csproj");
Expand Down Expand Up @@ -82,10 +86,12 @@ public void BuildWindowsAppSDKSelfContained(string id, bool wasdkself, bool nets
[TestCase("maui", true, "MSIX")]
[TestCase("maui", false, "None")]
[TestCase("maui", false, "MSIX")]
public void BuildWindowsRidGraph(string id, bool useridgraph, string packageType)
public void BuildWindowsRidGraph(string id, bool useRidGraph, string packageType)
{
if (TestEnvironment.IsMacOS)
{
Assert.Ignore("This test is designed for testing a windows build.");
}

var projectDir = TestDirectory;
var projectFile = Path.Combine(projectDir, $"{Path.GetFileName(projectDir)}.csproj");
Expand All @@ -96,7 +102,7 @@ public void BuildWindowsRidGraph(string id, bool useridgraph, string packageType
FileUtilities.ReplaceInFile(projectFile,
"<WindowsPackageType>None</WindowsPackageType>",
$"""
<UseRidGraph>{useridgraph}</UseRidGraph>
<UseRidGraph>{useRidGraph}</UseRidGraph>
<WindowsPackageType>{packageType}</WindowsPackageType>
""");

Expand All @@ -115,7 +121,9 @@ public void BuildWindowsRidGraph(string id, bool useridgraph, string packageType
public void PublishUnpackaged(string id, string framework, string config)
{
if (!TestEnvironment.IsWindows)
{
Assert.Ignore("Running Windows templates is only supported on Windows.");
}

var projectDir = TestDirectory;
var projectFile = Path.Combine(projectDir, $"{Path.GetFileName(projectDir)}.csproj");
Expand Down Expand Up @@ -164,7 +172,9 @@ void AssetExists(string filename)
public void PublishPackaged(string id, string framework, string config)
{
if (!TestEnvironment.IsWindows)
{
Assert.Ignore("Running Windows templates is only supported on Windows.");
}

var projectDir = TestDirectory;
var name = Path.GetFileName(projectDir);
Expand Down