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 #584

Merged
merged 48 commits into from
Dec 20, 2024
Merged

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

merged 48 commits into from
Dec 20, 2024

Conversation

Arlodotexe
Copy link
Member

@Arlodotexe Arlodotexe commented Dec 13, 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

Prerequisite PRs:

@Arlodotexe Arlodotexe self-assigned this Dec 13, 2024
@Arlodotexe Arlodotexe force-pushed the uwp-net8-windows branch 2 times, most recently from 62707aa to f3faa71 Compare December 18, 2024 21:30
@michael-hawker
Copy link
Member

Should be gtg once the tooling pointer is updated

@Arlodotexe
Fixing CSWinRT1028 warnings, adding partials for AoT.
d7cbb7a
@Arlodotexe
Suppress internally generated error CsWinRT1028, add notes
b4b01b6
@Arlodotexe
Use preview version of Behaviors
681c80b
@Arlodotexe
Added compilation conditionals for missing Windows.UI.Xaml.Automation…
0e98071 
….ElementNotEnabledException
@Arlodotexe
Added compilation conditionals for missing Windows.UI.ColorHelper
12ae6ce
@Arlodotexe
Use Microsoft.UI.Xaml.Automation.ElementNotEnabledException on modern…
93847bd 
… uwp
@Arlodotexe
Use color.ToString() as ToDisplayName replacement on modern uwp
63d044b
@Arlodotexe
Add source
9ec9f1c
@Arlodotexe
Fixing FontWeight and FontStyle namespaces
1085dce
@Arlodotexe
Fixed bad property declaration
6c17145
@Arlodotexe
Update Microsoft.WindowsAppSDK to 1.6.240807006-preview1, remove CsWi…
21c072d 
…nRT1028 suppression.
@Arlodotexe
Package updates and fixes for modern dotnet on uwp
669e211
@Arlodotexe
Upgrade to latest Microsoft.Xaml.Behaviors.Uwp.Managed and Microsoft.…
b36a034 
…UI.Xaml
@Arlodotexe
Add nullability annotations to converter and extension methods
fcb3b86
@Arlodotexe
Update package references for Uno.Microsoft.Xaml.Behaviors to version…
4fc7bc6 
… 3.0.0-dev.17.g7c09b9114d
@Arlodotexe
Update SDK version to 9.0.101 in global.json
cc4f810
@Arlodotexe
Update tooling with latest fixes, update behaviors
34e8138
@Arlodotexe
Delete docs submodule
67d12d0
@Arlodotexe
Ran XAML styler
a22b668
@Arlodotexe
Upgrade to .NET 9.0 in Dockerfile, devcontainer.json, build.yml, and …
3f1be96 
…global.json
Arlodotexe and others added 17 commits December 20, 2024 13:41
@Arlodotexe
Add suppression message for trimming warning in GetContentControl method
4093b4e
@Arlodotexe
Only enable suppression message for trimming warning in GetContentCon…
8da7547 
…trol method in .NET 8.0 or greater
@Arlodotexe
Suppress IL2059 warning due to known platform issue in ColorPicker pr…
94e0c99 
…oject
@Arlodotexe
Change Truth method visibility from public to private in ColorPicker …
ceba07d 
…component
@Arlodotexe
Fix compilation conditions for Wasdk
8b44df3
@Arlodotexe
Cleanup and refactor TokenizingTextBox automation tests
2dbb7d4
@Arlodotexe
Cleanup usings and compilation conditionals
ecc7f41
@Arlodotexe
Update Microsoft.Xaml.Behaviors package references to version 3.0.0-p…
9ec2554 
…review2
@Arlodotexe
Explicitly specify Platforms to build when packaging
500ee81
@Arlodotexe
Use comma-delimited "Platform" property instead of semicolon-delimite…
6b5e8ec 
…d "Platforms"
@Arlodotexe
Fixed an issue where building uwp/uap would result in Microsoft.VCLib…
9b40a94 
…s.Desktop error
@Arlodotexe
Add workaround to prevent WebView2 from including Microsoft.VCLibs.De…
1cafff1 
…sktop in UAP builds
@Arlodotexe
Add PullRequests package source to nuget.config
61b1253
@Arlodotexe @Sergio0694
Update components/Extensions/src/Text/StringExtensions.Localization.cs
f244689 
Co-authored-by: Sergio Pedri <[email protected]>
@Arlodotexe @Sergio0694
Update components/Extensions/src/Text/StringExtensions.Localization.cs
a0cf3a9 
Co-authored-by: Sergio Pedri <[email protected]>
@Arlodotexe @Sergio0694
Update components/Converters/src/ResourceNameToResourceStringConverte…
79a20d4 
…r.cs

Co-authored-by: Sergio Pedri <[email protected]>
@Arlodotexe
Fix syntax error
803c4e2
@Arlodotexe Arlodotexe enabled auto-merge (rebase) December 20, 2024 19:53
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:

michael-hawker
michael-hawker reviewed Dec 20, 2024
View reviewed changes
nuget.config Outdated Show resolved Hide resolved
michael-hawker
michael-hawker reviewed Dec 20, 2024
View reviewed changes
nuget.config Outdated Show resolved Hide resolved
michael-hawker
michael-hawker requested changes Dec 20, 2024
View reviewed changes
Copy link
Member

@michael-hawker michael-hawker left a comment

Choose a reason for hiding this comment

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

Nuget.config changes need to be reverted

@Arlodotexe Arlodotexe merged commit 2c0f9b3 into main Dec 20, 2024
23 checks passed
@Arlodotexe Arlodotexe deleted the uwp-net8-windows branch December 20, 2024 23:55
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

@Arlodotexe Arlodotexe

Labels
dev loop ➰
Projects
Toolkit 8.x
Status: ✅ Done
Milestone
No milestone
Development

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