-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Bump WinAppSDK to 1.6 #24266
Bump WinAppSDK to 1.6 #24266
Conversation
This PR should fix #11472 (#11472 (comment)). |
|
src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
Outdated
Show resolved
Hide resolved
@Foda Regarding this maui/src/Core/src/Platform/Windows/MauiWinUIWindow.cs Lines 65 to 69 in 642a352
It's probably better to have that |
Ensure font is the same pre-1.6
Directory.Build.targets
Outdated
@@ -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> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this and above got uncommented during merge. This is already set to 44 in the props.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops -- lemme remove this
/azp run |
Azure Pipelines successfully started running 3 pipeline(s). |
|
/backport to release/9.0.1xx |
Started backporting to release/9.0.1xx: https://github.com/dotnet/maui/actions/runs/11352164269 |
@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! |
@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 <mikecorsaro@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net>
* 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 <mikecorsaro@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net>
Description of Change
Bump WinAppSDK to 1.6
Fixes
Fixes #24875
Fixes #22697
Fixes #11472
Fixes #22894