Skip to content

Commit 31d201c

Browse files
MartyIXmattleibow
authored andcommitted
[Windows] Upgrade to Windows App SDK 1.7 (#28499)
* Update to Windows App SDK 1.7 https://github.com/microsoft/microsoft-ui-xaml/releases/tag/winui3/release/1.7.0 * nits * Update Directory.Build.targets * Upgrade 1.7.0 to 1.7.1 --------- Co-authored-by: Matthew Leibowitz <[email protected]>
1 parent 8506734 commit 31d201c

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
6262
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
6363
<!-- wasdk -->
64-
<MicrosoftWindowsAppSDKPackageVersion>1.6.250228001</MicrosoftWindowsAppSDKPackageVersion>
64+
<MicrosoftWindowsAppSDKPackageVersion>1.7.250401001</MicrosoftWindowsAppSDKPackageVersion>
6565
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
6666
<MicrosoftGraphicsWin2DPackageVersion>1.2.0</MicrosoftGraphicsWin2DPackageVersion>
6767
<MicrosoftWindowsWebView2PackageVersion>1.0.2903.40</MicrosoftWindowsWebView2PackageVersion>

src/Templates/tests/Directory.Build.targets

+3
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<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." />
55
</Target>
66

7+
<!-- we flip things around in the templates -->
8+
<Target Name="VerifyLaunchSettings" />
9+
710
</Project>

src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs

+12-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public void BuildPackaged(string id, string framework, string config)
2222

2323
// TODO: remove this if as we should be able to build tizen net8
2424
if (framework != DotNetPrevious)
25+
{
2526
EnableTizen(projectFile);
27+
}
2628

2729
if (framework == DotNetPrevious)
2830
{
@@ -54,7 +56,9 @@ public void BuildPackaged(string id, string framework, string config)
5456
public void BuildWindowsAppSDKSelfContained(string id, bool wasdkself, bool netself, string packageType)
5557
{
5658
if (TestEnvironment.IsMacOS)
59+
{
5760
Assert.Ignore("This test is designed for testing a windows build.");
61+
}
5862

5963
var projectDir = TestDirectory;
6064
var projectFile = Path.Combine(projectDir, $"{Path.GetFileName(projectDir)}.csproj");
@@ -82,10 +86,12 @@ public void BuildWindowsAppSDKSelfContained(string id, bool wasdkself, bool nets
8286
[TestCase("maui", true, "MSIX")]
8387
[TestCase("maui", false, "None")]
8488
[TestCase("maui", false, "MSIX")]
85-
public void BuildWindowsRidGraph(string id, bool useridgraph, string packageType)
89+
public void BuildWindowsRidGraph(string id, bool useRidGraph, string packageType)
8690
{
8791
if (TestEnvironment.IsMacOS)
92+
{
8893
Assert.Ignore("This test is designed for testing a windows build.");
94+
}
8995

9096
var projectDir = TestDirectory;
9197
var projectFile = Path.Combine(projectDir, $"{Path.GetFileName(projectDir)}.csproj");
@@ -96,7 +102,7 @@ public void BuildWindowsRidGraph(string id, bool useridgraph, string packageType
96102
FileUtilities.ReplaceInFile(projectFile,
97103
"<WindowsPackageType>None</WindowsPackageType>",
98104
$"""
99-
<UseRidGraph>{useridgraph}</UseRidGraph>
105+
<UseRidGraph>{useRidGraph}</UseRidGraph>
100106
<WindowsPackageType>{packageType}</WindowsPackageType>
101107
""");
102108

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

120128
var projectDir = TestDirectory;
121129
var projectFile = Path.Combine(projectDir, $"{Path.GetFileName(projectDir)}.csproj");
@@ -164,7 +172,9 @@ void AssetExists(string filename)
164172
public void PublishPackaged(string id, string framework, string config)
165173
{
166174
if (!TestEnvironment.IsWindows)
175+
{
167176
Assert.Ignore("Running Windows templates is only supported on Windows.");
177+
}
168178

169179
var projectDir = TestDirectory;
170180
var name = Path.GetFileName(projectDir);

0 commit comments

Comments
 (0)