-
Notifications
You must be signed in to change notification settings - Fork 11
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
Enable .NET 8 for uwp MultiTarget, upgrade packages #235
Merged
Merged
Changes from all commits
Commits
Show all changes
111 commits
Select commit
Hold shift + click to select a range
9e54bb0
Update to WinAppSdk 1.6.240531000-experimental1
Arlodotexe 9349c6c
Enabled AoT for WinAppSdk 1.6-experimental1. Added RuntimeIdentifier …
Arlodotexe 82f8495
Update MultiTarget/PackageReferences/WinAppSdk.props
Arlodotexe 5e643c4
Merge branch 'main' into wasdk/1.6
Arlodotexe 49cb231
Update MultiTarget/PackageReferences/WinAppSdk.props
Arlodotexe a9d1270
Update to prerelease packages for Wasdk AoT
Arlodotexe 371a247
Disabled AoT on test head, enabled on gallery
Arlodotexe 063405b
Merge branch 'main' into wasdk/1.6
Arlodotexe 0985e1b
Enable PublishAot in debug mode for gallery head
Arlodotexe c461b3f
Enable RuntimeIdentifier in debug mode
Arlodotexe 7aa3d5d
Merge branch 'main' into wasdk/1.6
Arlodotexe 54f6314
Add net8.0-windows10.0.22621.0 and required flags to Uwp TFMs
Arlodotexe d705880
Fixes to $ExcludeComponents parameter
Arlodotexe 842b05a
Fix IsUwp flag when using multiple TFMs
Arlodotexe c5759e8
Declare WindowsSdkPackageVersion on both Wasdk and Uwp
Arlodotexe 4d335d7
Use preview versions of WinUI 2 and CsWinRT
Arlodotexe 9b94a66
Use preview version of behaviors
Arlodotexe a808e65
Suppress CA1416 on modern uwp
Arlodotexe db6b20d
Fix syntax error
Arlodotexe a9f259c
Avoid using anycpu for uwp libraries
Arlodotexe 49f9814
Bump CsWinRT
Arlodotexe ca2f72b
Only use MSBuild Extras on UAP
Arlodotexe 729f096
Enabled NoWarn suppression on non-WinUI UWP
Arlodotexe ed07936
Bump Microsoft.Windows.CsWinRT
Arlodotexe d013d13
Merge branch 'main' into wasdk/1.6
Arlodotexe 84ae3a8
Fixed syntax error
Arlodotexe 66595f7
Update to Microsoft.WindowsAppSDK 1.6.240701003-experimental2
Arlodotexe 15e3d12
Bump CsWinRT and WindowsSdkPackageVersion to latest stable version
Arlodotexe 127bdc3
Add WinAppSDK 1.6 workaround. See https://github.com/CommunityToolkit…
Arlodotexe 25c4ea8
Revert WindowsSdkPackageVersion to 10.0.22621.37-preview to align wit…
Arlodotexe edda2be
Update Microsoft.WindowsAppSDK to 1.6.240807006-preview1
Arlodotexe 336ef4c
Update WindowsSdkPackageVersion for Wasdk 1.6 preview1
Arlodotexe 236955c
Update transient WebView2 reference to 1.0.2730-prerelease
Arlodotexe 2fcca69
Revert WindowsSdkPackageVersion to 10.0.22621.37-preview for WindowsA…
Arlodotexe c3d33c3
Add partial to resolve CsWinRT1028
Arlodotexe 287689f
Restore default enabled TFMs
Arlodotexe 4dbd18a
Reverting 49cb231c9e26fce7627e6491890774b71a9552db. See https://githu…
Arlodotexe 456673a
Remove clean task to resolve https://github.com/CommunityToolkit/Wind…
Arlodotexe 05d93b1
Merge
Arlodotexe d1789db
Merge
Arlodotexe 2936f5f
Merge branch 'main' into uwp-net8-windows
Arlodotexe bd6ec8a
Package updates and fixes for modern dotnet on uwp
Arlodotexe 01984d3
Merge
Arlodotexe 3268bed
Upgrade .NET to 9.0, update config, add TargetFramework.
Arlodotexe b1f5056
Adjust TargetFramework declaration to support multiple values.
Arlodotexe 89d14cb
Update packages, migrate Uno/Wasm to 9.0
Arlodotexe 0a88074
Update uno-check version to 1.27.1 in dotnet-tools.json
Arlodotexe eb0c0eb
Fixed version number for CommunityToolkit.WinUI.UI.Controls.Markdown
Arlodotexe 4f12e80
Align versions for Uno.Microsoft.Xaml.Behaviors.Uwp.Managed
Arlodotexe 529a23d
Upgrade to latest Microsoft.Xaml.Behaviors.Uwp.Managed and Microsoft.…
Arlodotexe 697dcb6
Update MultiTarget/WinUI.Extra.props
Arlodotexe 85b0d4b
Merge branch 'main' into net9.0
Arlodotexe 1c05f6a
Update MultiTarget/NoWarn.props
Arlodotexe 6eedf0c
Update MultiTarget/PackageReferences/Uwp.props
Arlodotexe ab5c7f1
Update MultiTarget/MultiTargetIdentifiers.props
Arlodotexe 69121b1
Merge branch 'main' into uwp-net8-windows
Arlodotexe 0351091
Merge branch 'uwp-net8-windows' into net9.0
Arlodotexe 3a1ee18
Add logic to exclude conflicting MultiTargets based on WinUIMajorVersion
Arlodotexe 0c30f12
Update Uno Xaml Behaviors package references to version 3.0.0-dev.17.…
Arlodotexe db3bd50
Merge pull request #230 from CommunityToolkit/net9.0
Arlodotexe 0ddbd1b
Merge
Arlodotexe ce6127b
Merge
Arlodotexe 2522bb3
Remove hardcoded dotnet installation path, enable net9.0 from container
Arlodotexe fd7999b
Align single-component sln generation script with capabilities of gal…
Arlodotexe f0aaac1
Add temporary workaround for Windows SDK dependency in Uwp.props
Arlodotexe 422fa54
Update comment to clarify purpose of props generation for "All" solut…
Arlodotexe 58dd1c5
Don't include Microsoft.Windows.SDK.CPP when HasWinUI isn't set
Arlodotexe f3f18bd
Bump CommonUnoPackageVersion from 5.5.66 to 5.5.87
Arlodotexe 7625ac5
Include Microsoft.Windows.SDK.CPP package on both uap* and net*-windo…
Arlodotexe 9741fe7
Update ProjectHeads/GenerateSingleSampleHeads.ps1
Arlodotexe 9517fee
Revert removal of comparison values in default EnabledTargetFrameworks
Arlodotexe 218a656
Disable modern .NET for UWP when building in Visual Studio
Arlodotexe 1ee86f4
Add condition to only include Microsoft.Windows.SDK.CPP for Windows t…
Arlodotexe 446aa75
Set TargetPlatformVersion based on target framework for improved comp…
Arlodotexe f342a14
Introduced IsWindowsTfm MultiTargetIdentifier shorthand
Arlodotexe 3a181ac
Introduce TargetPlatformIdentifier property for value comparisons
Arlodotexe c0d535d
Use custom property instead of TargetPlatformIdentifier to avoid SDK …
Arlodotexe 35b9e39
Removal of IsWindowsTfm bool in favor of value checks on MultiTargetP…
Arlodotexe 00974a2
Fixed declaration order for MultiTargetPlatformIdentifier definition …
Arlodotexe 8b58455
Restrict reference to Microsoft.Windows.SDK.CPP to non-head projects.
Arlodotexe 7fae1c0
Fix conditional PackageReference being ignored VS by moving into dedi…
Arlodotexe 8d56d3f
Only use Microsoft.Windows.SDK.CPP on modern .NET
Arlodotexe 5c0d074
Fixed .NET 9 auto-discovery of custom build asset wwwroot/index.html …
Arlodotexe 4fac683
Upgrade Microsoft.Xaml.Behaviors.WinUI.Managed to latest version, rem…
Arlodotexe 83624f6
Add workaround to remove WebView2Loader.dll due to broken reference i…
Arlodotexe 4115929
Apply suggestions from code review
Arlodotexe 326cdec
Update appxrecipe file name with multitarget-aligned project name
Arlodotexe 6b523cd
Use WinUI version of Uno Behaviors package where needed
Arlodotexe 5966fdd
Add property group to suppress IL2026 warnings for Uno behaviors
Arlodotexe 7b62731
Suppress Uno0006 warning after .NET 9 update and adjust IL2026 warnin…
Arlodotexe 9a22078
Add Uno.WinUI.Lottie package reference to project dependencies
Arlodotexe 602f7d5
Convert to file-scoped namespace
Arlodotexe ce7724f
Fix test report log file naming in build workflow
Arlodotexe bd39501
Change warning suppression from WarningsNotAsErrors to NoWarn for IL2…
Arlodotexe 9772e3e
Update workflow to support building and testing in with matrixed mult…
Arlodotexe 4e30ec6
Cleanup test report conditions
Arlodotexe 4ca8e99
Fix quoting in build workflow script for component path
Arlodotexe ccd93a6
Update multitarget options in build workflow to limit platforms
Arlodotexe 3724fa7
Include empty ExcludeMultiTargets in script invocation to work around…
Arlodotexe 453b498
Align ExcludeMultiTargets parameter declaration with GenerateAllSolution
Arlodotexe 143d574
Remove ExcludeMultiTargets parameter from GenerateSingleSampleHeads s…
Arlodotexe 5292429
Add NoWarn.props import to Head.Uwp.props
Arlodotexe 63aaf33
Suppress IL2026 on Wasdk head, Add NoWarn.props import to App.Head.Un…
Arlodotexe 7a46f49
Update Microsoft.Xaml.Behaviors package references to version 3.0.0-p…
Arlodotexe 523a9bd
Update default enabled TFMs, Wasdk and Uwp can no longer build simult…
Arlodotexe c857bb1
Use stable Microsoft.UI.Xaml on UWP, prerelease on modern .NET
Arlodotexe 5e6420e
Use only known MultiTargetPlatformIdentifer values
Arlodotexe 12e1957
Update rational for conditional MUX reference
Arlodotexe 45f6f8d
Add workaround to prevent Microsoft.VCLibs.Desktop inclusion on UAP
Arlodotexe f36651c
Add explicit WebView2 reference to prevent Microsoft.VCLibs.Desktop i…
Arlodotexe 228d7c5
Add workaround to prevent Microsoft.VCLibs.Desktop inclusion for WebV…
Arlodotexe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,25 @@ | ||
<Project> | ||
<PropertyGroup> | ||
<UwpTargetFramework Condition="'$(UwpTargetFramework)' == ''">uap10.0.17763</UwpTargetFramework> | ||
<WinAppSdkTargetFramework Condition="'$(WinAppSdkTargetFramework)' == ''">net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0;</WinAppSdkTargetFramework> | ||
<!-- See https://github.com/CommunityToolkit/Tooling-Windows-Submodule/pull/235#issuecomment-2530131559 --> | ||
<UwpTargetFramework Condition="'$(UwpTargetFramework)' == '' AND '$(BuildingInsideVisualStudio)' == 'true'">uap10.0.17763;</UwpTargetFramework> | ||
<UwpTargetFramework Condition="'$(UwpTargetFramework)' == '' AND '$(BuildingInsideVisualStudio)' != 'true'">uap10.0.17763;net8.0-windows10.0.26100.0;</UwpTargetFramework> | ||
<WinAppSdkTargetFramework Condition="'$(WinAppSdkTargetFramework)' == ''">net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;</WinAppSdkTargetFramework> | ||
|
||
<WasmHeadTargetFramework Condition="'$(WasmHeadTargetFramework)' == ''">net8.0</WasmHeadTargetFramework> | ||
<LinuxHeadTargetFramework Condition="'$(LinuxHeadTargetFramework)' == ''">net8.0</LinuxHeadTargetFramework> | ||
<WpfHeadTargetFramework Condition="'$(WpfHeadTargetFramework)' == ''">net8.0</WpfHeadTargetFramework> | ||
<WasmHeadTargetFramework Condition="'$(WasmHeadTargetFramework)' == ''">net9.0;</WasmHeadTargetFramework> | ||
<LinuxHeadTargetFramework Condition="'$(LinuxHeadTargetFramework)' == ''">net9.0;</LinuxHeadTargetFramework> | ||
<WpfHeadTargetFramework Condition="'$(WpfHeadTargetFramework)' == ''">net9.0;</WpfHeadTargetFramework> | ||
|
||
<AndroidLibTargetFramework Condition="'$(AndroidLibTargetFramework)' == ''">net8.0-android34.0</AndroidLibTargetFramework> | ||
<MacOSLibTargetFramework Condition="'$(MacOSLibTargetFramework)' == ''">net8.0-maccatalyst</MacOSLibTargetFramework> | ||
<iOSLibTargetFramework Condition="'$(iOSLibTargetFramework)' == ''">net8.0-ios</iOSLibTargetFramework> | ||
<AndroidLibTargetFramework Condition="'$(AndroidLibTargetFramework)' == ''">net9.0-android;</AndroidLibTargetFramework> | ||
<MacOSLibTargetFramework Condition="'$(MacOSLibTargetFramework)' == ''">net9.0-maccatalyst;</MacOSLibTargetFramework> | ||
<iOSLibTargetFramework Condition="'$(iOSLibTargetFramework)' == ''">net9.0-ios;</iOSLibTargetFramework> | ||
|
||
<!-- Used for comparison to current TargetFramework --> | ||
<LinuxLibTargetFramework Condition="'$(LinuxLibTargetFramework)' == ''">net8.0</LinuxLibTargetFramework> | ||
<WasmLibTargetFramework Condition="'$(WasmLibTargetFramework)' == ''">net8.0</WasmLibTargetFramework> | ||
<WpfLibTargetFramework Condition="'$(WpfLibTargetFramework)' == ''">net8.0</WpfLibTargetFramework> | ||
<LinuxLibTargetFramework Condition="'$(LinuxLibTargetFramework)' == ''">net9.0;</LinuxLibTargetFramework> | ||
<WasmLibTargetFramework Condition="'$(WasmLibTargetFramework)' == ''">net9.0;</WasmLibTargetFramework> | ||
<WpfLibTargetFramework Condition="'$(WpfLibTargetFramework)' == ''">net9.0;</WpfLibTargetFramework> | ||
|
||
<!-- Used for defining TargetFramework under platforms that need it --> | ||
<DotnetStandardCommonTargetFramework Condition="'$(DotnetStandardCommonTargetFramework)' == ''">netstandard2.0</DotnetStandardCommonTargetFramework> | ||
<DotnetCommonTargetFramework Condition="'$(DotnetCommonTargetFramework)' == ''">net8.0</DotnetCommonTargetFramework> | ||
<DotnetCommonTargetFramework Condition="'$(DotnetCommonTargetFramework)' == ''">net9.0;</DotnetCommonTargetFramework> | ||
</PropertyGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Seems like we're doing this in 3 places, should we have a helper function and start making another helper script these all include and reference? (maybe https://learn.microsoft.com/en-us/powershell/scripting/learn/ps101/10-script-modules ? )
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.
There are chunks of these files with overlapping functionality, not just this. For now, the code should be largely aligned to make it easier to extract later. We can file a ticket for it, if you like. I'd like to get them all, not just the one.