From 9e54bb0c2fe2d9b2d388a6d31e83c6062a6f918b Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jun 2024 00:50:13 -0500 Subject: [PATCH 01/98] Update to WinAppSdk 1.6.240531000-experimental1 --- MultiTarget/PackageReferences/WinAppSdk.props | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 20463cae..436edae1 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -1,6 +1,9 @@ - + + + + From 9349c6c5f77bdc3958f78e4533efe84f11258947 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jun 2024 00:52:08 -0500 Subject: [PATCH 02/98] Enabled AoT for WinAppSdk 1.6-experimental1. Added RuntimeIdentifier to head, removed redundant RuntimeIdentifiers definition on libraries. --- MultiTarget/WinUI.Extra.props | 2 +- ProjectHeads/Head.WinAppSdk.props | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index ba824ca0..5ca94a8f 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -26,7 +26,7 @@ win-x86;win-x64;win-arm64 win10-x86;win10-x64;win10-arm64 - win-x86;win-x64;win-arm64 + 10.0.22621.35-preview diff --git a/ProjectHeads/Head.WinAppSdk.props b/ProjectHeads/Head.WinAppSdk.props index 74b8498a..56c090c9 100644 --- a/ProjectHeads/Head.WinAppSdk.props +++ b/ProjectHeads/Head.WinAppSdk.props @@ -15,8 +15,9 @@ - - false + true + win-$(Platform) + win10-$(Platform) From 82f849570b9d5603ee2a18dddd0d8160d13eeb31 Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 28 Jun 2024 15:35:58 -0500 Subject: [PATCH 03/98] Update MultiTarget/PackageReferences/WinAppSdk.props --- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 436edae1..9792165c 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -3,7 +3,7 @@ - + From 49cb231c9e26fce7627e6491890774b71a9552db Mon Sep 17 00:00:00 2001 From: Arlo Date: Tue, 2 Jul 2024 11:55:26 -0500 Subject: [PATCH 04/98] Update MultiTarget/PackageReferences/WinAppSdk.props Resolves https://github.com/CommunityToolkit/Tooling-Windows-Submodule/pull/195/files#r1662838806 --- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 9792165c..68eb7bc5 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -4,6 +4,6 @@ - + From a9d127043611ffab4d8f3499d3f5ca746f00c4ac Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 29 Jul 2024 13:53:36 -0500 Subject: [PATCH 05/98] Update to prerelease packages for Wasdk AoT --- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- MultiTarget/WinUI.Extra.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 68eb7bc5..1e598248 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -4,6 +4,6 @@ - + diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index 5ca94a8f..d27db269 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -26,7 +26,7 @@ win-x86;win-x64;win-arm64 win10-x86;win10-x64;win10-arm64 - 10.0.22621.35-preview + 10.0.22621.37-preview From 371a247873a269f718783ed7fea4aa51927615d2 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 1 Aug 2024 11:40:13 -0500 Subject: [PATCH 06/98] Disabled AoT on test head, enabled on gallery --- ProjectHeads/App.Head.WinAppSdk.props | 4 ++++ ProjectHeads/Head.WinAppSdk.props | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ProjectHeads/App.Head.WinAppSdk.props b/ProjectHeads/App.Head.WinAppSdk.props index cd101a86..f7df7075 100644 --- a/ProjectHeads/App.Head.WinAppSdk.props +++ b/ProjectHeads/App.Head.WinAppSdk.props @@ -3,6 +3,10 @@ WinUI + + true + + diff --git a/ProjectHeads/Head.WinAppSdk.props b/ProjectHeads/Head.WinAppSdk.props index 56c090c9..4d8a7403 100644 --- a/ProjectHeads/Head.WinAppSdk.props +++ b/ProjectHeads/Head.WinAppSdk.props @@ -15,7 +15,6 @@ - true win-$(Platform) win10-$(Platform) From 0985e1bc0cda51ee17180b591a5d8403ead8b63a Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 1 Aug 2024 12:14:11 -0500 Subject: [PATCH 07/98] Enable PublishAot in debug mode for gallery head --- ProjectHeads/App.Head.WinAppSdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectHeads/App.Head.WinAppSdk.props b/ProjectHeads/App.Head.WinAppSdk.props index f7df7075..d51b89fa 100644 --- a/ProjectHeads/App.Head.WinAppSdk.props +++ b/ProjectHeads/App.Head.WinAppSdk.props @@ -3,7 +3,7 @@ WinUI - + true From c461b3fbf33dcd4b6eab4d4dbc6a96fca92d205b Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 1 Aug 2024 12:33:52 -0500 Subject: [PATCH 08/98] Enable RuntimeIdentifier in debug mode --- ProjectHeads/Head.WinAppSdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectHeads/Head.WinAppSdk.props b/ProjectHeads/Head.WinAppSdk.props index 4d8a7403..eb8d7476 100644 --- a/ProjectHeads/Head.WinAppSdk.props +++ b/ProjectHeads/Head.WinAppSdk.props @@ -14,7 +14,7 @@ - + win-$(Platform) win10-$(Platform) From 54f6314a1d60cd7a320a6d6bd9faa9d7288ca6b9 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 2 Aug 2024 13:17:48 -0500 Subject: [PATCH 09/98] Add net8.0-windows10.0.22621.0 and required flags to Uwp TFMs --- MultiTarget/AvailableTargetFrameworks.props | 2 +- MultiTarget/EnabledTargetFrameworks.props | 2 +- MultiTarget/MultiTargetIdentifiers.props | 3 +++ ProjectHeads/App.Head.Uwp.props | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/MultiTarget/AvailableTargetFrameworks.props b/MultiTarget/AvailableTargetFrameworks.props index 93b77afb..ead7e059 100644 --- a/MultiTarget/AvailableTargetFrameworks.props +++ b/MultiTarget/AvailableTargetFrameworks.props @@ -1,6 +1,6 @@ - uap10.0.17763 + uap10.0.17763;net8.0-windows10.0.22621.0; net8.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;net6.0-windows10.0.22621.0; net8.0 diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props index 4fd9da63..b06de1bb 100644 --- a/MultiTarget/EnabledTargetFrameworks.props +++ b/MultiTarget/EnabledTargetFrameworks.props @@ -1,6 +1,6 @@ - uap10.0.17763 + uap10.0.17763;net8.0-windows10.0.22621.0; net8.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;net6.0-windows10.0.22621.0; net8.0 diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props index 9faf2208..b78ba1fd 100644 --- a/MultiTarget/MultiTargetIdentifiers.props +++ b/MultiTarget/MultiTargetIdentifiers.props @@ -59,5 +59,8 @@ --> 2 3 + + true + true diff --git a/ProjectHeads/App.Head.Uwp.props b/ProjectHeads/App.Head.Uwp.props index 3a79f60b..1e5bc91c 100644 --- a/ProjectHeads/App.Head.Uwp.props +++ b/ProjectHeads/App.Head.Uwp.props @@ -2,7 +2,7 @@ - $(UwpTargetFramework) + $(UwpTargetFramework.Split(';')[0]) Uwp From d7058804022dbdb105f56ad7072d53505ca5bb2a Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 5 Aug 2024 13:01:09 -0500 Subject: [PATCH 10/98] Fixes to $ExcludeComponents parameter --- Build-Toolkit-Components.ps1 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Build-Toolkit-Components.ps1 b/Build-Toolkit-Components.ps1 index d797d5df..15a139ec 100644 --- a/Build-Toolkit-Components.ps1 +++ b/Build-Toolkit-Components.ps1 @@ -67,7 +67,7 @@ Param ( [Alias("c")] [string[]]$Components = @("all"), - [string[]]$ExcludeComponents, + [string[]]$ExcludeComponents = @(), [string]$DateForVersion = (Get-Date -UFormat %y%m%d), @@ -110,10 +110,6 @@ if ($Components -eq @('all')) { $Components = @('**') } -if ($ExcludeComponents) { - $Components = $Components | Where-Object { $_ -notin $ExcludeComponents } -} - # Check if NupkgOutput is supplied without PreviewVersion if ($NupkgOutput -and -not $PreviewVersion) { throw "PreviewVersion is required when NupkgOutput is supplied." @@ -184,9 +180,14 @@ foreach ($ComponentName in $Components) { foreach ($componentCsproj in Get-ChildItem -Path "$PSScriptRoot/../components/$ComponentName/$ComponentDir/*.csproj") { # Get component name from csproj path $componentPath = Get-Item "$componentCsproj/../../" + $componentName = $($componentPath.BaseName); + + if ($componenName -in $ExcludeComponents) { + continue; + } # Get supported MultiTarget for this component - $supportedMultiTargets = & $PSScriptRoot\MultiTarget\Get-MultiTargets.ps1 -component $($componentPath.BaseName) + $supportedMultiTargets = & $PSScriptRoot\MultiTarget\Get-MultiTargets.ps1 -component $componentName # Flag to check if any of the requested targets are supported by the component $isTargetSupported = $false From 842b05a5f95a4a9706d541f3882279694f920d58 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 5 Aug 2024 13:01:34 -0500 Subject: [PATCH 11/98] Fix IsUwp flag when using multiple TFMs --- MultiTarget/MultiTargetIdentifiers.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props index b78ba1fd..aa1fdfa7 100644 --- a/MultiTarget/MultiTargetIdentifiers.props +++ b/MultiTarget/MultiTargetIdentifiers.props @@ -41,7 +41,7 @@ true true - true + true true true From c5759e839074ed65f02339058ecbf5be28ee470f Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 5 Aug 2024 13:01:52 -0500 Subject: [PATCH 12/98] Declare WindowsSdkPackageVersion on both Wasdk and Uwp --- MultiTarget/WinUI.Extra.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index d27db269..3c84dc2c 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -11,6 +11,7 @@ 10.0.17763.0 10.0.19041.0 + 10.0.22621.37-preview @@ -26,7 +27,6 @@ win-x86;win-x64;win-arm64 win10-x86;win10-x64;win10-arm64 - 10.0.22621.37-preview From 4d335d7400f5dcdd0438c01190173d8bea1cf8df Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 5 Aug 2024 13:02:10 -0500 Subject: [PATCH 13/98] Use preview versions of WinUI 2 and CsWinRT --- MultiTarget/PackageReferences/Uwp.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index 8a7b1729..7bda94cd 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -1,5 +1,6 @@ - + + From 9b94a668206094a8b8e9bd43bcf2a04181e834cb Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 5 Aug 2024 13:02:19 -0500 Subject: [PATCH 14/98] Use preview version of behaviors --- ProjectHeads/App.Head.Uwp.Dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectHeads/App.Head.Uwp.Dependencies.props b/ProjectHeads/App.Head.Uwp.Dependencies.props index 054d587c..c84d0821 100644 --- a/ProjectHeads/App.Head.Uwp.Dependencies.props +++ b/ProjectHeads/App.Head.Uwp.Dependencies.props @@ -3,7 +3,7 @@ - + From a808e65d3327f0c8680817e5588af09e6b24d52e Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 5 Aug 2024 13:08:38 -0500 Subject: [PATCH 15/98] Suppress CA1416 on modern uwp --- MultiTarget/WinUI.Extra.props | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index 3c84dc2c..cbaa45fc 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -38,6 +38,11 @@ $(NoWarn);WMC1006;CS8034; + + + + $(NoWarn);CA1416; + From db6b20dae4e0a806a9841c5dfdeafba6d4cd84ac Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 5 Aug 2024 13:35:10 -0500 Subject: [PATCH 16/98] Fix syntax error --- Build-Toolkit-Gallery.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build-Toolkit-Gallery.ps1 b/Build-Toolkit-Gallery.ps1 index b08abe47..7da45ac3 100644 --- a/Build-Toolkit-Gallery.ps1 +++ b/Build-Toolkit-Gallery.ps1 @@ -51,7 +51,7 @@ Param ( [string[]]$MultiTargets = @('uwp', 'wasdk', 'wasm'), # default settings [ValidateSet('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')] - [string[]]$ExcludeMultiTargets = @() # default settings + [string[]]$ExcludeMultiTargets = @(), # default settings [ValidateSet('all', 'Uwp', 'Wasdk', 'Wasm', 'Tests.Uwp', 'Tests.Wasdk')] [string[]]$Heads = @('Uwp', 'Wasdk', 'Wasm'), From a9f259c82fd774c1de48f586aaf6a0b1f2c8aae7 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 5 Aug 2024 13:58:14 -0500 Subject: [PATCH 17/98] Avoid using anycpu for uwp libraries --- MultiTarget/WinUI.Extra.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index cbaa45fc..76cc213d 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -21,6 +21,10 @@ + + x86;x64;arm64 + + true From 49f9814b13a4c30355fed6e5bf1263c1b9dd3fdc Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 6 Aug 2024 10:56:32 -0500 Subject: [PATCH 18/98] Bump CsWinRT --- MultiTarget/PackageReferences/Uwp.props | 2 +- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index 7bda94cd..f4114921 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -1,6 +1,6 @@ - + diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 1e598248..2e48e82e 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -4,6 +4,6 @@ - + From ca2f72b3bf0f10f8ae6dd65123e2105a302d86f7 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 6 Aug 2024 10:56:45 -0500 Subject: [PATCH 19/98] Only use MSBuild Extras on UAP --- ToolkitComponent.SampleProject.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ToolkitComponent.SampleProject.props b/ToolkitComponent.SampleProject.props index d1c5e023..cb598e4a 100644 --- a/ToolkitComponent.SampleProject.props +++ b/ToolkitComponent.SampleProject.props @@ -6,7 +6,7 @@ - + From 729f096478e6e01bae43411b6da3210e7b118cb4 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 6 Aug 2024 14:00:39 -0500 Subject: [PATCH 20/98] Enabled NoWarn suppression on non-WinUI UWP --- MultiTarget/Library.props | 1 + MultiTarget/NoWarn.props | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 MultiTarget/NoWarn.props diff --git a/MultiTarget/Library.props b/MultiTarget/Library.props index 2967239e..11158154 100644 --- a/MultiTarget/Library.props +++ b/MultiTarget/Library.props @@ -16,6 +16,7 @@ + diff --git a/MultiTarget/NoWarn.props b/MultiTarget/NoWarn.props new file mode 100644 index 00000000..13d65664 --- /dev/null +++ b/MultiTarget/NoWarn.props @@ -0,0 +1,6 @@ + + + + $(NoWarn);CA1416; + + \ No newline at end of file From ed079362c724e19d96b92897a742ca51c1cc5139 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 6 Aug 2024 19:55:09 -0500 Subject: [PATCH 21/98] Bump Microsoft.Windows.CsWinRT --- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 1e598248..e7016a1d 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -4,6 +4,6 @@ - + From 84ae3a8aa792082aab8e8f5a822ca6fa32cc0391 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 7 Aug 2024 18:23:52 -0500 Subject: [PATCH 22/98] Fixed syntax error --- Build-Toolkit-Gallery.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build-Toolkit-Gallery.ps1 b/Build-Toolkit-Gallery.ps1 index b08abe47..7da45ac3 100644 --- a/Build-Toolkit-Gallery.ps1 +++ b/Build-Toolkit-Gallery.ps1 @@ -51,7 +51,7 @@ Param ( [string[]]$MultiTargets = @('uwp', 'wasdk', 'wasm'), # default settings [ValidateSet('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')] - [string[]]$ExcludeMultiTargets = @() # default settings + [string[]]$ExcludeMultiTargets = @(), # default settings [ValidateSet('all', 'Uwp', 'Wasdk', 'Wasm', 'Tests.Uwp', 'Tests.Wasdk')] [string[]]$Heads = @('Uwp', 'Wasdk', 'Wasm'), From 66595f7540615e9ccc6a5c9b75d11e34903e0aee Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 7 Aug 2024 18:34:37 -0500 Subject: [PATCH 23/98] Update to Microsoft.WindowsAppSDK 1.6.240701003-experimental2 --- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index e7016a1d..3b746d05 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -1,6 +1,6 @@ - + From 15e3d1229e929c756dfef15b98aa0b109ceea200 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 8 Aug 2024 19:30:57 -0500 Subject: [PATCH 24/98] Bump CsWinRT and WindowsSdkPackageVersion to latest stable version --- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- MultiTarget/WinUI.Extra.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 3b746d05..1fd1ac47 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -4,6 +4,6 @@ - + diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index d27db269..fdd402a1 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -26,7 +26,7 @@ win-x86;win-x64;win-arm64 win10-x86;win10-x64;win10-arm64 - 10.0.22621.37-preview + 10.0.22621.39 From 127bdc307ac1162d25d8fd52116a38f0e17b0959 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 9 Aug 2024 13:14:55 -0500 Subject: [PATCH 25/98] Add WinAppSDK 1.6 workaround. See https://github.com/CommunityToolkit/Labs-Windows/pull/561#issuecomment-2276971201 --- MultiTarget/WinUI.Extra.props | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index fdd402a1..a72970cc 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -52,4 +52,23 @@ c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll + + + + + + + + + + + From 25c4ea8dc75584d9be4f809af1972ce6d55d3682 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 9 Aug 2024 17:24:12 -0500 Subject: [PATCH 26/98] Revert WindowsSdkPackageVersion to 10.0.22621.37-preview to align with experimental2 --- MultiTarget/WinUI.Extra.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index a72970cc..9858eeb6 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -26,7 +26,7 @@ win-x86;win-x64;win-arm64 win10-x86;win10-x64;win10-arm64 - 10.0.22621.39 + 10.0.22621.37-preview From edda2bedde1766d704129ffe151d2bbb07eaa4d8 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 14 Aug 2024 11:48:14 -0500 Subject: [PATCH 27/98] Update Microsoft.WindowsAppSDK to 1.6.240807006-preview1 --- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 1fd1ac47..4ea8760b 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -1,6 +1,6 @@ - + From 336ef4c2385d8357453f80bffad826ef5a2742ce Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 14 Aug 2024 13:26:04 -0500 Subject: [PATCH 28/98] Update WindowsSdkPackageVersion for Wasdk 1.6 preview1 --- MultiTarget/EnabledTargetFrameworks.props | 10 +++++++--- MultiTarget/WinUI.Extra.props | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props index 4fd9da63..0c842631 100644 --- a/MultiTarget/EnabledTargetFrameworks.props +++ b/MultiTarget/EnabledTargetFrameworks.props @@ -2,10 +2,14 @@ uap10.0.17763 net8.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;net6.0-windows10.0.22621.0; - + net8.0 net8.0 net8.0 + + + + net8.0 @@ -13,7 +17,7 @@ net8.0 - netstandard2.0 - net8.0 + + diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index 9858eeb6..349ad492 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -26,7 +26,7 @@ win-x86;win-x64;win-arm64 win10-x86;win10-x64;win10-arm64 - 10.0.22621.37-preview + 10.0.22621.38 From 236955ceab4947e6c9df8d2493b23e160750078b Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 14 Aug 2024 14:36:06 -0500 Subject: [PATCH 29/98] Update transient WebView2 reference to 1.0.2730-prerelease --- MultiTarget/PackageReferences/WinAppSdk.props | 1 + 1 file changed, 1 insertion(+) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 4ea8760b..c7bac4fb 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -2,6 +2,7 @@ + From 2fcca69f3a1549109d2e2118fb9ea6ba6bb2515c Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 15 Aug 2024 12:05:20 -0500 Subject: [PATCH 30/98] Revert WindowsSdkPackageVersion to 10.0.22621.37-preview for WindowsAppSDK 1.6 Preview1 --- MultiTarget/WinUI.Extra.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index 349ad492..9858eeb6 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -26,7 +26,7 @@ win-x86;win-x64;win-arm64 win10-x86;win10-x64;win10-arm64 - 10.0.22621.38 + 10.0.22621.37-preview From c3d33c3017fdc2c374a22d0a21c142acee3d5988 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 16 Aug 2024 13:03:04 -0500 Subject: [PATCH 31/98] Add partial to resolve CsWinRT1028 --- CommunityToolkit.App.Shared/Converters/StringToUriConverter.cs | 2 +- CommunityToolkit.App.Shared/DocOrSampleTemplateSelector.cs | 2 +- .../Renderers/GeneratedSampleOptionTemplateSelector.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CommunityToolkit.App.Shared/Converters/StringToUriConverter.cs b/CommunityToolkit.App.Shared/Converters/StringToUriConverter.cs index d9aa0f57..5c148d41 100644 --- a/CommunityToolkit.App.Shared/Converters/StringToUriConverter.cs +++ b/CommunityToolkit.App.Shared/Converters/StringToUriConverter.cs @@ -6,7 +6,7 @@ namespace CommunityToolkit.App.Shared.Converters; -public class StringToUriConverter : IValueConverter +public partial class StringToUriConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { diff --git a/CommunityToolkit.App.Shared/DocOrSampleTemplateSelector.cs b/CommunityToolkit.App.Shared/DocOrSampleTemplateSelector.cs index 530ed2bb..bd6d80ad 100644 --- a/CommunityToolkit.App.Shared/DocOrSampleTemplateSelector.cs +++ b/CommunityToolkit.App.Shared/DocOrSampleTemplateSelector.cs @@ -14,7 +14,7 @@ namespace CommunityToolkit.App.Shared; -public class DocOrSampleTemplateSelector : DataTemplateSelector +public partial class DocOrSampleTemplateSelector : DataTemplateSelector { public DataTemplate? Document { get; set; } public DataTemplate? Sample { get; set; } diff --git a/CommunityToolkit.App.Shared/Renderers/GeneratedSampleOptionTemplateSelector.cs b/CommunityToolkit.App.Shared/Renderers/GeneratedSampleOptionTemplateSelector.cs index 7c55f1ba..c42e84d0 100644 --- a/CommunityToolkit.App.Shared/Renderers/GeneratedSampleOptionTemplateSelector.cs +++ b/CommunityToolkit.App.Shared/Renderers/GeneratedSampleOptionTemplateSelector.cs @@ -9,7 +9,7 @@ namespace CommunityToolkit.App.Shared.Renderers; /// /// Selects a sample option template for the provided . /// -internal class GeneratedSampleOptionTemplateSelector : DataTemplateSelector +internal partial class GeneratedSampleOptionTemplateSelector : DataTemplateSelector { public DataTemplate? BoolOptionTemplate { get; set; } From 287689f861bb0cb812ce3523fb99c33092095830 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 16 Aug 2024 13:59:34 -0500 Subject: [PATCH 32/98] Restore default enabled TFMs --- MultiTarget/EnabledTargetFrameworks.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props index 0c842631..ee92d5c9 100644 --- a/MultiTarget/EnabledTargetFrameworks.props +++ b/MultiTarget/EnabledTargetFrameworks.props @@ -17,7 +17,7 @@ net8.0 - - + netstandard2.0 + net8.0 From 4dbd18a0b8167d29ddc71ce0b7c428ed4fc72ca2 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 16 Aug 2024 17:59:38 -0500 Subject: [PATCH 33/98] Reverting 49cb231c9e26fce7627e6491890774b71a9552db. See https://github.com/CommunityToolkit/Tooling-Windows-Submodule/pull/195#discussion_r1720435637 --- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index c7bac4fb..a446d951 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -5,6 +5,6 @@ - + From 456673af08328c59c4ab31c1b8d2312b492fdb52 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 19 Aug 2024 11:39:14 -0500 Subject: [PATCH 34/98] Remove clean task to resolve https://github.com/CommunityToolkit/Windows/pull/457#issuecomment-2294349146 --- Build-Toolkit-Components.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Build-Toolkit-Components.ps1 b/Build-Toolkit-Components.ps1 index d797d5df..c7039679 100644 --- a/Build-Toolkit-Components.ps1 +++ b/Build-Toolkit-Components.ps1 @@ -136,13 +136,13 @@ function Invoke-MSBuildWithBinlog { # Ensure output is relative to $pwd, not to the csproj of each component. $NupkgOutput = (Resolve-Path $NupkgOutput).Path - $msbuildArgs += "-t:Clean,Build,Pack" + $msbuildArgs += "-t:Build,Pack" $msbuildArgs += "/p:PackageOutputPath=$NupkgOutput" $msbuildArgs += "/p:DateForVersion=$DateForVersion" $msbuildArgs += "/p:PreviewVersion=$PreviewVersion" } else { - $msbuildArgs += "-t:Clean,Build" + $msbuildArgs += "-t:Build" } # Add additional properties to the msbuild arguments From bd6ec8a7deb1723a6744307e4e5c3e13cb29f280 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 25 Sep 2024 11:36:37 -0500 Subject: [PATCH 35/98] Package updates and fixes for modern dotnet on uwp --- MultiTarget/AvailableTargetFrameworks.props | 2 +- MultiTarget/EnabledTargetFrameworks.props | 2 +- MultiTarget/MultiTargetIdentifiers.props | 4 ++-- MultiTarget/NoWarn.props | 8 ++++++++ MultiTarget/PackageReferences/Uwp.props | 5 +++-- MultiTarget/WinUI.Extra.props | 6 ++++-- ProjectHeads/App.Head.Uwp.Dependencies.props | 2 +- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/MultiTarget/AvailableTargetFrameworks.props b/MultiTarget/AvailableTargetFrameworks.props index ead7e059..cbd4c04e 100644 --- a/MultiTarget/AvailableTargetFrameworks.props +++ b/MultiTarget/AvailableTargetFrameworks.props @@ -1,6 +1,6 @@ - uap10.0.17763;net8.0-windows10.0.22621.0; + uap10.0.17763;net8.0-windows10.0.26100.0; net8.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;net6.0-windows10.0.22621.0; net8.0 diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props index 9447373a..00b2dc3f 100644 --- a/MultiTarget/EnabledTargetFrameworks.props +++ b/MultiTarget/EnabledTargetFrameworks.props @@ -1,6 +1,6 @@ - uap10.0.17763;net8.0-windows10.0.22621.0; + uap10.0.17763;net8.0-windows10.0.26100.0; net8.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;net6.0-windows10.0.22621.0; net8.0 diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props index aa1fdfa7..c7ff6bb1 100644 --- a/MultiTarget/MultiTargetIdentifiers.props +++ b/MultiTarget/MultiTargetIdentifiers.props @@ -60,7 +60,7 @@ 2 3 - true - true + true + true diff --git a/MultiTarget/NoWarn.props b/MultiTarget/NoWarn.props index 13d65664..8decf90b 100644 --- a/MultiTarget/NoWarn.props +++ b/MultiTarget/NoWarn.props @@ -3,4 +3,12 @@ $(NoWarn);CA1416; + + + + $(NoWarn);CS8305; + \ No newline at end of file diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index f4114921..1ea348f7 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -1,6 +1,7 @@ - - + + + diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index 08eb7fe4..4d9cefc8 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -17,8 +17,7 @@ --> 10.0.17763.0 $(TargetPlatformMinVersion) - 10.0.19041.0 - 10.0.22621.37-preview + 10.0.26100.0 @@ -30,6 +29,9 @@ x86;x64;arm64 + + 10.0.26100.39 + win-x86;win-x64;win-arm64 diff --git a/ProjectHeads/App.Head.Uwp.Dependencies.props b/ProjectHeads/App.Head.Uwp.Dependencies.props index c84d0821..f278b39d 100644 --- a/ProjectHeads/App.Head.Uwp.Dependencies.props +++ b/ProjectHeads/App.Head.Uwp.Dependencies.props @@ -3,7 +3,7 @@ - + From 3268beda87dfae9d56c3fe18d3e35a0f207bee7e Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 18 Nov 2024 14:36:01 -0600 Subject: [PATCH 36/98] Upgrade .NET to 9.0, update config, add TargetFramework. --- .devcontainer/Dockerfile | 7 ++----- .devcontainer/devcontainer.json | 2 +- .github/workflows/build.yml | 2 +- MultiTarget/AvailableTargetFrameworks.props | 22 ++++++++++----------- MultiTarget/DefinedConstants.props | 1 + MultiTarget/EnabledTargetFrameworks.props | 20 +++++++++---------- MultiTarget/MultiTargetIdentifiers.props | 20 +++++++++---------- MultiTarget/PackageReferences/Uno.props | 4 ++-- MultiTarget/WinUI.Extra.props | 1 + global.json | 2 +- 10 files changed, 40 insertions(+), 41 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c8987eb9..6935449f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,8 +1,5 @@ -# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.208.0/containers/dotnet/.devcontainer/base.Dockerfile - -# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal -ARG VARIANT="6.0-bullseye-slim" -FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT} +# See https://github.com/devcontainers/images/tree/main/src/dotnet for image choices +FROM mcr.microsoft.com/vscode/devcontainers/dotnet:9.0 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 ARG NODE_VERSION="none" diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1ff6856c..f616c78f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,7 +7,7 @@ "args": { // Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0 // Append -bullseye or -focal to pin to an OS version. - "VARIANT": "8.0", + "VARIANT": "9.0", // Options "NODE_VERSION": "lts/*" } diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47051943..77214858 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ on: workflow_dispatch: env: - DOTNET_VERSION: ${{ '8.0.x' }} + DOTNET_VERSION: ${{ '9.0.x' }} ENABLE_DIAGNOSTICS: false #COREHOST_TRACE: 1 COREHOST_TRACEFILE: corehosttrace.log diff --git a/MultiTarget/AvailableTargetFrameworks.props b/MultiTarget/AvailableTargetFrameworks.props index 837c10ec..de31f307 100644 --- a/MultiTarget/AvailableTargetFrameworks.props +++ b/MultiTarget/AvailableTargetFrameworks.props @@ -1,23 +1,23 @@ uap10.0.17763 - net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0; + net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0; - net8.0 - net8.0 - net8.0 + net8.0;net9.0; + net8.0;net9.0; + net8.0;net9.0; - net8.0-android34.0 - net8.0-maccatalyst - net8.0-ios + net8.0-android34.0;net9.0-android; + net8.0-maccatalyst;net9.0-maccatalyst; + net8.0-ios;net9.0-ios; - net8.0 - net8.0 - net8.0 + net8.0;net9.0; + net8.0;net9.0; + net8.0;net9.0; netstandard2.0 - net8.0 + net8.0;net9.0; \ No newline at end of file diff --git a/MultiTarget/DefinedConstants.props b/MultiTarget/DefinedConstants.props index 41e955b7..b5c8c2c9 100644 --- a/MultiTarget/DefinedConstants.props +++ b/MultiTarget/DefinedConstants.props @@ -15,6 +15,7 @@ $(DefineConstants);HAS_UNO_SKIA;__SKIA__;WINDOWS_WPF; $(DefineConstants);HAS_UNO_SKIA;__SKIA__;__GTK__; + $(DefineConstants);NET9_0_OR_GREATER $(DefineConstants);NET8_0_OR_GREATER $(DefineConstants);NET7_0_OR_GREATER $(DefineConstants);NET6_0_OR_GREATER diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props index ac1170df..32399cab 100644 --- a/MultiTarget/EnabledTargetFrameworks.props +++ b/MultiTarget/EnabledTargetFrameworks.props @@ -1,23 +1,23 @@ uap10.0.17763 - net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0; - - net8.0 - net8.0 - net8.0 + net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0; + net8.0;net9.0; + net8.0;net9.0; + net8.0;net9.0; + - net8.0 - net8.0 - net8.0 + net8.0;net9.0; + net8.0;net9.0; + net8.0;net9.0; - netstandard2.0 - net8.0 + + net8.0;net9.0; diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props index 9faf2208..839737b9 100644 --- a/MultiTarget/MultiTargetIdentifiers.props +++ b/MultiTarget/MultiTargetIdentifiers.props @@ -29,25 +29,25 @@ true true - true - true + true + true true - true - true + true + true true - true - true + true + true true true true - true - true - true - true + true + true + true + true true diff --git a/MultiTarget/PackageReferences/Uno.props b/MultiTarget/PackageReferences/Uno.props index ab7ec0f3..e9907281 100644 --- a/MultiTarget/PackageReferences/Uno.props +++ b/MultiTarget/PackageReferences/Uno.props @@ -1,13 +1,13 @@ - 5.2.132 + 5.5.66 - + diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index 206362d1..88a471fb 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -23,6 +23,7 @@ + diff --git a/global.json b/global.json index 91187a7c..d413698a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.403", + "version": "9.0.100", "rollForward": "latestFeature" }, "msbuild-sdks": From b1f505601d520ef54d7369c68202e99a6ddbc93b Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 18 Nov 2024 14:59:50 -0600 Subject: [PATCH 37/98] Adjust TargetFramework declaration to support multiple values. --- ProjectHeads/App.Head.Wasm.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectHeads/App.Head.Wasm.props b/ProjectHeads/App.Head.Wasm.props index 86a98d39..3c624396 100644 --- a/ProjectHeads/App.Head.Wasm.props +++ b/ProjectHeads/App.Head.Wasm.props @@ -1,7 +1,7 @@ Exe - $(WasmHeadTargetFramework) + $(WasmHeadTargetFramework.Split(';')[0]) From 89d14cb12982634dd10e8908f5eda63a73a0a81f Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 22 Nov 2024 14:25:13 -0600 Subject: [PATCH 38/98] Update packages, migrate Uno/Wasm to 9.0 --- ...nityToolkit.Tooling.SampleGen.Tests.csproj | 6 +++--- ...munityToolkit.Tooling.TestGen.Tests.csproj | 2 +- MultiTarget/AvailableTargetFrameworks.props | 20 +++++++++---------- MultiTarget/EnabledTargetFrameworks.props | 14 ++++++------- MultiTarget/PackageReferences/Uno.props | 2 +- MultiTarget/PackageReferences/WinAppSdk.props | 2 +- .../Wasm/CommunityToolkit.App.Wasm.csproj | 2 +- .../App.Head.Uno.UI.Dependencies.props | 2 +- ProjectHeads/App.Head.Uwp.Dependencies.props | 4 ++-- ProjectHeads/App.Head.Wasm.props | 15 +++++++------- .../App.Head.WinAppSdk.Dependencies.props | 2 +- ProjectHeads/App.Head.props | 6 +++--- .../Wasm/ProjectTemplate.Wasm.csproj | 2 +- ProjectHeads/Tests.Head.WinAppSdk.props | 2 +- ProjectHeads/Tests.Head.props | 4 ++-- ToolkitComponent.SampleProject.props | 2 +- 16 files changed, 44 insertions(+), 43 deletions(-) diff --git a/CommunityToolkit.Tooling.SampleGen.Tests/CommunityToolkit.Tooling.SampleGen.Tests.csproj b/CommunityToolkit.Tooling.SampleGen.Tests/CommunityToolkit.Tooling.SampleGen.Tests.csproj index a04a5fa1..3dc69337 100644 --- a/CommunityToolkit.Tooling.SampleGen.Tests/CommunityToolkit.Tooling.SampleGen.Tests.csproj +++ b/CommunityToolkit.Tooling.SampleGen.Tests/CommunityToolkit.Tooling.SampleGen.Tests.csproj @@ -9,10 +9,10 @@ - + - - + + diff --git a/CommunityToolkit.Tooling.TestGen.Tests/CommunityToolkit.Tooling.TestGen.Tests.csproj b/CommunityToolkit.Tooling.TestGen.Tests/CommunityToolkit.Tooling.TestGen.Tests.csproj index 42048be6..8c87f398 100644 --- a/CommunityToolkit.Tooling.TestGen.Tests/CommunityToolkit.Tooling.TestGen.Tests.csproj +++ b/CommunityToolkit.Tooling.TestGen.Tests/CommunityToolkit.Tooling.TestGen.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/MultiTarget/AvailableTargetFrameworks.props b/MultiTarget/AvailableTargetFrameworks.props index de31f307..66cfcbc6 100644 --- a/MultiTarget/AvailableTargetFrameworks.props +++ b/MultiTarget/AvailableTargetFrameworks.props @@ -3,21 +3,21 @@ uap10.0.17763 net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0; - net8.0;net9.0; - net8.0;net9.0; - net8.0;net9.0; + net9.0; + net9.0; + net9.0; - net8.0-android34.0;net9.0-android; - net8.0-maccatalyst;net9.0-maccatalyst; - net8.0-ios;net9.0-ios; + net9.0-android; + net9.0-maccatalyst; + net9.0-ios; - net8.0;net9.0; - net8.0;net9.0; - net8.0;net9.0; + net9.0; + net9.0; + net9.0; netstandard2.0 - net8.0;net9.0; + net9.0; \ No newline at end of file diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props index 32399cab..c3898ba2 100644 --- a/MultiTarget/EnabledTargetFrameworks.props +++ b/MultiTarget/EnabledTargetFrameworks.props @@ -3,21 +3,21 @@ uap10.0.17763 net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0; - net8.0;net9.0; - net8.0;net9.0; - net8.0;net9.0; + net9.0; + net9.0; + net9.0; - net8.0;net9.0; - net8.0;net9.0; - net8.0;net9.0; + net9.0; + net9.0; + net9.0; - net8.0;net9.0; + net9.0; diff --git a/MultiTarget/PackageReferences/Uno.props b/MultiTarget/PackageReferences/Uno.props index e9907281..cd6712c1 100644 --- a/MultiTarget/PackageReferences/Uno.props +++ b/MultiTarget/PackageReferences/Uno.props @@ -7,7 +7,7 @@ - + diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props index 8f4fa3b3..286a23e4 100644 --- a/MultiTarget/PackageReferences/WinAppSdk.props +++ b/MultiTarget/PackageReferences/WinAppSdk.props @@ -1,6 +1,6 @@ - + diff --git a/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj b/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj index 1d3a7526..cb846c4d 100644 --- a/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj +++ b/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj @@ -1,4 +1,4 @@ - + true diff --git a/ProjectHeads/App.Head.Uno.UI.Dependencies.props b/ProjectHeads/App.Head.Uno.UI.Dependencies.props index 960a1391..3a4138f3 100644 --- a/ProjectHeads/App.Head.Uno.UI.Dependencies.props +++ b/ProjectHeads/App.Head.Uno.UI.Dependencies.props @@ -3,7 +3,7 @@ - + diff --git a/ProjectHeads/App.Head.Uwp.Dependencies.props b/ProjectHeads/App.Head.Uwp.Dependencies.props index 054d587c..0e6fe232 100644 --- a/ProjectHeads/App.Head.Uwp.Dependencies.props +++ b/ProjectHeads/App.Head.Uwp.Dependencies.props @@ -2,8 +2,8 @@ - + - + diff --git a/ProjectHeads/App.Head.Wasm.props b/ProjectHeads/App.Head.Wasm.props index 3c624396..f3ad1930 100644 --- a/ProjectHeads/App.Head.Wasm.props +++ b/ProjectHeads/App.Head.Wasm.props @@ -59,13 +59,14 @@ - - - - - - - + + + + + + + + diff --git a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props index 154d4526..906e6996 100644 --- a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props +++ b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props @@ -2,7 +2,7 @@ - + diff --git a/ProjectHeads/App.Head.props b/ProjectHeads/App.Head.props index e391661d..f6aae2ba 100644 --- a/ProjectHeads/App.Head.props +++ b/ProjectHeads/App.Head.props @@ -8,13 +8,13 @@ - + - - + + diff --git a/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj b/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj index e0b6be0c..25f62528 100644 --- a/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj +++ b/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj @@ -1,4 +1,4 @@ - + true diff --git a/ProjectHeads/Tests.Head.WinAppSdk.props b/ProjectHeads/Tests.Head.WinAppSdk.props index 7260103d..2e306263 100644 --- a/ProjectHeads/Tests.Head.WinAppSdk.props +++ b/ProjectHeads/Tests.Head.WinAppSdk.props @@ -6,7 +6,7 @@ - + build diff --git a/ProjectHeads/Tests.Head.props b/ProjectHeads/Tests.Head.props index 0dff7352..354c480b 100644 --- a/ProjectHeads/Tests.Head.props +++ b/ProjectHeads/Tests.Head.props @@ -1,8 +1,8 @@ - - + + diff --git a/ToolkitComponent.SampleProject.props b/ToolkitComponent.SampleProject.props index d1c5e023..8b23c767 100644 --- a/ToolkitComponent.SampleProject.props +++ b/ToolkitComponent.SampleProject.props @@ -11,7 +11,7 @@ - + From 0a88074f31fa2e3be8df0d51c555cfdd30e8f998 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 18 Nov 2024 13:06:47 -0600 Subject: [PATCH 39/98] Update uno-check version to 1.27.1 in dotnet-tools.json --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 2817fea9..5a513e11 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "uno.check": { - "version": "1.20.2", + "version": "1.27.1", "commands": [ "uno-check" ] From eb0c0ebb927decf626846b46f4d0464f448d6d76 Mon Sep 17 00:00:00 2001 From: Arlo Date: Mon, 25 Nov 2024 17:29:08 -0600 Subject: [PATCH 40/98] Fixed version number for CommunityToolkit.WinUI.UI.Controls.Markdown --- ProjectHeads/App.Head.WinAppSdk.Dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props index 906e6996..154d4526 100644 --- a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props +++ b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props @@ -2,7 +2,7 @@ - + From 4f12e8067da05c7e884a06b558704b2f59d93ad4 Mon Sep 17 00:00:00 2001 From: Arlo Date: Mon, 25 Nov 2024 17:29:28 -0600 Subject: [PATCH 41/98] Align versions for Uno.Microsoft.Xaml.Behaviors.Uwp.Managed --- ProjectHeads/App.Head.Uno.UI.Dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectHeads/App.Head.Uno.UI.Dependencies.props b/ProjectHeads/App.Head.Uno.UI.Dependencies.props index 3a4138f3..5619bec9 100644 --- a/ProjectHeads/App.Head.Uno.UI.Dependencies.props +++ b/ProjectHeads/App.Head.Uno.UI.Dependencies.props @@ -3,7 +3,7 @@ - + From 529a23d5e2ddc242d2a1358a1760a6726637c43a Mon Sep 17 00:00:00 2001 From: Arlo Date: Tue, 3 Dec 2024 16:03:37 -0600 Subject: [PATCH 42/98] Upgrade to latest Microsoft.Xaml.Behaviors.Uwp.Managed and Microsoft.UI.Xaml --- .../Pages/GettingStartedPage.xaml | 13 ++++++------- .../Renderers/ToolkitDocumentationRenderer.xaml | 9 ++++----- MultiTarget/PackageReferences/Uwp.props | 3 +-- ProjectHeads/App.Head.Uwp.Dependencies.props | 2 +- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/CommunityToolkit.App.Shared/Pages/GettingStartedPage.xaml b/CommunityToolkit.App.Shared/Pages/GettingStartedPage.xaml index 7da094ae..e8ad1ede 100644 --- a/CommunityToolkit.App.Shared/Pages/GettingStartedPage.xaml +++ b/CommunityToolkit.App.Shared/Pages/GettingStartedPage.xaml @@ -4,7 +4,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:behaviors="using:CommunityToolkit.App.Shared.Behaviors" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:interactions="using:Microsoft.Xaml.Interactions.Core" xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:local="using:CommunityToolkit.App.Shared" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" @@ -104,9 +103,9 @@ - + - + @@ -141,9 +140,9 @@ - + - + diff --git a/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml b/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml index f08262c1..ad3161af 100644 --- a/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml +++ b/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml @@ -5,7 +5,6 @@ xmlns:behaviors="using:CommunityToolkit.App.Shared.Behaviors" xmlns:converters="using:CommunityToolkit.WinUI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:interactions="using:Microsoft.Xaml.Interactions.Core" xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:local="using:CommunityToolkit.App.Shared" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" @@ -216,9 +215,9 @@ Text="API doc" /> - + - + --> diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index 1ea348f7..753e1a8d 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -1,7 +1,6 @@ - + - diff --git a/ProjectHeads/App.Head.Uwp.Dependencies.props b/ProjectHeads/App.Head.Uwp.Dependencies.props index f278b39d..42070aa6 100644 --- a/ProjectHeads/App.Head.Uwp.Dependencies.props +++ b/ProjectHeads/App.Head.Uwp.Dependencies.props @@ -3,7 +3,7 @@ - + From 697dcb63f68db2bf3f37b79b0a76b2783d71fb14 Mon Sep 17 00:00:00 2001 From: Arlo Date: Tue, 3 Dec 2024 18:36:14 -0600 Subject: [PATCH 43/98] Update MultiTarget/WinUI.Extra.props --- MultiTarget/WinUI.Extra.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index 7d5c28fa..a5a0f839 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -30,7 +30,7 @@ x86;x64;arm64 - 10.0.26100.39 + 10.0.26100.54 win-x86;win-x64;win-arm64 From 1c05f6a3eb7287ddf34b3836cb949e2848cf6282 Mon Sep 17 00:00:00 2001 From: Arlo Date: Tue, 3 Dec 2024 18:40:03 -0600 Subject: [PATCH 44/98] Update MultiTarget/NoWarn.props --- MultiTarget/NoWarn.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/NoWarn.props b/MultiTarget/NoWarn.props index 8decf90b..eedf693b 100644 --- a/MultiTarget/NoWarn.props +++ b/MultiTarget/NoWarn.props @@ -1,7 +1,7 @@ - $(NoWarn);CA1416; + $(NoWarn);CA1416;NETSDK1219; - + diff --git a/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props b/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props index 0d911d78..ed26f4fd 100644 --- a/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props +++ b/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props @@ -3,6 +3,6 @@ - + From 0ddbd1b02c7ebe9cd33732c4bf318f654fb440b5 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 4 Dec 2024 15:26:11 -0600 Subject: [PATCH 49/98] Merge --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 91187a7c..27a18775 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.403", + "version": "9.0.101", "rollForward": "latestFeature" }, "msbuild-sdks": From 2522bb38799e46eaf05c254012b52e54a8bdb1b4 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 4 Dec 2024 15:28:26 -0600 Subject: [PATCH 50/98] Remove hardcoded dotnet installation path, enable net9.0 from container --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d70be516..77214858 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,6 @@ on: env: DOTNET_VERSION: ${{ '9.0.x' }} - DOTNET_INSTALL_DIR: dotnet-install - DOTNET_ROOT: dotnet-install ENABLE_DIAGNOSTICS: false #COREHOST_TRACE: 1 COREHOST_TRACEFILE: corehosttrace.log From fd7999b57afc157f355f8fb5c93c42d4ac975977 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 4 Dec 2024 17:08:42 -0600 Subject: [PATCH 51/98] Align single-component sln generation script with capabilities of gallery sln generation script --- ProjectHeads/GenerateSingleSampleHeads.ps1 | 122 +++++++++++++++--- .../Package.appxmanifest | 0 .../ProjectTemplate.Tests.Wasdk.csproj} | 0 .../Properties/launchSettings.json | 0 .../app.manifest | 0 .../{WinAppSdk => Wasdk}/Package.appxmanifest | 0 .../ProjectTemplate.Wasdk.csproj} | 0 .../Properties/launchSettings.json | 0 .../{WinAppSdk => Wasdk}/app.manifest | 0 9 files changed, 103 insertions(+), 19 deletions(-) rename ProjectHeads/SingleComponent/{Tests.WinAppSdk => Tests.Wasdk}/Package.appxmanifest (100%) rename ProjectHeads/SingleComponent/{Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj => Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj} (100%) rename ProjectHeads/SingleComponent/{Tests.WinAppSdk => Tests.Wasdk}/Properties/launchSettings.json (100%) rename ProjectHeads/SingleComponent/{Tests.WinAppSdk => Tests.Wasdk}/app.manifest (100%) rename ProjectHeads/SingleComponent/{WinAppSdk => Wasdk}/Package.appxmanifest (100%) rename ProjectHeads/SingleComponent/{WinAppSdk/ProjectTemplate.WinAppSdk.csproj => Wasdk/ProjectTemplate.Wasdk.csproj} (100%) rename ProjectHeads/SingleComponent/{WinAppSdk => Wasdk}/Properties/launchSettings.json (100%) rename ProjectHeads/SingleComponent/{WinAppSdk => Wasdk}/app.manifest (100%) diff --git a/ProjectHeads/GenerateSingleSampleHeads.ps1 b/ProjectHeads/GenerateSingleSampleHeads.ps1 index 27747753..eba7a798 100644 --- a/ProjectHeads/GenerateSingleSampleHeads.ps1 +++ b/ProjectHeads/GenerateSingleSampleHeads.ps1 @@ -1,30 +1,48 @@ <# .SYNOPSIS Uses the dotnet template tool to copy and rename project heads to run sample code for different platforms. + .DESCRIPTION This is used to centralize configuration and reduce duplication of copying these heads for every project. - This script also generates a solution for the project and will open Visual Studio. + .PARAMETER componentPath Folder for the project to copy the project heads to. -.PARAMETER heads - Which heads to include to copy, defaults to all. (Currently ignored.) + +.PARAMETER MultiTargets + Specifies the MultiTarget TFM(s) to include for building the components. The default value is 'all'. + +.PARAMETER ExcludeMultiTargets + Specifies the MultiTarget TFM(s) to exclude for building the components. The default value excludes targets that require additional tooling or workloads to build. Run uno-check to install the required workloads. + +.PARAMETER WinUIMajorVersion + Specifies the WinUI major version to use when building an Uno head. Also decides the package id and dependency variant. The default value is '2'. + .PARAMETER UseDiagnostics Add extra diagnostic output to running slngen, such as a binlog, etc... + .EXAMPLE C:\PS> .\GenerateSingleSampleHeads -componentPath components\testproj Builds project heads for component in testproj directory. + .NOTES Author: Windows Community Toolkit Labs Team Date: Feb 9, 2023 #> Param ( + [ValidateSet('all', 'wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android')] + [Alias("mt")] + [string[]]$MultiTargets = @('uwp', 'wasm', 'wasdk'), + + [ValidateSet('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')] + [string[]]$ExcludeMultiTargets = @(), # default settings + + [Alias("winui")] + [int]$WinUIMajorVersion = 2, + [Parameter(HelpMessage = "The path to the containing folder for a component where sample heads should be generated.")] [string]$componentPath, - [Parameter(HelpMessage = "The heads that should be generated. If excluded, all heads will be generated. (Currently Ignored)")] - [string[]]$heads = @("uwp", "wasm", "winappsdk", "tests.uwp", "tests.winappsdk"), - [Parameter(HelpMessage = "Add extra diagnostic output to slngen generator.")] [switch]$UseDiagnostics = $false ) @@ -39,11 +57,55 @@ if ($null -ne $Env:Path -and $Env:Path.ToLower().Contains("msbuild") -eq $false) Exit } +# If componentPath is not provided or is an empty string, use the $PSScriptRoot +if ($null -eq $componentPath -or $componentPath -eq '') +{ + $componentPath = $pwd +} + +# Multitarget handling +# ----------------- + +if ($MultiTargets.Contains('all')) { + $MultiTargets = @('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android') +} + +if ($null -eq $ExcludeMultiTargets) +{ + $ExcludeMultiTargets = @() +} + +# Both uwp and wasdk share a targetframework. Both cannot be enabled at once. +# If both are supplied, remove one based on WinUIMajorVersion. +if ($MultiTargets.Contains('uwp') -and $MultiTargets.Contains('wasdk')) +{ + if ($WinUIMajorVersion -eq 2) + { + $ExcludeMultiTargets = $ExcludeMultiTargets + 'wasdk' + } + else + { + $ExcludeMultiTargets = $ExcludeMultiTargets + 'uwp' + } +} + +$MultiTargets = $MultiTargets | Where-Object { $_ -notin $ExcludeMultiTargets } +$ExcludeMultiTargets = $ExcludeMultiTargets | Where-Object { $_ -notin $MultiTargets } + +# Generate required props for preferences +& $PSScriptRoot/../MultiTarget/UseTargetFrameworks.ps1 -MultiTargets $MultiTargets +& $PSScriptRoot/../MultiTarget/UseUnoWinUI.ps1 $WinUIMajorVersion + +# Head generation +# ----------------- + $headsFolderName = "heads" $componentName = (Get-Item $componentPath -ErrorAction Stop).Name +$outputHeadsDir = "$componentPath/$headsFolderName"; + # Remove existing heads directory to refresh -Remove-Item -Recurse -Force "$componentPath/$headsFolderName/" -ErrorAction SilentlyContinue; +Remove-Item -Recurse -Force $outputHeadsDir -ErrorAction SilentlyContinue; # Intall our heads as a temporary template dotnet new --install "$PSScriptRoot/SingleComponent" --force @@ -58,9 +120,14 @@ dotnet new ct-tooling-heads -n $componentName -o $headsFolderName # Remove template, as just for script dotnet new --uninstall "$PSScriptRoot/SingleComponent" - # Generate Solution -#------------------ +# ------------------ + +# Projects to include +$projects = [System.Collections.ArrayList]::new() + +# Include all projects in component folder +[void]$projects.Add(".\*\*.*proj") # Install slgnen dotnet tool restore @@ -76,18 +143,35 @@ if (Test-Path -Path $generatedSolutionFilePath) Write-Host "Removed previous solution file" } -# Projects to include -$projects = [System.Collections.ArrayList]::new() - -# Include all projects in component folder -[void]$projects.Add(".\**.*proj") +# Deployable sample gallery heads +# All heads are included by default since they reside in the same folder as the component. +# Remove any heads that are not required for the solution. +# TODO: this handles separate project heads, but won't directly handle the unified Skia head from Uno. +# Once we have that, just do a transform on the csproj filename inside this loop to decide the same csproj for those separate MultiTargets. +foreach ($multitarget in $MultiTargets) { + # capitalize first letter, avoid case sensitivity issues on linux + $csprojFileNamePartForMultiTarget = $multitarget.substring(0,1).ToUpper() + $multitarget.Substring(1).ToLower() + + $path = "$outputHeadsDir\**\*$csprojFileNamePartForMultiTarget.csproj"; + + if (Test-Path $path) { + # iterate the wildcards caught by $path + foreach ($foundItem in Get-ChildItem $path) + { + $projects = $projects + $foundItem.FullName + } + } + else { + Write-Warning "No project head could be found at $path for MultiTarget $multitarget. Skipping." + } +} # Include common dependencies required for solution to build -[void]$projects.Add("..\..\tooling\CommunityToolkit.App.Shared\**\*.*proj") -[void]$projects.Add("..\..\tooling\CommunityToolkit.Tests.Shared\**\*.*proj") -[void]$projects.Add("..\..\tooling\CommunityToolkit.Tooling.SampleGen\*.csproj") -[void]$projects.Add("..\..\tooling\CommunityToolkit.Tooling.TestGen\*.csproj") -[void]$projects.Add("..\..\tooling\CommunityToolkit.Tooling.XamlNamedPropertyRelay\*.csproj") +$projects = $projects + "..\..\tooling\CommunityToolkit.App.Shared\**\*.*proj" +$projects = $projects + "..\..\tooling\CommunityToolkit.Tests.Shared\**\*.*proj" +$projects = $projects + "..\..\tooling\CommunityToolkit.Tooling.SampleGen\*.csproj" +$projects = $projects + "..\..\tooling\CommunityToolkit.Tooling.TestGen\*.csproj" +$projects = $projects + "..\..\tooling\CommunityToolkit.Tooling.XamlNamedPropertyRelay\*.csproj" if ($UseDiagnostics.IsPresent) { diff --git a/ProjectHeads/SingleComponent/Tests.WinAppSdk/Package.appxmanifest b/ProjectHeads/SingleComponent/Tests.Wasdk/Package.appxmanifest similarity index 100% rename from ProjectHeads/SingleComponent/Tests.WinAppSdk/Package.appxmanifest rename to ProjectHeads/SingleComponent/Tests.Wasdk/Package.appxmanifest diff --git a/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj b/ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj similarity index 100% rename from ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj rename to ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj diff --git a/ProjectHeads/SingleComponent/Tests.WinAppSdk/Properties/launchSettings.json b/ProjectHeads/SingleComponent/Tests.Wasdk/Properties/launchSettings.json similarity index 100% rename from ProjectHeads/SingleComponent/Tests.WinAppSdk/Properties/launchSettings.json rename to ProjectHeads/SingleComponent/Tests.Wasdk/Properties/launchSettings.json diff --git a/ProjectHeads/SingleComponent/Tests.WinAppSdk/app.manifest b/ProjectHeads/SingleComponent/Tests.Wasdk/app.manifest similarity index 100% rename from ProjectHeads/SingleComponent/Tests.WinAppSdk/app.manifest rename to ProjectHeads/SingleComponent/Tests.Wasdk/app.manifest diff --git a/ProjectHeads/SingleComponent/WinAppSdk/Package.appxmanifest b/ProjectHeads/SingleComponent/Wasdk/Package.appxmanifest similarity index 100% rename from ProjectHeads/SingleComponent/WinAppSdk/Package.appxmanifest rename to ProjectHeads/SingleComponent/Wasdk/Package.appxmanifest diff --git a/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj b/ProjectHeads/SingleComponent/Wasdk/ProjectTemplate.Wasdk.csproj similarity index 100% rename from ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj rename to ProjectHeads/SingleComponent/Wasdk/ProjectTemplate.Wasdk.csproj diff --git a/ProjectHeads/SingleComponent/WinAppSdk/Properties/launchSettings.json b/ProjectHeads/SingleComponent/Wasdk/Properties/launchSettings.json similarity index 100% rename from ProjectHeads/SingleComponent/WinAppSdk/Properties/launchSettings.json rename to ProjectHeads/SingleComponent/Wasdk/Properties/launchSettings.json diff --git a/ProjectHeads/SingleComponent/WinAppSdk/app.manifest b/ProjectHeads/SingleComponent/Wasdk/app.manifest similarity index 100% rename from ProjectHeads/SingleComponent/WinAppSdk/app.manifest rename to ProjectHeads/SingleComponent/Wasdk/app.manifest From f0aaac175d1ad49126e666f42631f246c9d99309 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 4 Dec 2024 17:08:51 -0600 Subject: [PATCH 52/98] Add temporary workaround for Windows SDK dependency in Uwp.props --- MultiTarget/PackageReferences/Uwp.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index 041dade1..98424b8f 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -2,5 +2,8 @@ + + + From 422fa5440f9974fae34b9656947d22c5efbe0fa5 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 4 Dec 2024 17:08:54 -0600 Subject: [PATCH 53/98] Update comment to clarify purpose of props generation for "All" solution preferences --- GenerateAllSolution.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GenerateAllSolution.ps1 b/GenerateAllSolution.ps1 index f1daf804..2b59293a 100644 --- a/GenerateAllSolution.ps1 +++ b/GenerateAllSolution.ps1 @@ -78,7 +78,7 @@ if ($MultiTargets.Contains('uwp') -and $MultiTargets.Contains('wasdk')) $MultiTargets = $MultiTargets | Where-Object { $_ -notin $ExcludeMultiTargets } -# Generate required props for "All" solution. +# Generate required props for "All" solution preferences. & ./tooling/MultiTarget/GenerateAllProjectReferences.ps1 -MultiTargets $MultiTargets -Components $Components -ExcludeComponents $ExcludeComponents & ./tooling/MultiTarget/UseTargetFrameworks.ps1 -MultiTargets $MultiTargets & ./tooling/MultiTarget/UseUnoWinUI.ps1 $WinUIMajorVersion From 58dd1c5615f575fe2d08717b0787a6313e99f2e6 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 4 Dec 2024 17:57:13 -0600 Subject: [PATCH 54/98] Don't include Microsoft.Windows.SDK.CPP when HasWinUI isn't set --- MultiTarget/PackageReferences/Uwp.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index 98424b8f..e9c0a904 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -4,6 +4,6 @@ - + From f3f18bd099174f03448dd4791f89ca7cd0353d4c Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 4 Dec 2024 18:44:15 -0600 Subject: [PATCH 55/98] Bump CommonUnoPackageVersion from 5.5.66 to 5.5.87 --- MultiTarget/PackageReferences/Uno.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/Uno.props b/MultiTarget/PackageReferences/Uno.props index cd6712c1..4b4a9c04 100644 --- a/MultiTarget/PackageReferences/Uno.props +++ b/MultiTarget/PackageReferences/Uno.props @@ -1,6 +1,6 @@ - 5.5.66 + 5.5.87 From 7625ac54c837e19b33e97c4abd93cecf10d32306 Mon Sep 17 00:00:00 2001 From: Arlo Date: Thu, 5 Dec 2024 16:35:59 -0600 Subject: [PATCH 56/98] Include Microsoft.Windows.SDK.CPP package on both uap* and net*-windows tfms --- MultiTarget/PackageReferences/Uwp.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index e9c0a904..5db80776 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -4,6 +4,6 @@ - + From 9741fe710d779af2341e5af7ef06bfba22db5384 Mon Sep 17 00:00:00 2001 From: Arlo Date: Mon, 9 Dec 2024 20:44:54 -0600 Subject: [PATCH 57/98] Update ProjectHeads/GenerateSingleSampleHeads.ps1 --- ProjectHeads/GenerateSingleSampleHeads.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectHeads/GenerateSingleSampleHeads.ps1 b/ProjectHeads/GenerateSingleSampleHeads.ps1 index eba7a798..77d12e99 100644 --- a/ProjectHeads/GenerateSingleSampleHeads.ps1 +++ b/ProjectHeads/GenerateSingleSampleHeads.ps1 @@ -10,7 +10,7 @@ Folder for the project to copy the project heads to. .PARAMETER MultiTargets - Specifies the MultiTarget TFM(s) to include for building the components. The default value is 'all'. + Specifies the MultiTarget TFM(s) to include for building the components. The default value is 'uwp', 'wasm', 'wasdk'. .PARAMETER ExcludeMultiTargets Specifies the MultiTarget TFM(s) to exclude for building the components. The default value excludes targets that require additional tooling or workloads to build. Run uno-check to install the required workloads. From 9517fee5d05936e55e3cae6c6c49a7ac751edd68 Mon Sep 17 00:00:00 2001 From: Arlo Date: Mon, 9 Dec 2024 20:47:45 -0600 Subject: [PATCH 58/98] Revert removal of comparison values in default EnabledTargetFrameworks --- MultiTarget/EnabledTargetFrameworks.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props index 32d81400..ffad7be3 100644 --- a/MultiTarget/EnabledTargetFrameworks.props +++ b/MultiTarget/EnabledTargetFrameworks.props @@ -17,7 +17,7 @@ net9.0; - - + netstandard2.0 + net9.0; From 218a656261914f654c0d936677fc6617c15f166b Mon Sep 17 00:00:00 2001 From: Arlo Date: Mon, 9 Dec 2024 21:11:18 -0600 Subject: [PATCH 59/98] Disable modern .NET for UWP when building in Visual Studio --- MultiTarget/AvailableTargetFrameworks.props | 4 +++- MultiTarget/EnabledTargetFrameworks.props | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/MultiTarget/AvailableTargetFrameworks.props b/MultiTarget/AvailableTargetFrameworks.props index 6da40358..4078d6b0 100644 --- a/MultiTarget/AvailableTargetFrameworks.props +++ b/MultiTarget/AvailableTargetFrameworks.props @@ -1,6 +1,8 @@ - uap10.0.17763;net8.0-windows10.0.26100.0; + + uap10.0.17763; + uap10.0.17763;net8.0-windows10.0.26100.0; net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0; net9.0; diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props index ffad7be3..0f637231 100644 --- a/MultiTarget/EnabledTargetFrameworks.props +++ b/MultiTarget/EnabledTargetFrameworks.props @@ -1,6 +1,8 @@ - uap10.0.17763;net8.0-windows10.0.26100.0; + + uap10.0.17763; + uap10.0.17763;net8.0-windows10.0.26100.0; net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0; net9.0; From 1ee86f4439476fed5aaeffad4f21bffb4462cc59 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 11 Dec 2024 12:19:48 -0600 Subject: [PATCH 60/98] Add condition to only include Microsoft.Windows.SDK.CPP for Windows target framework --- MultiTarget/PackageReferences/Uwp.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index 5db80776..e9c0a904 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -4,6 +4,6 @@ - + From 446aa7597236fbae6158864b5f285c58e7771187 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 11 Dec 2024 12:20:16 -0600 Subject: [PATCH 61/98] Set TargetPlatformVersion based on target framework for improved compatibility --- MultiTarget/WinUI.Extra.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index a21be28e..f269a735 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -17,7 +17,8 @@ --> 10.0.17763.0 $(TargetPlatformMinVersion) - 10.0.26100.0 + 10.0.26100.0 + 10.0.19041.0 From f342a146a5ee5ebf49db1756ae3be164afadd9ae Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 11 Dec 2024 13:01:38 -0600 Subject: [PATCH 62/98] Introduced IsWindowsTfm MultiTargetIdentifier shorthand --- MultiTarget/MultiTargetIdentifiers.props | 3 ++- MultiTarget/NoWarn.props | 2 +- MultiTarget/PackageReferences/Uwp.props | 4 ++-- MultiTarget/WinUI.Extra.props | 10 +++++----- ToolkitComponent.SampleProject.props | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props index 3444d5ad..6a900592 100644 --- a/MultiTarget/MultiTargetIdentifiers.props +++ b/MultiTarget/MultiTargetIdentifiers.props @@ -43,6 +43,7 @@ true true + true true true @@ -60,6 +61,6 @@ 2 3 - true + true diff --git a/MultiTarget/NoWarn.props b/MultiTarget/NoWarn.props index eedf693b..51d14d74 100644 --- a/MultiTarget/NoWarn.props +++ b/MultiTarget/NoWarn.props @@ -1,6 +1,6 @@ - + $(NoWarn);CA1416;NETSDK1219; diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index e9c0a904..4ea08dc3 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -1,9 +1,9 @@ - + - + diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index f269a735..73c2d60a 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -17,8 +17,8 @@ --> 10.0.17763.0 $(TargetPlatformMinVersion) - 10.0.26100.0 - 10.0.19041.0 + 10.0.26100.0 + 10.0.19041.0 @@ -32,8 +32,8 @@ x86;x64;arm64 - 10.0.26100.54 - win-x86;win-x64;win-arm64 + 10.0.26100.54 + win-x86;win-x64;win-arm64 @@ -58,7 +58,7 @@ - + $(NoWarn);CA1416; diff --git a/ToolkitComponent.SampleProject.props b/ToolkitComponent.SampleProject.props index 8b461c8c..80475c3a 100644 --- a/ToolkitComponent.SampleProject.props +++ b/ToolkitComponent.SampleProject.props @@ -6,7 +6,7 @@ - + From 3a181acd6e99512d9c19c8f6576e5e129bde2b5f Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 11 Dec 2024 13:12:47 -0600 Subject: [PATCH 63/98] Introduce TargetPlatformIdentifier property for value comparisons --- MultiTarget/MultiTargetIdentifiers.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props index 6a900592..b283a29d 100644 --- a/MultiTarget/MultiTargetIdentifiers.props +++ b/MultiTarget/MultiTargetIdentifiers.props @@ -43,7 +43,8 @@ true true - true + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + true true true From c0d535d20494566b135b8f527e98d0b7b918ecbc Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 11 Dec 2024 14:18:36 -0600 Subject: [PATCH 64/98] Use custom property instead of TargetPlatformIdentifier to avoid SDK conflicts --- MultiTarget/MultiTargetIdentifiers.props | 9 ++++++--- MultiTarget/NoWarn.props | 2 +- MultiTarget/PackageReferences/Uwp.props | 4 ++-- ProjectHeads/Head.Uwp.props | 1 + ProjectHeads/Head.WinAppSdk.props | 1 + 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props index b283a29d..14c5edbf 100644 --- a/MultiTarget/MultiTargetIdentifiers.props +++ b/MultiTarget/MultiTargetIdentifiers.props @@ -43,8 +43,11 @@ true true - $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) - true + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + + + true true true @@ -62,6 +65,6 @@ 2 3 - true + true diff --git a/MultiTarget/NoWarn.props b/MultiTarget/NoWarn.props index 51d14d74..e4df2dd3 100644 --- a/MultiTarget/NoWarn.props +++ b/MultiTarget/NoWarn.props @@ -1,6 +1,6 @@ - + $(NoWarn);CA1416;NETSDK1219; diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index 4ea08dc3..6de38236 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -1,9 +1,9 @@ - + - + diff --git a/ProjectHeads/Head.Uwp.props b/ProjectHeads/Head.Uwp.props index 55d631b2..8a11d531 100644 --- a/ProjectHeads/Head.Uwp.props +++ b/ProjectHeads/Head.Uwp.props @@ -13,6 +13,7 @@ Properties en-US UAP + $(TargetPlatformIdentifier) 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/ProjectHeads/Head.WinAppSdk.props b/ProjectHeads/Head.WinAppSdk.props index 76c28338..24d62bd0 100644 --- a/ProjectHeads/Head.WinAppSdk.props +++ b/ProjectHeads/Head.WinAppSdk.props @@ -5,6 +5,7 @@ x86;x64;arm64 win-$(Platform).pubxml true + windows true true true From 35b9e397a04ab7641be8b4a527e1cb59bedfee24 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 11 Dec 2024 14:29:03 -0600 Subject: [PATCH 65/98] Removal of IsWindowsTfm bool in favor of value checks on MultiTargetPlatformIdentifier --- MultiTarget/MultiTargetIdentifiers.props | 3 --- MultiTarget/WinUI.Extra.props | 10 +++++----- ToolkitComponent.SampleProject.props | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props index 14c5edbf..632d23e6 100644 --- a/MultiTarget/MultiTargetIdentifiers.props +++ b/MultiTarget/MultiTargetIdentifiers.props @@ -46,9 +46,6 @@ $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) - - true - true true true diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index 73c2d60a..cc85306c 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -17,8 +17,8 @@ --> 10.0.17763.0 $(TargetPlatformMinVersion) - 10.0.26100.0 - 10.0.19041.0 + 10.0.26100.0 + 10.0.19041.0 @@ -32,8 +32,8 @@ x86;x64;arm64 - 10.0.26100.54 - win-x86;win-x64;win-arm64 + 10.0.26100.54 + win-x86;win-x64;win-arm64 @@ -58,7 +58,7 @@ - + $(NoWarn);CA1416; diff --git a/ToolkitComponent.SampleProject.props b/ToolkitComponent.SampleProject.props index 80475c3a..43095c9c 100644 --- a/ToolkitComponent.SampleProject.props +++ b/ToolkitComponent.SampleProject.props @@ -6,7 +6,7 @@ - + From 00974a23e961fe0f2e309fa38c87a27654e161b0 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 11 Dec 2024 14:48:22 -0600 Subject: [PATCH 66/98] Fixed declaration order for MultiTargetPlatformIdentifier definition and props files which use it --- ProjectHeads/Head.Uwp.props | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ProjectHeads/Head.Uwp.props b/ProjectHeads/Head.Uwp.props index 8a11d531..5ac67e63 100644 --- a/ProjectHeads/Head.Uwp.props +++ b/ProjectHeads/Head.Uwp.props @@ -1,4 +1,15 @@ + + + UAP + $(TargetPlatformIdentifier) + + + @@ -12,8 +23,6 @@ AppContainerExe Properties en-US - UAP - $(TargetPlatformIdentifier) 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} From 8b58455f2e953fe3d9a4aaee510cc0794760c7ee Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 11 Dec 2024 15:12:09 -0600 Subject: [PATCH 67/98] Restrict reference to Microsoft.Windows.SDK.CPP to non-head projects. --- MultiTarget/PackageReferences/Uwp.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index 6de38236..3ce76cc4 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -4,6 +4,6 @@ - + From 7fae1c0fa15cfde0b1ed768c0f696e91dec98930 Mon Sep 17 00:00:00 2001 From: Arlo Date: Thu, 12 Dec 2024 15:53:09 -0600 Subject: [PATCH 68/98] Fix conditional PackageReference being ignored VS by moving into dedicated files. --- MultiTarget/PackageReferences/Uwp.props | 9 ++------- .../PackageReferences/Uwp/Microsoft.UI.Xaml.props | 13 +++++++++++++ .../Uwp/Microsoft.Windows.CsWinRT.props | 13 +++++++++++++ .../Uwp/Microsoft.Windows.SDK.CPP.props | 13 +++++++++++++ 4 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props create mode 100644 MultiTarget/PackageReferences/Uwp/Microsoft.Windows.CsWinRT.props create mode 100644 MultiTarget/PackageReferences/Uwp/Microsoft.Windows.SDK.CPP.props diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props index 3ce76cc4..2e4723a0 100644 --- a/MultiTarget/PackageReferences/Uwp.props +++ b/MultiTarget/PackageReferences/Uwp.props @@ -1,9 +1,4 @@ - - - - - - - + + diff --git a/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props new file mode 100644 index 00000000..d121346f --- /dev/null +++ b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.CsWinRT.props b/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.CsWinRT.props new file mode 100644 index 00000000..5b049977 --- /dev/null +++ b/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.CsWinRT.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.SDK.CPP.props b/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.SDK.CPP.props new file mode 100644 index 00000000..9e522d20 --- /dev/null +++ b/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.SDK.CPP.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file From 8d56d3fc445f1302a2e1c0921462becd37a3aacf Mon Sep 17 00:00:00 2001 From: Arlo Date: Thu, 12 Dec 2024 15:56:47 -0600 Subject: [PATCH 69/98] Only use Microsoft.Windows.SDK.CPP on modern .NET --- .../PackageReferences/Uwp/Microsoft.Windows.SDK.CPP.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.SDK.CPP.props b/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.SDK.CPP.props index 9e522d20..bbc2d192 100644 --- a/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.SDK.CPP.props +++ b/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.SDK.CPP.props @@ -2,7 +2,7 @@ - + From 5c0d0742d451f84070842c59407e75a17abfc099 Mon Sep 17 00:00:00 2001 From: Arlo Date: Thu, 12 Dec 2024 16:57:34 -0600 Subject: [PATCH 70/98] Fixed .NET 9 auto-discovery of custom build asset wwwroot/index.html conflicting with Uno Bootstrapper version --- ProjectHeads/App.Head.Wasm.props | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ProjectHeads/App.Head.Wasm.props b/ProjectHeads/App.Head.Wasm.props index f3ad1930..47aecaa8 100644 --- a/ProjectHeads/App.Head.Wasm.props +++ b/ProjectHeads/App.Head.Wasm.props @@ -36,6 +36,11 @@ true + + + + + @@ -66,7 +71,6 @@ - From 4fac683906a559a36e27727d144b54df4f522895 Mon Sep 17 00:00:00 2001 From: Arlo Date: Thu, 12 Dec 2024 17:22:20 -0600 Subject: [PATCH 71/98] Upgrade Microsoft.Xaml.Behaviors.WinUI.Managed to latest version, remove support for out-of-support net6.0-windows* and net7.0-windows* TFMs. --- MultiTarget/AvailableTargetFrameworks.props | 2 +- MultiTarget/EnabledTargetFrameworks.props | 4 ++-- ProjectHeads/App.Head.WinAppSdk.Dependencies.props | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MultiTarget/AvailableTargetFrameworks.props b/MultiTarget/AvailableTargetFrameworks.props index 4078d6b0..9d9b5869 100644 --- a/MultiTarget/AvailableTargetFrameworks.props +++ b/MultiTarget/AvailableTargetFrameworks.props @@ -3,7 +3,7 @@ uap10.0.17763; uap10.0.17763;net8.0-windows10.0.26100.0; - net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0; + net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0; net9.0; net9.0; diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props index 0f637231..cf823fe4 100644 --- a/MultiTarget/EnabledTargetFrameworks.props +++ b/MultiTarget/EnabledTargetFrameworks.props @@ -3,8 +3,8 @@ uap10.0.17763; uap10.0.17763;net8.0-windows10.0.26100.0; - net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0; - + net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0; + net9.0; net9.0; net9.0; diff --git a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props index 833d010f..2c00820d 100644 --- a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props +++ b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props @@ -3,6 +3,6 @@ - + From 83624f6874a8255cf46afc419cb8da5844de6e89 Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 13 Dec 2024 12:55:24 -0600 Subject: [PATCH 72/98] Add workaround to remove WebView2Loader.dll due to broken reference in Microsoft.Xaml.Behaviors.WinUI.Managed 3.0.0-preview1 --- MultiTarget/WinUI.Extra.props | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index cc85306c..ba1728ac 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -47,6 +47,16 @@ true + + + + <_ExtraPriPayloadFiles Remove="@(_ExtraPriPayloadFiles)" Condition="'%(_ExtraPriPayloadFiles.FileName)%(_ExtraPriPayloadFiles.Extension)' == 'WebView2Loader.dll'"/> + <_AllChildProjectItemsWithTargetPath Remove="@(_AllChildProjectItemsWithTargetPath)" Condition="'%(_AllChildProjectItemsWithTargetPath.FileName)%(_AllChildProjectItemsWithTargetPath.Extension)' == 'WebView2Loader.dll'"/> + + + true From 4115929361ce62959972b526443a9826554402cc Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 13 Dec 2024 18:06:05 -0600 Subject: [PATCH 73/98] Apply suggestions from code review --- MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props | 1 - .../PackageReferences/Uwp/Microsoft.Windows.CsWinRT.props | 1 - 2 files changed, 2 deletions(-) diff --git a/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props index d121346f..b44b7f41 100644 --- a/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props +++ b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props @@ -1,7 +1,6 @@ - diff --git a/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.CsWinRT.props b/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.CsWinRT.props index 5b049977..70bf7535 100644 --- a/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.CsWinRT.props +++ b/MultiTarget/PackageReferences/Uwp/Microsoft.Windows.CsWinRT.props @@ -1,7 +1,6 @@ - From 326cdece8ce90344419fc33b53c381997676d5b1 Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 13 Dec 2024 18:40:32 -0600 Subject: [PATCH 74/98] Update appxrecipe file name with multitarget-aligned project name --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77214858..94be3ffb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -221,7 +221,7 @@ jobs: - name: Run tests in the generated experiment against WinAppSDK id: test-winappsdk - run: vstest.console.exe ./components/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.WinAppSdk.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}WinAppSdk.trx" + run: vstest.console.exe ./components/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.Wasdk.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}WinAppSdk.trx" - name: Create test reports run: | From 6b523cd42660ebf4e8c3febe263221312ade4757 Mon Sep 17 00:00:00 2001 From: Arlo Date: Mon, 16 Dec 2024 14:08:57 -0600 Subject: [PATCH 75/98] Use WinUI version of Uno Behaviors package where needed --- ProjectHeads/App.Head.Uno.WinUI.Dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props b/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props index ed26f4fd..c059de85 100644 --- a/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props +++ b/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props @@ -3,6 +3,6 @@ - + From 5966fddebbd4b3068bdd61fef4164f3bfb10b458 Mon Sep 17 00:00:00 2001 From: Arlo Date: Mon, 16 Dec 2024 16:28:29 -0600 Subject: [PATCH 76/98] Add property group to suppress IL2026 warnings for Uno behaviors --- ProjectHeads/App.Head.Uno.props | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ProjectHeads/App.Head.Uno.props b/ProjectHeads/App.Head.Uno.props index dd40b927..a9f3c604 100644 --- a/ProjectHeads/App.Head.Uno.props +++ b/ProjectHeads/App.Head.Uno.props @@ -6,6 +6,11 @@ + + + + $(NoWarn);IL2026 + - $(NoWarn);IL2026 + $(WarningsNotAsErrors);IL2026 + + + $(NoWarn);Uno0006 + From 602f7d5e882c8d04b6cb78e9216e09f446f05058 Mon Sep 17 00:00:00 2001 From: Arlo Date: Mon, 16 Dec 2024 17:06:03 -0600 Subject: [PATCH 79/98] Convert to file-scoped namespace --- .../Pages/SettingsPage.xaml.cs | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/CommunityToolkit.App.Shared/Pages/SettingsPage.xaml.cs b/CommunityToolkit.App.Shared/Pages/SettingsPage.xaml.cs index 0c3ae26b..16205046 100644 --- a/CommunityToolkit.App.Shared/Pages/SettingsPage.xaml.cs +++ b/CommunityToolkit.App.Shared/Pages/SettingsPage.xaml.cs @@ -4,18 +4,17 @@ using Windows.ApplicationModel; -namespace CommunityToolkit.App.Shared.Pages +namespace CommunityToolkit.App.Shared.Pages; + +/// +/// An empty page that can be used on its own or navigated to within a Frame. +/// +public sealed partial class SettingsPage : Page { - /// - /// An empty page that can be used on its own or navigated to within a Frame. - /// - public sealed partial class SettingsPage : Page - { - public string AppVersion => $"Version {Package.Current.Id.Version.Major}.{Package.Current.Id.Version.Minor}.{Package.Current.Id.Version.Build}"; + public string AppVersion => $"Version {Package.Current.Id.Version.Major}.{Package.Current.Id.Version.Minor}.{Package.Current.Id.Version.Build}"; - public SettingsPage() - { - this.InitializeComponent(); - } + public SettingsPage() + { + this.InitializeComponent(); } } From ce7724f6d8f890049c2525537da8bbdbdb2a06c8 Mon Sep 17 00:00:00 2001 From: Arlo Date: Mon, 16 Dec 2024 19:29:05 -0600 Subject: [PATCH 80/98] Fix test report log file naming in build workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94be3ffb..92c83831 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -221,7 +221,7 @@ jobs: - name: Run tests in the generated experiment against WinAppSDK id: test-winappsdk - run: vstest.console.exe ./components/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.Wasdk.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}WinAppSdk.trx" + run: vstest.console.exe ./components/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.Wasdk.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}Wasdk.trx" - name: Create test reports run: | From bd3950174ae5a5ecec04af4700a49733dd13e4c2 Mon Sep 17 00:00:00 2001 From: Arlo Date: Tue, 17 Dec 2024 12:36:21 -0600 Subject: [PATCH 81/98] Change warning suppression from WarningsNotAsErrors to NoWarn for IL2026 in Uno project properties --- ProjectHeads/App.Head.Uno.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectHeads/App.Head.Uno.props b/ProjectHeads/App.Head.Uno.props index 42f3c2ac..41b9863a 100644 --- a/ProjectHeads/App.Head.Uno.props +++ b/ProjectHeads/App.Head.Uno.props @@ -9,7 +9,7 @@ - $(WarningsNotAsErrors);IL2026 + $(NoWarn);IL2026 + From 63aaf335b66c5ba40b0d94eb54cd35654601703d Mon Sep 17 00:00:00 2001 From: Arlo Date: Tue, 17 Dec 2024 13:49:24 -0600 Subject: [PATCH 90/98] Suppress IL2026 on Wasdk head, Add NoWarn.props import to App.Head.Uno.props and Head.WinAppSdk.props consistent with Uwp --- ProjectHeads/App.Head.Uno.props | 1 + ProjectHeads/Head.WinAppSdk.props | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/ProjectHeads/App.Head.Uno.props b/ProjectHeads/App.Head.Uno.props index 41b9863a..77d60655 100644 --- a/ProjectHeads/App.Head.Uno.props +++ b/ProjectHeads/App.Head.Uno.props @@ -6,6 +6,7 @@ + diff --git a/ProjectHeads/Head.WinAppSdk.props b/ProjectHeads/Head.WinAppSdk.props index 24d62bd0..8df952db 100644 --- a/ProjectHeads/Head.WinAppSdk.props +++ b/ProjectHeads/Head.WinAppSdk.props @@ -15,6 +15,12 @@ + + + + + $(NoWarn);IL2026 + win-$(Platform) From 7a46f49c62fd3daf6e6a9e51c04f1fdf87969a61 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 18 Dec 2024 10:18:53 -0600 Subject: [PATCH 91/98] Update Microsoft.Xaml.Behaviors package references to version 3.0.0-preview2 and remove obsolete WebView2 workaround --- MultiTarget/WinUI.Extra.props | 10 ---------- ProjectHeads/App.Head.Uwp.Dependencies.props | 2 +- ProjectHeads/App.Head.WinAppSdk.Dependencies.props | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index ba1728ac..cc85306c 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -47,16 +47,6 @@ true - - - - <_ExtraPriPayloadFiles Remove="@(_ExtraPriPayloadFiles)" Condition="'%(_ExtraPriPayloadFiles.FileName)%(_ExtraPriPayloadFiles.Extension)' == 'WebView2Loader.dll'"/> - <_AllChildProjectItemsWithTargetPath Remove="@(_AllChildProjectItemsWithTargetPath)" Condition="'%(_AllChildProjectItemsWithTargetPath.FileName)%(_AllChildProjectItemsWithTargetPath.Extension)' == 'WebView2Loader.dll'"/> - - - true diff --git a/ProjectHeads/App.Head.Uwp.Dependencies.props b/ProjectHeads/App.Head.Uwp.Dependencies.props index 0e355f4f..ad6cffa4 100644 --- a/ProjectHeads/App.Head.Uwp.Dependencies.props +++ b/ProjectHeads/App.Head.Uwp.Dependencies.props @@ -3,7 +3,7 @@ - + diff --git a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props index 2c00820d..7849998c 100644 --- a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props +++ b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props @@ -3,6 +3,6 @@ - + From 523a9bdc344b3032bfbc48fbc1b1ef4fcd36cb59 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 18 Dec 2024 10:19:53 -0600 Subject: [PATCH 92/98] Update default enabled TFMs, Wasdk and Uwp can no longer build simultaneously --- MultiTarget/EnabledTargetFrameworks.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props index cf823fe4..93819344 100644 --- a/MultiTarget/EnabledTargetFrameworks.props +++ b/MultiTarget/EnabledTargetFrameworks.props @@ -3,8 +3,8 @@ uap10.0.17763; uap10.0.17763;net8.0-windows10.0.26100.0; - net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0; - + + net9.0; net9.0; net9.0; From c857bb11661358146d8c9acb128989ae181e0920 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 18 Dec 2024 16:17:25 -0600 Subject: [PATCH 93/98] Use stable Microsoft.UI.Xaml on UWP, prerelease on modern .NET --- MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props index b44b7f41..ec70bbca 100644 --- a/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props +++ b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props @@ -1,8 +1,14 @@ - + + + + + + + From 5e6420ec184dd1c11304231869de63858d4cebf3 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 18 Dec 2024 16:24:48 -0600 Subject: [PATCH 94/98] Use only known MultiTargetPlatformIdentifer values --- MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props index ec70bbca..a6e5c2f9 100644 --- a/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props +++ b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props @@ -1,7 +1,7 @@ - + From 12e1957f46851701e4f0106905dc99e508c7c1e4 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 18 Dec 2024 16:37:22 -0600 Subject: [PATCH 95/98] Update rational for conditional MUX reference --- MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props index a6e5c2f9..83bdffc6 100644 --- a/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props +++ b/MultiTarget/PackageReferences/Uwp/Microsoft.UI.Xaml.props @@ -8,7 +8,7 @@ - + From 45f6f8dc131d776283f4f783b19f4052c27989f7 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 18 Dec 2024 16:38:34 -0600 Subject: [PATCH 96/98] Add workaround to prevent Microsoft.VCLibs.Desktop inclusion on UAP --- MultiTarget/WinUI.Extra.props | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index cc85306c..0480fa93 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -29,6 +29,12 @@ + + + false + false + + x86;x64;arm64 From f36651c9efec6680fe22c2f5b16bc47562f4705c Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 18 Dec 2024 18:00:27 -0600 Subject: [PATCH 97/98] Add explicit WebView2 reference to prevent Microsoft.VCLibs.Desktop inclusion on UAP --- .../Uwp/Microsoft.Web.WebView2.props | 13 +++++++++++++ MultiTarget/WinUI.Extra.props | 6 ------ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 MultiTarget/PackageReferences/Uwp/Microsoft.Web.WebView2.props diff --git a/MultiTarget/PackageReferences/Uwp/Microsoft.Web.WebView2.props b/MultiTarget/PackageReferences/Uwp/Microsoft.Web.WebView2.props new file mode 100644 index 00000000..1da0cfb4 --- /dev/null +++ b/MultiTarget/PackageReferences/Uwp/Microsoft.Web.WebView2.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props index 0480fa93..cc85306c 100644 --- a/MultiTarget/WinUI.Extra.props +++ b/MultiTarget/WinUI.Extra.props @@ -29,12 +29,6 @@ - - - false - false - - x86;x64;arm64 From 228d7c5037cf30ee7c6157b696aa44d424940132 Mon Sep 17 00:00:00 2001 From: Arlo Date: Wed, 18 Dec 2024 18:01:44 -0600 Subject: [PATCH 98/98] Add workaround to prevent Microsoft.VCLibs.Desktop inclusion for WebView2 on UAP --- .github/workflows/config/Directory.Build.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/config/Directory.Build.targets b/.github/workflows/config/Directory.Build.targets index b33f4330..5338f226 100644 --- a/.github/workflows/config/Directory.Build.targets +++ b/.github/workflows/config/Directory.Build.targets @@ -1,4 +1,9 @@ + + + + +