Skip to content
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

Jump to bottom

Enable .NET 8 for uwp MultiTarget, upgrade packages #235

Merged
merged 111 commits into from
Dec 20, 2024
Merged

Enable .NET 8 for uwp MultiTarget, upgrade packages #235

merged 111 commits into from
Dec 20, 2024

Conversation

Arlodotexe
Copy link
Member

@Arlodotexe Arlodotexe commented Dec 3, 2024 •
edited
Loading

For components that declare a uwp MultiTarget, this PR:

  • Introduces the net8.0-windows10.0.26100.0 TFM alongside the existing uap10.0.17763
  • Auto-enables the required properties for targeting modern dotnet in uwp
  • Updates several platform packages to versions that support modern dotnet on uwp
  • Adds several workarounds and fixes to get builds working again with all the latest tooling

Arlodotexe added 30 commits June 20, 2024 00:50
@Arlodotexe
Update to WinAppSdk 1.6.240531000-experimental1
9e54bb0
@Arlodotexe
Enabled AoT for WinAppSdk 1.6-experimental1. Added RuntimeIdentifier …
9349c6c 
…to head, removed redundant RuntimeIdentifiers definition on libraries.
@Arlodotexe
Update MultiTarget/PackageReferences/WinAppSdk.props
82f8495
@Arlodotexe
Merge branch 'main' into wasdk/1.6
5e643c4
@Arlodotexe
Update MultiTarget/PackageReferences/WinAppSdk.props
49cb231 
Resolves https://github.com/CommunityToolkit/Tooling-Windows-Submodule/pull/195/files#r1662838806
@Arlodotexe
Update to prerelease packages for Wasdk AoT
a9d1270
@Arlodotexe
Disabled AoT on test head, enabled on gallery
371a247
@Arlodotexe
Merge branch 'main' into wasdk/1.6
063405b
@Arlodotexe
Enable PublishAot in debug mode for gallery head
0985e1b
@Arlodotexe
Enable RuntimeIdentifier in debug mode
c461b3f
@Arlodotexe
Merge branch 'main' into wasdk/1.6
7aa3d5d
@Arlodotexe
Add net8.0-windows10.0.22621.0 and required flags to Uwp TFMs
54f6314
@Arlodotexe
Fixes to $ExcludeComponents parameter
d705880
@Arlodotexe
Fix IsUwp flag when using multiple TFMs
842b05a
@Arlodotexe
Declare WindowsSdkPackageVersion on both Wasdk and Uwp
c5759e8
@Arlodotexe
Use preview versions of WinUI 2 and CsWinRT
4d335d7
@Arlodotexe
Use preview version of behaviors
9b94a66
@Arlodotexe
Suppress CA1416 on modern uwp
a808e65
@Arlodotexe
Fix syntax error
db6b20d
@Arlodotexe
Avoid using anycpu for uwp libraries
a9f259c
@Arlodotexe
Bump CsWinRT
49f9814
@Arlodotexe
Only use MSBuild Extras on UAP
ca2f72b
@Arlodotexe
Enabled NoWarn suppression on non-WinUI UWP
729f096
@Arlodotexe
Bump Microsoft.Windows.CsWinRT
ed07936
@Arlodotexe
Merge branch 'main' into wasdk/1.6
d013d13
@Arlodotexe
Fixed syntax error
84ae3a8
@Arlodotexe
Update to Microsoft.WindowsAppSDK 1.6.240701003-experimental2
66595f7
@Arlodotexe
Bump CsWinRT and WindowsSdkPackageVersion to latest stable version
15e3d12
@Arlodotexe
Add WinAppSDK 1.6 workaround. See CommunityToolkit/Labs-Windows#561 (…
127bdc3 
…comment)
@Arlodotexe
Revert WindowsSdkPackageVersion to 10.0.22621.37-preview to align wit…
25c4ea8 
…h experimental2
@Arlodotexe
Add property group to suppress IL2026 warnings for Uno behaviors
5966fdd
@Arlodotexe
Suppress Uno0006 warning after .NET 9 update and adjust IL2026 warnin…
7b62731 
…g handling
@Arlodotexe
Add Uno.WinUI.Lottie package reference to project dependencies
9a22078
@Arlodotexe
Convert to file-scoped namespace
602f7d5
@Arlodotexe
Fix test report log file naming in build workflow
ce7724f
@Arlodotexe
Change warning suppression from WarningsNotAsErrors to NoWarn for IL2…
bd39501 
…026 in Uno project properties
@Arlodotexe
Update workflow to support building and testing in with matrixed mult…
9772e3e 
…itarget and WinUIMajorVersion, improve test report conditions
@Arlodotexe
Cleanup test report conditions
4e30ec6
@Arlodotexe
Fix quoting in build workflow script for component path
4ca8e99
@Arlodotexe
Update multitarget options in build workflow to limit platforms
ccd93a6
@Arlodotexe
Include empty ExcludeMultiTargets in script invocation to work around…
3724fa7 
… CI error
@Arlodotexe
Align ExcludeMultiTargets parameter declaration with GenerateAllSolution
453b498
@Arlodotexe
Remove ExcludeMultiTargets parameter from GenerateSingleSampleHeads s…
143d574 
…cript invocation
@Arlodotexe
Add NoWarn.props import to Head.Uwp.props
5292429
@Arlodotexe
Suppress IL2026 on Wasdk head, Add NoWarn.props import to App.Head.Un…
63aaf33 
…o.props and Head.WinAppSdk.props consistent with Uwp
@Arlodotexe
Update Microsoft.Xaml.Behaviors package references to version 3.0.0-p…
7a46f49 
…review2 and remove obsolete WebView2 workaround
@Arlodotexe
Update default enabled TFMs, Wasdk and Uwp can no longer build simult…
523a9bd 
…aneously
@Arlodotexe
Use stable Microsoft.UI.Xaml on UWP, prerelease on modern .NET
c857bb1
@Arlodotexe
Use only known MultiTargetPlatformIdentifer values
5e6420e
@Arlodotexe
Update rational for conditional MUX reference
12e1957
@Arlodotexe
Add workaround to prevent Microsoft.VCLibs.Desktop inclusion on UAP
45f6f8d
@Arlodotexe
Add explicit WebView2 reference to prevent Microsoft.VCLibs.Desktop i…
f36651c 
…nclusion on UAP
@Arlodotexe
Add workaround to prevent Microsoft.VCLibs.Desktop inclusion for WebV…
228d7c5 
…iew2 on UAP
@Arlodotexe Arlodotexe enabled auto-merge December 20, 2024 18:50
Sergio0694
Sergio0694 approved these changes Dec 20, 2024
View reviewed changes
Copy link
Member

@Sergio0694 Sergio0694 left a comment

Choose a reason for hiding this comment

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

:shipit:

@Arlodotexe Arlodotexe merged commit ec68ac6 into main Dec 20, 2024
19 checks passed
@Arlodotexe Arlodotexe deleted the uwp-net8-windows branch December 20, 2024 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michael-hawker michael-hawker michael-hawker approved these changes

@Sergio0694 Sergio0694 Sergio0694 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Arlodotexe @Sergio0694 @michael-hawker