From 2aefbab95a33fbf2432ff06d1d162f4cd76e78b2 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jul 2023 14:28:38 -0500 Subject: [PATCH 01/48] Upgraded to net7.0 and Uno 5 previews --- components/RivePlayer/src/Dependencies.props | 8 ++++---- global.json | 2 +- tooling | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/RivePlayer/src/Dependencies.props b/components/RivePlayer/src/Dependencies.props index 1740b9bef..0cabd2699 100644 --- a/components/RivePlayer/src/Dependencies.props +++ b/components/RivePlayer/src/Dependencies.props @@ -17,24 +17,24 @@ - + - + - + - + diff --git a/global.json b/global.json index 1ad7848ca..99d28b9c0 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.405", + "version": "7.0.306", "rollForward": "latestFeature" }, "msbuild-sdks": diff --git a/tooling b/tooling index 57bce71ce..b4462248c 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 57bce71cea3e692ae1dac0ba811494345e8954d9 +Subproject commit b4462248cad54f012b1df2432daa1f8a4b4b47e2 From 8e6316baa494f8332140cc6fb0109740750d4c9f Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jul 2023 14:34:54 -0500 Subject: [PATCH 02/48] Update tooling --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index b4462248c..fc6961c33 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit b4462248cad54f012b1df2432daa1f8a4b4b47e2 +Subproject commit fc6961c33724563364a457ff316d7b270737038f From d1eaf0c2d2515039c31fd3295691c49a84882c2c Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jul 2023 15:18:36 -0500 Subject: [PATCH 03/48] Fixes for build errors --- components/AppServices/src/AppServiceHost.cs | 2 ++ components/CanvasView/src/CanvasView.cs | 2 +- tooling | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/AppServices/src/AppServiceHost.cs b/components/AppServices/src/AppServiceHost.cs index f5f7bde28..a3558338d 100644 --- a/components/AppServices/src/AppServiceHost.cs +++ b/components/AppServices/src/AppServiceHost.cs @@ -40,8 +40,10 @@ public abstract class AppServiceHost /// The name of the app service. /// private readonly string _appServiceName; + #pragma warning disable CA1001 private readonly SemaphoreSlim _semaphoreConnection = new(0, 1); private readonly SemaphoreSlim _lockConnection = new(1, 1); + #pragma warning restore CA1001 /// /// diff --git a/components/CanvasView/src/CanvasView.cs b/components/CanvasView/src/CanvasView.cs index 01c4c581a..72f13bd36 100644 --- a/components/CanvasView/src/CanvasView.cs +++ b/components/CanvasView/src/CanvasView.cs @@ -45,7 +45,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element cp.ManipulationDelta += ContentPresenter_ManipulationDelta; } - /// TODO: Do we want to support something else in a custom template?? else if (item is FrameworkElement fe && fe.FindDescendant/GetContentControl?) + // TODO: Do we want to support something else in a custom template?? else if (item is FrameworkElement fe && fe.FindDescendant/GetContentControl?) } protected override void ClearContainerForItemOverride(DependencyObject element, object item) diff --git a/tooling b/tooling index fc6961c33..50f9640c7 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit fc6961c33724563364a457ff316d7b270737038f +Subproject commit 50f9640c733e9bc705c9faefa278a63a612c892a From c4558aad7889d92674655613d52f766d35e58a61 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jul 2023 15:37:37 -0500 Subject: [PATCH 04/48] Remove problematic empty sample project --- .../AppServices/samples/AppServices.Samples.csproj | 8 -------- components/AppServices/samples/MultiTarget.props | 9 --------- 2 files changed, 17 deletions(-) delete mode 100644 components/AppServices/samples/AppServices.Samples.csproj delete mode 100644 components/AppServices/samples/MultiTarget.props diff --git a/components/AppServices/samples/AppServices.Samples.csproj b/components/AppServices/samples/AppServices.Samples.csproj deleted file mode 100644 index 9d6b70dbf..000000000 --- a/components/AppServices/samples/AppServices.Samples.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - AppServices - - - - - diff --git a/components/AppServices/samples/MultiTarget.props b/components/AppServices/samples/MultiTarget.props deleted file mode 100644 index 0c55bf4f7..000000000 --- a/components/AppServices/samples/MultiTarget.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - uwp; - - From 137324e6d041df1a83e71d8f300f6ab16f1f2ee2 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jul 2023 16:12:32 -0500 Subject: [PATCH 05/48] Update tooling --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 50f9640c7..f08fa67d7 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 50f9640c733e9bc705c9faefa278a63a612c892a +Subproject commit f08fa67d7b69f8abd5a366ea0b7288c35da45130 From be4533c9ed5dd12f69cbce347857e3bdb4fceae6 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jul 2023 16:46:22 -0500 Subject: [PATCH 06/48] Update tooling to latest --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index f08fa67d7..44c825380 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit f08fa67d7b69f8abd5a366ea0b7288c35da45130 +Subproject commit 44c825380e48d2132e4cbe70507ee8e26d52773c From 0404035e255318efcc4773824853812a591c780d Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jul 2023 17:31:32 -0500 Subject: [PATCH 07/48] Update tooling --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 44c825380..2ad8167bf 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 44c825380e48d2132e4cbe70507ee8e26d52773c +Subproject commit 2ad8167bfe836afa6157debc3ed767b62fa2724e From 69076df79fe7f4d9a014f59f92ffca34085f1954 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jul 2023 18:32:39 -0500 Subject: [PATCH 08/48] Update editorconfig --- .editorconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 21a441619..95507bd1e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -355,7 +355,6 @@ dotnet_diagnostic.CA2200.severity = warning dotnet_diagnostic.CA2202.severity = warning dotnet_diagnostic.CA2207.severity = warning dotnet_diagnostic.CA2212.severity = warning -dotnet_diagnostic.CA2213.severity = warning dotnet_diagnostic.CA2214.severity = warning dotnet_diagnostic.CA2216.severity = warning dotnet_diagnostic.CA2220.severity = warning @@ -435,3 +434,6 @@ dotnet_diagnostic.IDE0073.severity = warning # Uno platform exposes IDisposable on Storyboard publicly when it should be internal. Ignore this. dotnet_code_quality.CA1001.excluded_type_names_with_derived_types = T:Windows.UI.Xaml.Media.Animation.Storyboard + +# Member owns disposable field +dotnet_diagnostic.CA2213.severity = suggestion From a86ff821b5a0c6e4b9f84f6c55cfef4e1db749a9 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jul 2023 18:37:18 -0500 Subject: [PATCH 09/48] Update tooling --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 2ad8167bf..2eb27ff69 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 2ad8167bfe836afa6157debc3ed767b62fa2724e +Subproject commit 2eb27ff690ef61a069c704d350f08dfa18304001 From 71fb6d5b9b8a245897a559a658a67a01f0ffbf12 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 20 Jul 2023 19:08:52 -0500 Subject: [PATCH 10/48] Set CA2213 to 'None' --- .editorconfig | 2 +- tooling | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 95507bd1e..99b974eda 100644 --- a/.editorconfig +++ b/.editorconfig @@ -436,4 +436,4 @@ dotnet_diagnostic.IDE0073.severity = warning dotnet_code_quality.CA1001.excluded_type_names_with_derived_types = T:Windows.UI.Xaml.Media.Animation.Storyboard # Member owns disposable field -dotnet_diagnostic.CA2213.severity = suggestion +dotnet_diagnostic.CA2213.severity = none diff --git a/tooling b/tooling index 2eb27ff69..f68afaf58 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 2eb27ff690ef61a069c704d350f08dfa18304001 +Subproject commit f68afaf585c5dce9c7734c25c90e962f2c85ba69 From e88f5a5ef10ae07a056acfe8460d90abc8698ce6 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 21 Jul 2023 11:15:25 -0500 Subject: [PATCH 11/48] Set CA1001 to 'none' --- .editorconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 99b974eda..adb487c87 100644 --- a/.editorconfig +++ b/.editorconfig @@ -432,8 +432,6 @@ csharp_style_prefer_extended_property_pattern = true:suggestion # Require file header dotnet_diagnostic.IDE0073.severity = warning -# Uno platform exposes IDisposable on Storyboard publicly when it should be internal. Ignore this. -dotnet_code_quality.CA1001.excluded_type_names_with_derived_types = T:Windows.UI.Xaml.Media.Animation.Storyboard - # Member owns disposable field dotnet_diagnostic.CA2213.severity = none +dotnet_diagnostic.CA1001.severity = none From 4f0bf9824ef27e10300b3ac0d47a83352785a301 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 21 Jul 2023 11:16:17 -0500 Subject: [PATCH 12/48] Update tooling --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index f68afaf58..537cece42 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit f68afaf585c5dce9c7734c25c90e962f2c85ba69 +Subproject commit 537cece424d6ae2ea01bbcfb659388e3ba04238b From 68b7695eb55e0bf0802b12c1a87c60d6148f6ce2 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 21 Jul 2023 12:46:14 -0500 Subject: [PATCH 13/48] Fixed invalid XML comments --- components/StackedNotificationsBehavior/src/Notification.cs | 4 ++-- .../TokenView/src/TokenItem/TokenItemRemovingEventArgs.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/StackedNotificationsBehavior/src/Notification.cs b/components/StackedNotificationsBehavior/src/Notification.cs index c313dd716..bbecd7862 100644 --- a/components/StackedNotificationsBehavior/src/Notification.cs +++ b/components/StackedNotificationsBehavior/src/Notification.cs @@ -7,7 +7,7 @@ namespace CommunityToolkit.Labs.WinUI; /// /// The content of a notification to display in . /// The , , and values will -/// always be applied to the targeted . +/// always be applied to the targeted . /// The , , and values /// will be applied only if set. /// @@ -36,7 +36,7 @@ public class Notification public TimeSpan? Duration { get; set; } /// - /// Gets or sets the type of the to apply consistent status color, icon, + /// Gets or sets the type of the to apply consistent status color, icon, /// and assistive technology settings dependent on the criticality of the notification. /// public MUXC.InfoBarSeverity Severity { get; set; } diff --git a/components/TokenView/src/TokenItem/TokenItemRemovingEventArgs.cs b/components/TokenView/src/TokenItem/TokenItemRemovingEventArgs.cs index f8d0aefa0..da3a5a998 100644 --- a/components/TokenView/src/TokenItem/TokenItemRemovingEventArgs.cs +++ b/components/TokenView/src/TokenItem/TokenItemRemovingEventArgs.cs @@ -10,7 +10,7 @@ public class TokenItemRemovingEventArgs : EventArgs /// Initializes a new instance of the class. /// /// Item being removed. - /// container being closed. + /// container being closed. public TokenItemRemovingEventArgs(object item, TokenItem tokenITem) { Item = item; From 586f641241c5a341ce5a19b3e67cf534c9732b0a Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 21 Jul 2023 13:18:55 -0500 Subject: [PATCH 14/48] Fixed invalid XML comments --- .../src/StackedNotificationsBehavior.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/StackedNotificationsBehavior/src/StackedNotificationsBehavior.cs b/components/StackedNotificationsBehavior/src/StackedNotificationsBehavior.cs index 8a8ffbecf..73ee70890 100644 --- a/components/StackedNotificationsBehavior/src/StackedNotificationsBehavior.cs +++ b/components/StackedNotificationsBehavior/src/StackedNotificationsBehavior.cs @@ -15,7 +15,7 @@ namespace CommunityToolkit.Labs.WinUI; /// -/// A behavior to add the stacked notification support to . +/// A behavior to add the stacked notification support to . /// public class StackedNotificationsBehavior : BehaviorBase { From c5b7ca97addf1b9a88825394f1b197406062b092 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 21 Jul 2023 15:16:30 -0500 Subject: [PATCH 15/48] Fixed invalid xml doc param name --- .../TokenView/src/TokenItem/TokenItemRemovingEventArgs.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/TokenView/src/TokenItem/TokenItemRemovingEventArgs.cs b/components/TokenView/src/TokenItem/TokenItemRemovingEventArgs.cs index da3a5a998..8e4f5cbf4 100644 --- a/components/TokenView/src/TokenItem/TokenItemRemovingEventArgs.cs +++ b/components/TokenView/src/TokenItem/TokenItemRemovingEventArgs.cs @@ -10,11 +10,11 @@ public class TokenItemRemovingEventArgs : EventArgs /// Initializes a new instance of the class. /// /// Item being removed. - /// container being closed. - public TokenItemRemovingEventArgs(object item, TokenItem tokenITem) + /// container being closed. + public TokenItemRemovingEventArgs(object item, TokenItem tokenItem) { Item = item; - TokenItem = tokenITem; + TokenItem = tokenItem; } /// From fa095c7f861ab7a277d56a6b59f8c1d1f46c9eb5 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 21 Jul 2023 15:18:34 -0500 Subject: [PATCH 16/48] Disable CS1572 in Labs --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index adb487c87..f6854dea7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -435,3 +435,6 @@ dotnet_diagnostic.IDE0073.severity = warning # Member owns disposable field dotnet_diagnostic.CA2213.severity = none dotnet_diagnostic.CA1001.severity = none + +# Labs only: XML comment has param tag but no paramater by that name. +dotnet_diagnostic.CS1572.severity = none From d3ffaad97e891908572792d02098510481733432 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 21 Jul 2023 16:43:05 -0500 Subject: [PATCH 17/48] Update tooling --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 537cece42..fb9128a2a 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 537cece424d6ae2ea01bbcfb659388e3ba04238b +Subproject commit fb9128a2a8c31256a53b053bd07293f6e98387dc From 9e08febd9c3d5cb6bc36de24775bce197ed9f53f Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Sat, 22 Jul 2023 11:56:41 -0500 Subject: [PATCH 18/48] Update tooling --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index fb9128a2a..4e34a8dc7 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit fb9128a2a8c31256a53b053bd07293f6e98387dc +Subproject commit 4e34a8dc745d63572c2f142fc6de1b1dc77e4c94 From ea7e0633794ba660daa19f1a15452ade25519603 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 24 Jul 2023 08:14:58 -0500 Subject: [PATCH 19/48] Update uno-check --- .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 985376662..10712b168 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "uno.check": { - "version": "1.10.0", + "version": "1.12.12", "commands": [ "uno-check" ] From 5b36a6407b7429e6a07cf958705ce00d4b3ac68a Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 24 Jul 2023 09:19:32 -0500 Subject: [PATCH 20/48] Update uno-check version --- .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 10712b168..78a89568a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "uno.check": { - "version": "1.12.12", + "version": "1.13.0", "commands": [ "uno-check" ] From 7022eeb133b5b996ded27cf0886a16b0e878426b Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 24 Jul 2023 09:23:16 -0500 Subject: [PATCH 21/48] Update tooling --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 4e34a8dc7..fe3352ba2 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 4e34a8dc745d63572c2f142fc6de1b1dc77e4c94 +Subproject commit fe3352ba2d5ee7fadb76cba24901b8b85f54f23b From 9e33753794519f3c9598febcdeb84d7fd0e845fc Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 24 Jul 2023 12:22:16 -0500 Subject: [PATCH 22/48] Skip vswinworkloads in uno-check --- .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 ca1cb7bca..f31642ddc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,7 +103,7 @@ jobs: run: dotnet tool restore - name: Run Uno Check to Install Dependencies - run: dotnet tool run uno-check --ci --fix --non-interactive --skip wsl --skip androidemulator --verbose + run: dotnet tool run uno-check --ci --fix --non-interactive --skip wsl --skip androidemulator --skip vswinworkloads --verbose - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.3.1 From c66fb1840618a84a8d159fa6ac5b896ff4ea0774 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 1 Aug 2023 13:08:46 -0500 Subject: [PATCH 23/48] Update tooling repo --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index fe3352ba2..6c958edb2 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit fe3352ba2d5ee7fadb76cba24901b8b85f54f23b +Subproject commit 6c958edb213251fbe2ae7b98035bd86348d4b26a From 1210368ccea6cb8374a6601afbbb6ea128be6501 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 2 Aug 2023 16:15:36 -0500 Subject: [PATCH 24/48] Update tooling repo --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 6c958edb2..1fe7460a3 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 6c958edb213251fbe2ae7b98035bd86348d4b26a +Subproject commit 1fe7460a342d76224d1be58dd5022e02ab9d60dc From 07f5f4b9e04d06216b571c8ff85f2b844f04aeec Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 2 Aug 2023 16:27:35 -0500 Subject: [PATCH 25/48] Update tooling submodule --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 1fe7460a3..9e186fdb0 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 1fe7460a342d76224d1be58dd5022e02ab9d60dc +Subproject commit 9e186fdb0535ff0c95897a8a666a09caeab220ff From cdb7c15a67885b41821aa4044f88fab904656d13 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 9 Aug 2023 13:01:09 -0500 Subject: [PATCH 26/48] Update tooling submodule --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 9e186fdb0..026ca8c7c 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 9e186fdb0535ff0c95897a8a666a09caeab220ff +Subproject commit 026ca8c7cf80f61c443c1a55a17419e88a256e8e From f228ad6cbea78e255c25899e84c3f1d258b13f68 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 18 Aug 2023 12:37:46 -0500 Subject: [PATCH 27/48] Updated tooling to latest main --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 026ca8c7c..3e4623ecc 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 026ca8c7cf80f61c443c1a55a17419e88a256e8e +Subproject commit 3e4623ecc9575eb60a7535aae61ea538cde83059 From 4d89f4278e052c335998fe2927d45b9655c18708 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 18 Aug 2023 14:39:12 -0500 Subject: [PATCH 28/48] Use .NET 7.0.100 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 99d28b9c0..852dfb6d2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.306", + "version": "7.0.100", "rollForward": "latestFeature" }, "msbuild-sdks": From cced9d7537921f9383bba8c99a47c93eb7a467a0 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 18 Aug 2023 14:54:33 -0500 Subject: [PATCH 29/48] Use dotnet 7.0.100 in CI --- .github/workflows/build.yml | 2 +- .vscode/settings.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f31642ddc..1ad715169 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ on: workflow_dispatch: env: - DOTNET_VERSION: ${{ '7.0.x' }} + DOTNET_VERSION: ${{ '7.0.100' }} ENABLE_DIAGNOSTICS: false #COREHOST_TRACE: 1 COREHOST_TRACEFILE: corehosttrace.log diff --git a/.vscode/settings.json b/.vscode/settings.json index ebc930a73..45b1618df 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,6 +7,6 @@ "csharp.suppressDotnetInstallWarning": true, "csharp.suppressDotnetRestoreNotification": true, "csharp.semanticHighlighting.enabled": true, - "omnisharp.enableImportCompletion": true, - "omnisharp.enableMsBuildLoadProjectsOnDemand": true + "omnisharp.enableMsBuildLoadProjectsOnDemand": true, + "dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true } \ No newline at end of file From 9ca17336a284ac994324d7bb46e53f736eb5c40d Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 18 Aug 2023 16:02:20 -0500 Subject: [PATCH 30/48] Suppress Uno0001 --- Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Build.props b/Directory.Build.props index 7be5feeb2..766daa63d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -12,6 +12,7 @@ true true + $(NoWarn);Uno0001 From 52efbfd046366a379922b1bbbde19e89a1a1cc65 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 18 Aug 2023 16:38:47 -0500 Subject: [PATCH 31/48] Restore removed files --- components/DataTable/samples/DataTable.Samples.csproj | 8 ++++++++ components/DataTable/src/MultiTarget.props | 9 +++++++++ 2 files changed, 17 insertions(+) create mode 100644 components/DataTable/samples/DataTable.Samples.csproj create mode 100644 components/DataTable/src/MultiTarget.props diff --git a/components/DataTable/samples/DataTable.Samples.csproj b/components/DataTable/samples/DataTable.Samples.csproj new file mode 100644 index 000000000..18398261f --- /dev/null +++ b/components/DataTable/samples/DataTable.Samples.csproj @@ -0,0 +1,8 @@ + + + DataTable + + + + + diff --git a/components/DataTable/src/MultiTarget.props b/components/DataTable/src/MultiTarget.props new file mode 100644 index 000000000..18f6c7c98 --- /dev/null +++ b/components/DataTable/src/MultiTarget.props @@ -0,0 +1,9 @@ + + + + uwp;wasdk; + + From 90d29de79431d654216dcf9b3f81088ffa17a0f8 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 2 Oct 2023 13:39:25 -0500 Subject: [PATCH 32/48] Bump uno-check to latest version --- .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 78a89568a..3967ab0b6 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "uno.check": { - "version": "1.13.0", + "version": "1.15.0", "commands": [ "uno-check" ] From 10ec55b94cbb2f14cd0e6e9b32c2dc0c09f7cd3e Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 2 Oct 2023 13:42:11 -0500 Subject: [PATCH 33/48] Bump tooling to latest main --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 3e4623ecc..1b6a0a61b 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 3e4623ecc9575eb60a7535aae61ea538cde83059 +Subproject commit 1b6a0a61ba5af0112b061bb8de883083094e7684 From d58e1cb8041d00dc2f584c5a73e9a9c8651ad3f2 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 2 Oct 2023 13:56:49 -0500 Subject: [PATCH 34/48] Remove CS1572 suppression --- .editorconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index f6854dea7..adb487c87 100644 --- a/.editorconfig +++ b/.editorconfig @@ -435,6 +435,3 @@ dotnet_diagnostic.IDE0073.severity = warning # Member owns disposable field dotnet_diagnostic.CA2213.severity = none dotnet_diagnostic.CA1001.severity = none - -# Labs only: XML comment has param tag but no paramater by that name. -dotnet_diagnostic.CS1572.severity = none From 92b30f5ffc91b4541ab0283b8fe5a78203f70d9f Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 2 Oct 2023 23:45:41 -0500 Subject: [PATCH 35/48] Update tooling to test fix --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 1b6a0a61b..a71791c9c 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 1b6a0a61ba5af0112b061bb8de883083094e7684 +Subproject commit a71791c9c228a650da30eecbf97e682834f0c8d7 From b36f42a8c00a030ff563178f1e3d8856c05bbae7 Mon Sep 17 00:00:00 2001 From: Arlo Date: Tue, 3 Oct 2023 10:09:19 -0500 Subject: [PATCH 36/48] Update .editorconfig --- .editorconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.editorconfig b/.editorconfig index adb487c87..154e0c867 100644 --- a/.editorconfig +++ b/.editorconfig @@ -433,5 +433,7 @@ csharp_style_prefer_extended_property_pattern = true:suggestion dotnet_diagnostic.IDE0073.severity = warning # Member owns disposable field +# Todo: Clean up suppression of CA1063 and implement IDisposable correctly +# https://github.com/CommunityToolkit/Labs-Windows/issues/443 dotnet_diagnostic.CA2213.severity = none dotnet_diagnostic.CA1001.severity = none From 28e80c91a84e6123c3b5d0913cf843a7a083f6a9 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 3 Oct 2023 10:41:43 -0500 Subject: [PATCH 37/48] Fixes issues with the build script in detecting dump files to upload and analyze --- .github/workflows/build.yml | 42 ++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ad715169..d1127da5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,16 +72,15 @@ jobs: minimum-size: 32GB maximum-size: 32GB disk-root: "C:" - - - name: Configure User-Mode crash dump type + + - name: Enable User-Mode Dumps collecting if: ${{ env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '' }} + shell: powershell run: | - reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /v DumpType /t REG_DWORD /d 2 /f - - - name: Configure User-Mode crash dump folder - if: ${{ env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '' }} - run: | - reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /v DumpFolder /t REG_EXPAND_SZ /d C:\CrashDumps\ /f + New-Item '${{ github.workspace }}\CrashDumps' -Type Directory + Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps' -Name 'DumpFolder' -Type ExpandString -Value '${{ github.workspace }}\CrashDumps' + Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps' -Name 'DumpCount' -Type DWord -Value '10' + Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps' -Name 'DumpType' -Type DWord -Value '2' - name: Install .NET SDK v${{ env.DOTNET_VERSION }} uses: actions/setup-dotnet@v3 @@ -154,7 +153,7 @@ jobs: - name: Run experiment tests against ${{ env.TEST_PLATFORM }} id: test-platform - run: vstest.console.exe ./tooling/**/CommunityToolkit.Tests.${{ env.TEST_PLATFORM }}.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PLATFORM }}.trx" + run: vstest.console.exe ./tooling/**/CommunityToolkit.Tests.${{ env.TEST_PLATFORM }}.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PLATFORM }}.trx" /Blame - name: Create test reports run: | @@ -174,13 +173,28 @@ jobs: with: name: ilc-repro path: ./*.zip - + + # https://github.com/dorny/paths-filter#custom-processing-of-changed-files + - name: Detect If any Dump Files + uses: dorny/paths-filter@v2.11.1 + id: filter + with: + list-files: shell + filters: | + dump: + - added: '${{ github.workspace }}/CrashDumps/*.dmp' - name: Artifact - WER crash dumps - uses: actions/upload-artifact@v2 - if: ${{ (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }} + uses: actions/upload-artifact@v3 + if: ${{ steps.filter.outputs.dump == 'true' && (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }} with: - name: Crash Dumps - path: C:\CrashDumps\* + name: CrashDumps-${{ matrix.platform }} + path: '${{ github.workspace }}/CrashDumps' + + - name: Analyze Dump + if: ${{ steps.filter.outputs.dump == 'true' && (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }} + run: | + dotnet tool install --global dotnet-dump + dotnet-dump analyze ${{ steps.filter.outputs.dump_files }} -c "clrstack" -c "pe -lines" -c "exit" wasm-linux: runs-on: ubuntu-latest From a964b90195bc6b9e6088791807e4b4f4694e51f4 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 3 Oct 2023 11:25:05 -0500 Subject: [PATCH 38/48] Include component icons as library assets --- .../CanvasLayout/samples/CanvasLayout.Samples.csproj | 8 ++++++++ components/CanvasView/samples/CanvasView.Samples.csproj | 8 ++++++++ components/DataTable/samples/DataTable.Samples.csproj | 8 ++++++++ components/MarqueeText/samples/MarqueeText.Samples.csproj | 8 ++++++++ components/RivePlayer/samples/RivePlayer.Samples.csproj | 8 ++++++++ components/RivePlayer/src/Dependencies.props | 8 ++++---- components/Shimmer/samples/Shimmer.Samples.csproj | 4 ++++ components/TokenView/samples/TokenView.Samples.csproj | 8 ++++++++ .../samples/TransitionHelper.Samples.csproj | 8 ++++++++ 9 files changed, 64 insertions(+), 4 deletions(-) diff --git a/components/CanvasLayout/samples/CanvasLayout.Samples.csproj b/components/CanvasLayout/samples/CanvasLayout.Samples.csproj index bd4335bc9..36a4a73f0 100644 --- a/components/CanvasLayout/samples/CanvasLayout.Samples.csproj +++ b/components/CanvasLayout/samples/CanvasLayout.Samples.csproj @@ -5,4 +5,12 @@ + + + + + + PreserveNewest + + diff --git a/components/CanvasView/samples/CanvasView.Samples.csproj b/components/CanvasView/samples/CanvasView.Samples.csproj index 457377ea6..01a2ab517 100644 --- a/components/CanvasView/samples/CanvasView.Samples.csproj +++ b/components/CanvasView/samples/CanvasView.Samples.csproj @@ -5,4 +5,12 @@ + + + + + + PreserveNewest + + diff --git a/components/DataTable/samples/DataTable.Samples.csproj b/components/DataTable/samples/DataTable.Samples.csproj index 18398261f..e1f67072c 100644 --- a/components/DataTable/samples/DataTable.Samples.csproj +++ b/components/DataTable/samples/DataTable.Samples.csproj @@ -5,4 +5,12 @@ + + + + + + PreserveNewest + + diff --git a/components/MarqueeText/samples/MarqueeText.Samples.csproj b/components/MarqueeText/samples/MarqueeText.Samples.csproj index 5d3e7495a..2c28eea29 100644 --- a/components/MarqueeText/samples/MarqueeText.Samples.csproj +++ b/components/MarqueeText/samples/MarqueeText.Samples.csproj @@ -13,4 +13,12 @@ + + + + + + PreserveNewest + + diff --git a/components/RivePlayer/samples/RivePlayer.Samples.csproj b/components/RivePlayer/samples/RivePlayer.Samples.csproj index 5abca8041..f099e85f7 100644 --- a/components/RivePlayer/samples/RivePlayer.Samples.csproj +++ b/components/RivePlayer/samples/RivePlayer.Samples.csproj @@ -11,4 +11,12 @@ + + + + + + PreserveNewest + + diff --git a/components/RivePlayer/src/Dependencies.props b/components/RivePlayer/src/Dependencies.props index 0cabd2699..6c847f517 100644 --- a/components/RivePlayer/src/Dependencies.props +++ b/components/RivePlayer/src/Dependencies.props @@ -17,24 +17,24 @@ - + - + - + - + diff --git a/components/Shimmer/samples/Shimmer.Samples.csproj b/components/Shimmer/samples/Shimmer.Samples.csproj index 79388122e..325f18a23 100644 --- a/components/Shimmer/samples/Shimmer.Samples.csproj +++ b/components/Shimmer/samples/Shimmer.Samples.csproj @@ -7,10 +7,14 @@ + PreserveNewest + + PreserveNewest + \ No newline at end of file diff --git a/components/TokenView/samples/TokenView.Samples.csproj b/components/TokenView/samples/TokenView.Samples.csproj index c7073b3a2..efbf3b1a3 100644 --- a/components/TokenView/samples/TokenView.Samples.csproj +++ b/components/TokenView/samples/TokenView.Samples.csproj @@ -21,4 +21,12 @@ + + + + + + PreserveNewest + + diff --git a/components/TransitionHelper/samples/TransitionHelper.Samples.csproj b/components/TransitionHelper/samples/TransitionHelper.Samples.csproj index 8c74130f0..703710bb6 100644 --- a/components/TransitionHelper/samples/TransitionHelper.Samples.csproj +++ b/components/TransitionHelper/samples/TransitionHelper.Samples.csproj @@ -11,4 +11,12 @@ + + + + + + PreserveNewest + + From 979aebff229a07ba906c3b2c98d82cc7dc8d139f Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 3 Oct 2023 12:09:42 -0500 Subject: [PATCH 39/48] Porting build.yml changes made in main repo See https://github.com/CommunityToolkit/Windows/compare/58cdd5026af7ee1f818af10ccae7672c6d0b005c...125f13c856014d034da5c889dc597fcc3cdf946b --- .github/workflows/build.yml | 66 ++++++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1127da5b..a9ba9d504 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,18 +14,24 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: + merge_group: env: DOTNET_VERSION: ${{ '7.0.100' }} ENABLE_DIAGNOSTICS: false #COREHOST_TRACE: 1 + MSBUILD_VERBOSITY: normal COREHOST_TRACEFILE: corehosttrace.log + IS_MAIN: ${{ github.ref == 'refs/heads/main' }} + IS_PR: ${{ startsWith(github.ref, 'refs/pull/') }} + # Labs components are finalized and released via the CommunityToolkit/Windows repo, not here. + IS_RELEASE: false # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "Xaml-Style-Check" Xaml-Style-Check: - runs-on: windows-latest + runs-on: windows-latest-large # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -61,8 +67,9 @@ jobs: env: MULTI_TARGET_DIRECTORY: tooling/MultiTarget # faux-ternary expression to select which platforms to build for each platform vs. duplicating step below. - TARGET_PLATFORMS: ${{ matrix.platform != 'WinUI3' && 'all' || 'all-uwp' }} + TARGET_PLATFORMS: ${{ matrix.platform != 'WinUI3' && 'all-wasdk' || 'all-uwp' }} TEST_PLATFORM: ${{ matrix.platform != 'WinUI3' && 'UWP' || 'WinAppSdk' }} + VERSION_PROPERTY: ${{ github.ref == 'refs/heads/main' && format('build.{0}', github.run_number) || format('pull-{0}.{1}', github.event.number, github.run_number) }} # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -102,7 +109,15 @@ jobs: run: dotnet tool restore - name: Run Uno Check to Install Dependencies - run: dotnet tool run uno-check --ci --fix --non-interactive --skip wsl --skip androidemulator --skip vswinworkloads --verbose + run: > + dotnet tool run uno-check + --ci + --fix + --non-interactive + --skip wsl + --skip androidemulator + --skip vswinworkloads + --verbose - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.3.1 @@ -116,13 +131,34 @@ jobs: run: powershell -version 5.1 -command "./tooling/GenerateAllSolution.ps1 -IncludeHeads ${{ env.TEST_PLATFORM }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}" -ErrorAction Stop - name: Enable Uno.WinUI (in WinUI3 matrix only) + if: ${{ matrix.platform == 'WinUI3' }} working-directory: ./${{ env.MULTI_TARGET_DIRECTORY }} run: powershell -version 5.1 -command "./UseUnoWinUI.ps1 3" -ErrorAction Stop - if: ${{ matrix.platform == 'WinUI3' }} + + - name: Format Date/Time of Commit for Package Version + if: ${{ env.IS_RELEASE == 'false' }} + run: | + echo "VERSION_DATE=$(git log -1 --format=%cd --date=format:%y%m%d)" >> $env:GITHUB_ENV + # Semver regex: https://regex101.com/r/Ly7O1x/3/ + - name: Format Date/Time of Release Package Version + if: ${{ env.IS_RELEASE == 'true' }} + run: | + $ref = "${{ github.ref }}" + $ref -match "^refs/heads/rel/(?0|[1-9]\d*)\.(?0|[1-9]\d*)\.(?0|[1-9]\d*)(?:-(?(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$" + echo "VERSION_DATE=$($matches['patch'])" >> $env:GITHUB_ENV + echo "VERSION_PROPERTY=$($matches['prerelease'])" >> $env:GITHUB_ENV - name: MSBuild (With diagnostics) if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }} - run: msbuild.exe CommunityToolkit.AllComponents.sln /restore /nowarn:MSB4011 -p:Configuration=Release /bl -v:diag + run: > + msbuild.exe /restore /nowarn:MSB4011 + /p:Configuration=Release + /m + /p:DateForVersion=${{ env.VERSION_DATE }} + /p:PreviewVersion=${{ env.VERSION_PROPERTY }} + ${{ env.ENABLE_DIAGNOSTICS == 'true' && '/bl' || '' }} + /v:${{ env.MSBUILD_VERBOSITY }} + CommunityToolkit.AllComponents.sln - name: MSBuild if: ${{ env.ENABLE_DIAGNOSTICS == 'false' }} @@ -131,16 +167,16 @@ jobs: # Build All Packages - name: pack experiments working-directory: ./tooling/Scripts/ - run: ./PackEachExperiment.ps1 all - - # Push Packages to our DevOps Artifacts Feed - - name: Add source - if: ${{ github.ref == 'refs/heads/main' }} - run: dotnet nuget update source LabsFeed --username dummy --password ${{ secrets.DEVOPS_PACKAGE_PUSH_TOKEN }} - - - name: Push packages - if: ${{ github.ref == 'refs/heads/main' }} - run: dotnet nuget push "**/*.nupkg" --api-key dummy --source LabsFeed --skip-duplicate + run: ./PackEachExperiment.ps1 -extraBuildProperties "${{ env.VERSION_PROPERTY }}" + + # Push Pull Request Packages to our DevOps Artifacts Feed (see nuget.config) + - name: Push Pull Request Packages (if not fork) + if: ${{ env.IS_PR == 'true' && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }} + run: | + dotnet nuget add source https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-PullRequests/nuget/v3/index.json ` + --name PullRequests ` + --username dummy --password ${{ secrets.DEVOPS_PACKAGE_PUSH_TOKEN }} + dotnet nuget push "**/*.nupkg" --api-key dummy --source PullRequests --skip-duplicate # Run tests - name: Setup VSTest Path From 4c6637f977f3c9dcbcecca386d49ff5c544d35dd Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 11 Oct 2023 20:07:15 -0500 Subject: [PATCH 40/48] Cleanup release steps --- .github/workflows/build.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a9ba9d504..48ceece3d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,8 +24,6 @@ env: COREHOST_TRACEFILE: corehosttrace.log IS_MAIN: ${{ github.ref == 'refs/heads/main' }} IS_PR: ${{ startsWith(github.ref, 'refs/pull/') }} - # Labs components are finalized and released via the CommunityToolkit/Windows repo, not here. - IS_RELEASE: false # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -135,27 +133,12 @@ jobs: working-directory: ./${{ env.MULTI_TARGET_DIRECTORY }} run: powershell -version 5.1 -command "./UseUnoWinUI.ps1 3" -ErrorAction Stop - - name: Format Date/Time of Commit for Package Version - if: ${{ env.IS_RELEASE == 'false' }} - run: | - echo "VERSION_DATE=$(git log -1 --format=%cd --date=format:%y%m%d)" >> $env:GITHUB_ENV - # Semver regex: https://regex101.com/r/Ly7O1x/3/ - - name: Format Date/Time of Release Package Version - if: ${{ env.IS_RELEASE == 'true' }} - run: | - $ref = "${{ github.ref }}" - $ref -match "^refs/heads/rel/(?0|[1-9]\d*)\.(?0|[1-9]\d*)\.(?0|[1-9]\d*)(?:-(?(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$" - echo "VERSION_DATE=$($matches['patch'])" >> $env:GITHUB_ENV - echo "VERSION_PROPERTY=$($matches['prerelease'])" >> $env:GITHUB_ENV - - name: MSBuild (With diagnostics) if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }} run: > msbuild.exe /restore /nowarn:MSB4011 /p:Configuration=Release /m - /p:DateForVersion=${{ env.VERSION_DATE }} - /p:PreviewVersion=${{ env.VERSION_PROPERTY }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '/bl' || '' }} /v:${{ env.MSBUILD_VERBOSITY }} CommunityToolkit.AllComponents.sln From 77f997d8bd3d4b788bf5b2c1523596bdcc815eee Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 11 Oct 2023 20:12:38 -0500 Subject: [PATCH 41/48] Restore pushing to LabsFeed --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 48ceece3d..60a710ddb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -161,6 +161,10 @@ jobs: --username dummy --password ${{ secrets.DEVOPS_PACKAGE_PUSH_TOKEN }} dotnet nuget push "**/*.nupkg" --api-key dummy --source PullRequests --skip-duplicate + - name: Push packages + if: ${{ github.ref == 'refs/heads/main' }} + run: dotnet nuget push "**/*.nupkg" --api-key dummy --source LabsFeed --skip-duplicate + # Run tests - name: Setup VSTest Path uses: darenm/Setup-VSTest@v1 From cee03517284c74e893d5b3e75e97509cc38adda3 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 23 Oct 2023 12:36:21 -0500 Subject: [PATCH 42/48] Fixed date versioning for PRs --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60a710ddb..b9dce6108 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -133,6 +133,10 @@ jobs: working-directory: ./${{ env.MULTI_TARGET_DIRECTORY }} run: powershell -version 5.1 -command "./UseUnoWinUI.ps1 3" -ErrorAction Stop + - name: Format Date/Time of Commit for Package Version + run: | + echo "VERSION_DATE=$(git log -1 --format=%cd --date=format:%y%m%d)" >> $env:GITHUB_ENV + - name: MSBuild (With diagnostics) if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }} run: > @@ -150,7 +154,7 @@ jobs: # Build All Packages - name: pack experiments working-directory: ./tooling/Scripts/ - run: ./PackEachExperiment.ps1 -extraBuildProperties "${{ env.VERSION_PROPERTY }}" + run: ./PackEachExperiment.ps1 -date ${{ env.VERSION_DATE }}${{ env.VERSION_PROPERTY != '' && format(' -postfix {0}', env.VERSION_PROPERTY) || '' }} # Push Pull Request Packages to our DevOps Artifacts Feed (see nuget.config) - name: Push Pull Request Packages (if not fork) From 3122ae2a6cd276bcf71911ddc45e95eda739fc45 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 23 Oct 2023 14:50:42 -0500 Subject: [PATCH 43/48] Bump uno-check --- .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 3967ab0b6..c318c9a54 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "uno.check": { - "version": "1.15.0", + "version": "1.16.1", "commands": [ "uno-check" ] From dda9f2c1c8edaf76c67f9dc67fda8afb931018dc Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 24 Oct 2023 14:21:04 -0500 Subject: [PATCH 44/48] Update tooling to latest main --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index a71791c9c..de5c2491c 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit a71791c9c228a650da30eecbf97e682834f0c8d7 +Subproject commit de5c2491ce24ec62af83bdc95e41a35fd2237350 From d434dea1c9ec0eca5c0bff4b604734949cd68b75 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 26 Oct 2023 11:17:55 -0500 Subject: [PATCH 45/48] Fixed missing nuget source config --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b9dce6108..1b3360753 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,6 +156,11 @@ jobs: working-directory: ./tooling/Scripts/ run: ./PackEachExperiment.ps1 -date ${{ env.VERSION_DATE }}${{ env.VERSION_PROPERTY != '' && format(' -postfix {0}', env.VERSION_PROPERTY) || '' }} + # Push Packages to our DevOps Artifacts Feed + - name: Add source + if: ${{ github.ref == 'refs/heads/main' }} + run: dotnet nuget update source LabsFeed --username dummy --password ${{ secrets.DEVOPS_PACKAGE_PUSH_TOKEN }} + # Push Pull Request Packages to our DevOps Artifacts Feed (see nuget.config) - name: Push Pull Request Packages (if not fork) if: ${{ env.IS_PR == 'true' && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }} From 936adb0682e44b11f80e7e7398e2af292eaa985f Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 26 Oct 2023 11:33:46 -0500 Subject: [PATCH 46/48] Additional cleanup --- .github/workflows/build.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b3360753..6aad83a8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -152,17 +152,12 @@ jobs: run: msbuild.exe CommunityToolkit.AllComponents.sln /restore /nowarn:MSB4011 -p:Configuration=Release # Build All Packages - - name: pack experiments + - name: Pack experiments working-directory: ./tooling/Scripts/ run: ./PackEachExperiment.ps1 -date ${{ env.VERSION_DATE }}${{ env.VERSION_PROPERTY != '' && format(' -postfix {0}', env.VERSION_PROPERTY) || '' }} - - # Push Packages to our DevOps Artifacts Feed - - name: Add source - if: ${{ github.ref == 'refs/heads/main' }} - run: dotnet nuget update source LabsFeed --username dummy --password ${{ secrets.DEVOPS_PACKAGE_PUSH_TOKEN }} # Push Pull Request Packages to our DevOps Artifacts Feed (see nuget.config) - - name: Push Pull Request Packages (if not fork) + - name: Push PR packages (if not fork) if: ${{ env.IS_PR == 'true' && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }} run: | dotnet nuget add source https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-PullRequests/nuget/v3/index.json ` @@ -170,9 +165,11 @@ jobs: --username dummy --password ${{ secrets.DEVOPS_PACKAGE_PUSH_TOKEN }} dotnet nuget push "**/*.nupkg" --api-key dummy --source PullRequests --skip-duplicate - - name: Push packages + - name: Push packages (main) if: ${{ github.ref == 'refs/heads/main' }} - run: dotnet nuget push "**/*.nupkg" --api-key dummy --source LabsFeed --skip-duplicate + run: | + dotnet nuget update source LabsFeed --username dummy --password ${{ secrets.DEVOPS_PACKAGE_PUSH_TOKEN }} ` + dotnet nuget push "**/*.nupkg" --api-key dummy --source LabsFeed --skip-duplicate # Run tests - name: Setup VSTest Path From e1cb508f243a8e061087006d6fd69bd99c7bac76 Mon Sep 17 00:00:00 2001 From: "Michael Hawker MSFT (XAML Llama)" <24302614+michael-hawker@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:10:41 -0700 Subject: [PATCH 47/48] Fix line continuation in build.yml Issue introduced in #503 as attempted fix/follow-on to #485 --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6aad83a8c..51a9b3f08 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -168,7 +168,8 @@ jobs: - name: Push packages (main) if: ${{ github.ref == 'refs/heads/main' }} run: | - dotnet nuget update source LabsFeed --username dummy --password ${{ secrets.DEVOPS_PACKAGE_PUSH_TOKEN }} ` + dotnet nuget update source LabsFeed ` + --username dummy --password ${{ secrets.DEVOPS_PACKAGE_PUSH_TOKEN }} dotnet nuget push "**/*.nupkg" --api-key dummy --source LabsFeed --skip-duplicate # Run tests From 4cc0557ac63a40c672b197cac805eafcc356e534 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 27 Oct 2023 15:05:08 -0500 Subject: [PATCH 48/48] Bump dotnet version --- .github/workflows/build.yml | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 51a9b3f08..7f72cd663 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ on: merge_group: env: - DOTNET_VERSION: ${{ '7.0.100' }} + DOTNET_VERSION: ${{ '7.0.402' }} ENABLE_DIAGNOSTICS: false #COREHOST_TRACE: 1 MSBUILD_VERBOSITY: normal diff --git a/global.json b/global.json index 852dfb6d2..2d561b0cd 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.100", + "version": "7.0.402", "rollForward": "latestFeature" }, "msbuild-sdks":