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

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

Changes from 1 commit
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
9e54bb0
Update to WinAppSdk 1.6.240531000-experimental1
Arlodotexe Jun 20, 2024
9349c6c
Enabled AoT for WinAppSdk 1.6-experimental1. Added RuntimeIdentifier …
Arlodotexe Jun 20, 2024
82f8495
Update MultiTarget/PackageReferences/WinAppSdk.props
Arlodotexe Jun 28, 2024
5e643c4
Merge branch 'main' into wasdk/1.6
Arlodotexe Jun 28, 2024
49cb231
Update MultiTarget/PackageReferences/WinAppSdk.props
Arlodotexe Jul 2, 2024
a9d1270
Update to prerelease packages for Wasdk AoT
Arlodotexe Jul 29, 2024
371a247
Disabled AoT on test head, enabled on gallery
Arlodotexe Aug 1, 2024
063405b
Merge branch 'main' into wasdk/1.6
Arlodotexe Aug 1, 2024
0985e1b
Enable PublishAot in debug mode for gallery head
Arlodotexe Aug 1, 2024
c461b3f
Enable RuntimeIdentifier in debug mode
Arlodotexe Aug 1, 2024
7aa3d5d
Merge branch 'main' into wasdk/1.6
Arlodotexe Aug 2, 2024
54f6314
Add net8.0-windows10.0.22621.0 and required flags to Uwp TFMs
Arlodotexe Aug 2, 2024
d705880
Fixes to $ExcludeComponents parameter
Arlodotexe Aug 5, 2024
842b05a
Fix IsUwp flag when using multiple TFMs
Arlodotexe Aug 5, 2024
c5759e8
Declare WindowsSdkPackageVersion on both Wasdk and Uwp
Arlodotexe Aug 5, 2024
4d335d7
Use preview versions of WinUI 2 and CsWinRT
Arlodotexe Aug 5, 2024
9b94a66
Use preview version of behaviors
Arlodotexe Aug 5, 2024
a808e65
Suppress CA1416 on modern uwp
Arlodotexe Aug 5, 2024
db6b20d
Fix syntax error
Arlodotexe Aug 5, 2024
a9f259c
Avoid using anycpu for uwp libraries
Arlodotexe Aug 5, 2024
49f9814
Bump CsWinRT
Arlodotexe Aug 6, 2024
ca2f72b
Only use MSBuild Extras on UAP
Arlodotexe Aug 6, 2024
729f096
Enabled NoWarn suppression on non-WinUI UWP
Arlodotexe Aug 6, 2024
ed07936
Bump Microsoft.Windows.CsWinRT
Arlodotexe Aug 7, 2024
d013d13
Merge branch 'main' into wasdk/1.6
Arlodotexe Aug 7, 2024
84ae3a8
Fixed syntax error
Arlodotexe Aug 7, 2024
66595f7
Update to Microsoft.WindowsAppSDK 1.6.240701003-experimental2
Arlodotexe Aug 7, 2024
15e3d12
Bump CsWinRT and WindowsSdkPackageVersion to latest stable version
Arlodotexe Aug 9, 2024
127bdc3
Add WinAppSDK 1.6 workaround. See https://github.com/CommunityToolkit…
Arlodotexe Aug 9, 2024
25c4ea8
Revert WindowsSdkPackageVersion to 10.0.22621.37-preview to align wit…
Arlodotexe Aug 9, 2024
edda2be
Update Microsoft.WindowsAppSDK to 1.6.240807006-preview1
Arlodotexe Aug 14, 2024
336ef4c
Update WindowsSdkPackageVersion for Wasdk 1.6 preview1
Arlodotexe Aug 14, 2024
236955c
Update transient WebView2 reference to 1.0.2730-prerelease
Arlodotexe Aug 14, 2024
2fcca69
Revert WindowsSdkPackageVersion to 10.0.22621.37-preview for WindowsA…
Arlodotexe Aug 15, 2024
c3d33c3
Add partial to resolve CsWinRT1028
Arlodotexe Aug 16, 2024
287689f
Restore default enabled TFMs
Arlodotexe Aug 16, 2024
4dbd18a
Reverting 49cb231c9e26fce7627e6491890774b71a9552db. See https://githu…
Arlodotexe Aug 16, 2024
456673a
Remove clean task to resolve https://github.com/CommunityToolkit/Wind…
Arlodotexe Aug 19, 2024
05d93b1
Merge
Arlodotexe Aug 19, 2024
d1789db
Merge
Arlodotexe Aug 23, 2024
2936f5f
Merge branch 'main' into uwp-net8-windows
Arlodotexe Sep 20, 2024
bd6ec8a
Package updates and fixes for modern dotnet on uwp
Arlodotexe Sep 25, 2024
01984d3
Merge
Arlodotexe Nov 13, 2024
3268bed
Upgrade .NET to 9.0, update config, add TargetFramework.
Arlodotexe Nov 18, 2024
b1f5056
Adjust TargetFramework declaration to support multiple values.
Arlodotexe Nov 18, 2024
89d14cb
Update packages, migrate Uno/Wasm to 9.0
Arlodotexe Nov 22, 2024
0a88074
Update uno-check version to 1.27.1 in dotnet-tools.json
Arlodotexe Nov 18, 2024
eb0c0eb
Fixed version number for CommunityToolkit.WinUI.UI.Controls.Markdown
Arlodotexe Nov 25, 2024
4f12e80
Align versions for Uno.Microsoft.Xaml.Behaviors.Uwp.Managed
Arlodotexe Nov 25, 2024
529a23d
Upgrade to latest Microsoft.Xaml.Behaviors.Uwp.Managed and Microsoft.…
Arlodotexe Dec 3, 2024
697dcb6
Update MultiTarget/WinUI.Extra.props
Arlodotexe Dec 4, 2024
85b0d4b
Merge branch 'main' into net9.0
Arlodotexe Dec 4, 2024
1c05f6a
Update MultiTarget/NoWarn.props
Arlodotexe Dec 4, 2024
6eedf0c
Update MultiTarget/PackageReferences/Uwp.props
Arlodotexe Dec 4, 2024
ab5c7f1
Update MultiTarget/MultiTargetIdentifiers.props
Arlodotexe Dec 4, 2024
69121b1
Merge branch 'main' into uwp-net8-windows
Arlodotexe Dec 4, 2024
0351091
Merge branch 'uwp-net8-windows' into net9.0
Arlodotexe Dec 4, 2024
3a1ee18
Add logic to exclude conflicting MultiTargets based on WinUIMajorVersion
Arlodotexe Dec 4, 2024
0c30f12
Update Uno Xaml Behaviors package references to version 3.0.0-dev.17.…
Arlodotexe Dec 4, 2024
db3bd50
Merge pull request #230 from CommunityToolkit/net9.0
Arlodotexe Dec 4, 2024
0ddbd1b
Merge
Arlodotexe Dec 4, 2024
ce6127b
Merge
Arlodotexe Dec 4, 2024
2522bb3
Remove hardcoded dotnet installation path, enable net9.0 from container
Arlodotexe Dec 4, 2024
fd7999b
Align single-component sln generation script with capabilities of gal…
Arlodotexe Dec 4, 2024
f0aaac1
Add temporary workaround for Windows SDK dependency in Uwp.props
Arlodotexe Dec 4, 2024
422fa54
Update comment to clarify purpose of props generation for "All" solut…
Arlodotexe Dec 4, 2024
58dd1c5
Don't include Microsoft.Windows.SDK.CPP when HasWinUI isn't set
Arlodotexe Dec 4, 2024
f3f18bd
Bump CommonUnoPackageVersion from 5.5.66 to 5.5.87
Arlodotexe Dec 5, 2024
7625ac5
Include Microsoft.Windows.SDK.CPP package on both uap* and net*-windo…
Arlodotexe Dec 5, 2024
9741fe7
Update ProjectHeads/GenerateSingleSampleHeads.ps1
Arlodotexe Dec 10, 2024
9517fee
Revert removal of comparison values in default EnabledTargetFrameworks
Arlodotexe Dec 10, 2024
218a656
Disable modern .NET for UWP when building in Visual Studio
Arlodotexe Dec 10, 2024
1ee86f4
Add condition to only include Microsoft.Windows.SDK.CPP for Windows t…
Arlodotexe Dec 11, 2024
446aa75
Set TargetPlatformVersion based on target framework for improved comp…
Arlodotexe Dec 11, 2024
f342a14
Introduced IsWindowsTfm MultiTargetIdentifier shorthand
Arlodotexe Dec 11, 2024
3a181ac
Introduce TargetPlatformIdentifier property for value comparisons
Arlodotexe Dec 11, 2024
c0d535d
Use custom property instead of TargetPlatformIdentifier to avoid SDK …
Arlodotexe Dec 11, 2024
35b9e39
Removal of IsWindowsTfm bool in favor of value checks on MultiTargetP…
Arlodotexe Dec 11, 2024
00974a2
Fixed declaration order for MultiTargetPlatformIdentifier definition …
Arlodotexe Dec 11, 2024
8b58455
Restrict reference to Microsoft.Windows.SDK.CPP to non-head projects.
Arlodotexe Dec 11, 2024
7fae1c0
Fix conditional PackageReference being ignored VS by moving into dedi…
Arlodotexe Dec 12, 2024
8d56d3f
Only use Microsoft.Windows.SDK.CPP on modern .NET
Arlodotexe Dec 12, 2024
5c0d074
Fixed .NET 9 auto-discovery of custom build asset wwwroot/index.html …
Arlodotexe Dec 12, 2024
4fac683
Upgrade Microsoft.Xaml.Behaviors.WinUI.Managed to latest version, rem…
Arlodotexe Dec 12, 2024
83624f6
Add workaround to remove WebView2Loader.dll due to broken reference i…
Arlodotexe Dec 13, 2024
4115929
Apply suggestions from code review
Arlodotexe Dec 14, 2024
326cdec
Update appxrecipe file name with multitarget-aligned project name
Arlodotexe Dec 14, 2024
6b523cd
Use WinUI version of Uno Behaviors package where needed
Arlodotexe Dec 16, 2024
5966fdd
Add property group to suppress IL2026 warnings for Uno behaviors
Arlodotexe Dec 16, 2024
7b62731
Suppress Uno0006 warning after .NET 9 update and adjust IL2026 warnin…
Arlodotexe Dec 16, 2024
9a22078
Add Uno.WinUI.Lottie package reference to project dependencies
Arlodotexe Dec 16, 2024
602f7d5
Convert to file-scoped namespace
Arlodotexe Dec 16, 2024
ce7724f
Fix test report log file naming in build workflow
Arlodotexe Dec 17, 2024
bd39501
Change warning suppression from WarningsNotAsErrors to NoWarn for IL2…
Arlodotexe Dec 17, 2024
9772e3e
Update workflow to support building and testing in with matrixed mult…
Arlodotexe Dec 17, 2024
4e30ec6
Cleanup test report conditions
Arlodotexe Dec 17, 2024
4ca8e99
Fix quoting in build workflow script for component path
Arlodotexe Dec 17, 2024
ccd93a6
Update multitarget options in build workflow to limit platforms
Arlodotexe Dec 17, 2024
3724fa7
Include empty ExcludeMultiTargets in script invocation to work around…
Arlodotexe Dec 17, 2024
453b498
Align ExcludeMultiTargets parameter declaration with GenerateAllSolution
Arlodotexe Dec 17, 2024
143d574
Remove ExcludeMultiTargets parameter from GenerateSingleSampleHeads s…
Arlodotexe Dec 17, 2024
5292429
Add NoWarn.props import to Head.Uwp.props
Arlodotexe Dec 17, 2024
63aaf33
Suppress IL2026 on Wasdk head, Add NoWarn.props import to App.Head.Un…
Arlodotexe Dec 17, 2024
7a46f49
Update Microsoft.Xaml.Behaviors package references to version 3.0.0-p…
Arlodotexe Dec 18, 2024
523a9bd
Update default enabled TFMs, Wasdk and Uwp can no longer build simult…
Arlodotexe Dec 18, 2024
c857bb1
Use stable Microsoft.UI.Xaml on UWP, prerelease on modern .NET
Arlodotexe Dec 18, 2024
5e6420e
Use only known MultiTargetPlatformIdentifer values
Arlodotexe Dec 18, 2024
12e1957
Update rational for conditional MUX reference
Arlodotexe Dec 18, 2024
45f6f8d
Add workaround to prevent Microsoft.VCLibs.Desktop inclusion on UAP
Arlodotexe Dec 18, 2024
f36651c
Add explicit WebView2 reference to prevent Microsoft.VCLibs.Desktop i…
Arlodotexe Dec 19, 2024
228d7c5
Add workaround to prevent Microsoft.VCLibs.Desktop inclusion for WebV…
Arlodotexe Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion MultiTarget/MultiTargetIdentifiers.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@

<IsUwp Condition="'$(IsUwp)' == '' AND $(UwpTargetFramework.Contains('$(TargetFramework);')) AND '$(UwpTargetFramework)' != '' AND '$(MultiTargetsUwp)' == 'true'">true</IsUwp>
<IsWinAppSdk Condition="'$(IsWinAppSdk)' == '' AND $(WinAppSdkTargetFramework.Contains('$(TargetFramework);')) AND '$(WinAppSdkTargetFramework)' != '' AND '$(MultiTargetsWasdk)' == 'true'">true</IsWinAppSdk>
<IsWindowsTfm Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">true</IsWindowsTfm>
<TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>
Arlodotexe marked this conversation as resolved.
Show resolved Hide resolved
<IsWindowsTfm Condition="$(TargetPlatformIdentifier) == 'windows'">true</IsWindowsTfm>

<IsDroid Condition="'$(IsDroid)' == '' AND $(AndroidLibTargetFramework.Contains('$(TargetFramework);')) AND '$(AndroidLibTargetFramework)' != '' AND '$(MultiTargetsDroid)' == 'true'">true</IsDroid>
<IsMacOS Condition="'$(IsMacOS)' == '' AND $(MacOSLibTargetFramework.Contains('$(TargetFramework);')) AND '$(MacOSLibTargetFramework)' != '' AND '$(MultiTargetsMacOS)' == 'true'">true</IsMacOS>
Expand Down
Loading