Bump WinAppSDK to 1.6 #24266

Foda · 2024-08-15T19:14:56Z

Description of Change

Bump WinAppSDK to 1.6

Fixes

Fixes #24875
Fixes #22697
Fixes #11472
Fixes #22894

NuGet.config

Directory.Build.props

MartyIX · 2024-08-15T19:30:16Z

This PR should fix #11472 (#11472 (comment)).

Directory.Build.targets

Foda · 2024-08-21T17:17:36Z

~~@mattleibow Currently blocked on this by: microsoft/WindowsAppSDK#4646~~

Directory.Build.props

src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj

…nter.HasTitlebar impl)

MartyIX · 2024-09-04T06:47:28Z

@Foda Regarding this

maui/src/Core/src/Platform/Windows/MauiWinUIWindow.cs

Lines 65 to 69 in 642a352

    
           // We have to track isActivated calls because WinUI will call OnActivated Twice 
        
           // when maximizing a window 
        
           // https://github.com/microsoft/microsoft-ui-xaml/issues/7343 
        
           if (_isActivated) 
        
           	return;

, the corresponding issue was fixed in microsoft/microsoft-ui-xaml#7343 for WinAppSDK 1.6.

It's probably better to have that if statement (just in case?) but perhaps one should log an error there because the issue should be fixed.

Ensure font is the same pre-1.6

manodasanW · 2024-10-05T18:31:39Z

Directory.Build.targets

@@ -84,8 +84,11 @@
    <FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
  </ItemGroup>
  <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.19041.34</WindowsSdkPackageVersion>   
+    <WindowsSdkPackageVersion>10.0.19041.34</WindowsSdkPackageVersion>


Looks like this and above got uncommented during merge. This is already set to 44 in the props.

Oops -- lemme remove this

Foda · 2024-10-08T00:10:02Z

/azp run

azure-pipelines · 2024-10-08T00:10:22Z

Azure Pipelines successfully started running 3 pipeline(s).

PureWeen · 2024-10-08T21:08:13Z

Failing tests are unrelated

PureWeen · 2024-10-15T18:27:18Z

/backport to release/9.0.1xx

github-actions · 2024-10-15T18:27:29Z

Started backporting to release/9.0.1xx: https://github.com/dotnet/maui/actions/runs/11352164269

github-actions · 2024-10-15T18:27:44Z

@PureWeen backporting to release/9.0.1xx failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Bump WinAppSDK version + WebView2 version
Using index info to reconstruct a base tree...
M	Directory.Build.props
M	Directory.Build.targets
M	NuGet.config
M	eng/NuGetVersions.targets
M	eng/Versions.props
M	src/Core/src/Core.csproj
M	src/Essentials/src/Essentials.csproj
M	src/Graphics/samples/GraphicsTester.WinUI.Desktop/GraphicsTester.WinUI.Desktop.csproj
M	src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
M	src/Graphics/src/Graphics/Graphics.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/Graphics/src/Graphics/Graphics.csproj
CONFLICT (content): Merge conflict in src/Graphics/src/Graphics/Graphics.csproj
Auto-merging src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj
Auto-merging src/Graphics/samples/GraphicsTester.WinUI.Desktop/GraphicsTester.WinUI.Desktop.csproj
Auto-merging src/Essentials/src/Essentials.csproj
Auto-merging src/Core/src/Core.csproj
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/NuGetVersions.targets
Auto-merging NuGet.config
Auto-merging Directory.Build.targets
CONFLICT (content): Merge conflict in Directory.Build.targets
Auto-merging Directory.Build.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump WinAppSDK version + WebView2 version
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions · 2024-10-15T18:27:45Z

@PureWeen an error occurred while backporting to release/9.0.1xx, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

* Bump WinAppSDK version + WebView2 version * Add WebView2 ref to Controls.Core * Add another package ref * Bump SDK versions * Bump winappsdk version * Add missing package ref * Update NuGet.config * Update Directory.Build.props * Use SDK v38 * Remove refs to WebView2, use `WindowsAppSDK` * Add more package refs * Use the correct way to check for a window style (see: OverlappedPresenter.HasTitlebar impl) * More pkgs for webview * Mark test as unstable * TEST: add monitor info for test context * Revert change, try manually setting button height...?! * Move style * Revert change Ensure font is the same pre-1.6 * Ensure more fonts are consistant * Bump SDK version Add workaround * Update images for tests * Update more images * Huh * Maybe fix crashes * Remove package from test cases * ugh * www * Ehh * Changes for AOT Revert workaround for items list * Font test * Test font again * Remove refs to winappsdk where it's not needed Add explicit ref to WebView2 package * Fix some missing refs * Remove winappsdk ref in graphics projects * Add explcit "Microsoft.Windows.SDK.NET.Ref" versions * NOP failing test Fix build issue * - publish binlogs * - fix logs * Update maui-templates.yml * Fix issue w/ dupe package contents * Throwing stuff at the wall * Update winsdk and dotnet versions * Revert SDK version * Modify AOT compat check * Re-add SDK.NET.Ref * Re-bump winappsdk version * Fix SDK pack version * Fix nested partial types * DOh * Update test image * Update Directory.Build.targets * Remove dupe properties * Remove work-around * Fix merge issues * WTF? * Blah --------- Co-authored-by: Mike Corsaro <[email protected]> Co-authored-by: Matthew Leibowitz <[email protected]> Co-authored-by: Shane Neuville <[email protected]> Co-authored-by: Rui Marinho <[email protected]>

Mike Corsaro added 2 commits August 15, 2024 11:29

Bump WinAppSDK version + WebView2 version

9c8c2cb

Add WebView2 ref to Controls.Core

c30ee86

Foda commented Aug 15, 2024

View reviewed changes

NuGet.config Outdated Show resolved Hide resolved

Foda commented Aug 15, 2024

View reviewed changes

Directory.Build.props Outdated Show resolved Hide resolved

Add another package ref

b406e46

MartyIX reviewed Aug 18, 2024

View reviewed changes

Directory.Build.targets Outdated Show resolved Hide resolved

Merge branch 'net9.0' into foda/winappsdk16

f4b78e8

Mike Corsaro and others added 6 commits August 21, 2024 10:21

Bump SDK versions

2614bf1

Bump winappsdk version

e32e613

Merge branch 'net9.0' into foda/winappsdk16

e2fc4dd

Add missing package ref

800c9f3

Update NuGet.config

021a85d

Update Directory.Build.props

d783b46

mattleibow reviewed Aug 23, 2024

View reviewed changes

Directory.Build.props Outdated Show resolved Hide resolved

src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj Outdated Show resolved Hide resolved

Mike Corsaro added 3 commits August 23, 2024 14:42

Use SDK v38

47470c9

Remove refs to WebView2, use WindowsAppSDK

9c1b25d

Add more package refs

80b334d

samhouts added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Aug 27, 2024

This was referenced Aug 29, 2024

Modal pages in a maximized app do not cover the whole window in MAUI 9.0 Preview 6 / WinUI 3 microsoft/microsoft-ui-xaml#9875

Open

[Windows] On .NET MAUI 9.0 Preview 4, a modal full screen window is not properly maximized #22784

Open

Mike Corsaro added 6 commits August 29, 2024 10:54

Use the correct way to check for a window style (see: OverlappedPrese…

21f360a

…nter.HasTitlebar impl)

More pkgs for webview

2930d70

Mark test as unstable

dad501d

TEST: add monitor info for test context

47a7672

Revert change, try manually setting button height...?!

4a4c24e

Move style

73e1703

Revert change

90f19b4

Ensure font is the same pre-1.6

Update test image

b0381c9

Foda marked this pull request as ready for review October 4, 2024 21:50

Foda requested a review from a team as a code owner October 4, 2024 21:50

Foda requested review from PureWeen and jsuarezruiz October 4, 2024 21:50

rmarinho added 2 commits October 5, 2024 00:31

Merge branch 'net9.0' into foda/winappsdk16

17ee733

Update Directory.Build.targets

bc60ef6

manodasanW reviewed Oct 5, 2024

View reviewed changes

Mike Corsaro added 5 commits October 7, 2024 10:12

Remove dupe properties

237f4fa

Remove work-around

79c7d7a

Fix merge issues

eff3a43

WTF?

e122733

Blah

d29d1cf

PureWeen approved these changes Oct 8, 2024

View reviewed changes

PureWeen merged commit aae4d07 into net9.0 Oct 8, 2024
117 of 121 checks passed

PureWeen deleted the foda/winappsdk16 branch October 8, 2024 21:08

samhouts added the fixed-in-net9.0-nightly This may be available in a nightly release! label Oct 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump WinAppSDK to 1.6 #24266

Bump WinAppSDK to 1.6 #24266

Foda commented Aug 15, 2024 •

edited

Loading

MartyIX commented Aug 15, 2024

Foda commented Aug 21, 2024 •

edited

Loading

MartyIX commented Sep 4, 2024

manodasanW Oct 5, 2024

Foda Oct 7, 2024

Foda commented Oct 8, 2024

azure-pipelines bot commented Oct 8, 2024

PureWeen commented Oct 8, 2024

PureWeen commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

Bump WinAppSDK to 1.6 #24266

Bump WinAppSDK to 1.6 #24266

Conversation

Foda commented Aug 15, 2024 • edited Loading

Description of Change

Fixes

MartyIX commented Aug 15, 2024

Foda commented Aug 21, 2024 • edited Loading

MartyIX commented Sep 4, 2024

manodasanW Oct 5, 2024

Choose a reason for hiding this comment

Foda Oct 7, 2024

Choose a reason for hiding this comment

Foda commented Oct 8, 2024

azure-pipelines bot commented Oct 8, 2024

PureWeen commented Oct 8, 2024

PureWeen commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

Foda commented Aug 15, 2024 •

edited

Loading

Foda commented Aug 21, 2024 •

edited

Loading