Skip to content

[2025/04/21] Candidate - In Flight Branch #29037

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 15 commits into from
Apr 23, 2025
Merged

[2025/04/21] Candidate - In Flight Branch #29037

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
39caefa
[Windows] - Fix Visual State Issue with Picker TextColor After Naviga…
prakashKannanSf3972 Apr 8, 2025
bf27f69
[iOS] Fixed the TargetInvocationException Occurs When Selecting Heade…
Ahamed-Ali Apr 11, 2025
12d2d5e
[iOS] - Resolved Proper Rendering of Dynamic Header/Footer Updates in…
prakashKannanSf3972 Apr 11, 2025
0987b16
[Android] Fixed ScalingCanvas.SetBlur not working (#28911)
NirmalKumarYuvaraj Apr 11, 2025
a009f76
[Windows] Upgrade to Windows App SDK 1.7 (#28499)
MartyIX Apr 11, 2025
9e2cbac
[iOS] Fix FlyoutPage does not respond to changes in the FlyoutLayoutB…
devanathan-vaithiyanathan Apr 11, 2025
0a240f9
[Android] Fixed the Incorrect Text Color Applied to Selected Tab in T…
Ahamed-Ali Apr 11, 2025
624223c
[iOS] Fix for the File.ContentType from MediaPicker not being in vali…
SyedAbdulAzeemSF4852 Apr 11, 2025
57f7f4d
[XC] add IRootObjectProvider (#28310)
StephaneDelcroix Apr 11, 2025
dfeadeb
[Android] picker - focus/unfocus events (#28122)
kubaflo Apr 16, 2025
9576008
[Windows] Fixed the flyout content width not being set correctly afte…
Tamilarasan-Paranthaman Apr 16, 2025
1fb5164
Revert "[Android] picker - focus/unfocus events (#28122)"
PureWeen Apr 16, 2025
16cd5f2
Fixed Test case failure in PR 29037 - [2025/04/21] Candidate (#29049)
HarishKumarSF4517 Apr 21, 2025
76baabc
Fix CarouselView layout SR6 regressions (#29035)
albyrock87 Apr 22, 2025
b1c026c
[Testing] Feature Matrix UITest Cases for CollectionView EmptyView Fe…
NafeelaNazhir Apr 22, 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
Prev Previous commit
Next Next commit
[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]>
  • Loading branch information
@MartyIX @mattleibow @PureWeen
2 people authored and PureWeen committed Apr 16, 2025
commit a009f76bc8254dac3f86d92de0af9de36c0c4d7a
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)
{
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