From 9e54bb0c2fe2d9b2d388a6d31e83c6062a6f918b Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jun 2024 00:50:13 -0500 Subject: [PATCH 01/22] 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/22] 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/22] 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/22] 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/22] 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/22] 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/22] 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/22] 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 ed079362c724e19d96b92897a742ca51c1cc5139 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 6 Aug 2024 19:55:09 -0500 Subject: [PATCH 09/22] 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 10/22] 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 11/22] 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 12/22] 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 13/22] 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 14/22] 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 15/22] 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 16/22] 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 17/22] 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 18/22] 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 19/22] 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 20/22] 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 21/22] 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 22/22] 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