From 9296cf5a22ad484eb5841b9b445a42b285888f56 Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Tue, 2 Apr 2024 09:39:55 -0600 Subject: [PATCH 1/9] ci: re-enable disabled tests (cherry picked from commit 66914fd402d3b6454365352baef54b05a5eedd28) --- build/.azure-pipelines.TemplateValidation.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/build/.azure-pipelines.TemplateValidation.yml b/build/.azure-pipelines.TemplateValidation.yml index a146d85e..bfd48c5a 100644 --- a/build/.azure-pipelines.TemplateValidation.yml +++ b/build/.azure-pipelines.TemplateValidation.yml @@ -79,17 +79,15 @@ jobs: templateArgs: '-preset=recommended -auth=msal -markup csharp' MsalAuthMvvmCSharp: templateArgs: '-preset=recommended -presentation mvvm -auth=msal -markup csharp' - # NOTE: Temporarily disabling so we can merge #585 - # MauiBlank: - # templateArgs: '-preset=blank -maui' - # MauiRecommended: - # templateArgs: '-preset=recommended -maui' + MauiBlank: + templateArgs: '-preset=blank -maui' + MauiRecommended: + templateArgs: '-preset=recommended -maui' ThemeService: templateArgs: '-theme-service' - # NOTE: Temporarily disabling so we can merge #585 # https://github.com/unoplatform/uno.templates/issues/396 - # Issue396: - # templateArgs: '-preset blank -platforms windows -platforms android -presentation none -theme fluent -nav blank -log none -maui -markup csharp' + Issue396: + templateArgs: '-preset blank -platforms windows -platforms android -presentation none -theme fluent -nav blank -log none -maui -markup csharp' # https://github.com/unoplatform/uno.templates/issues/414 Issue414: templateArgs: '-preset recommended -auth msal -markup csharp' From d0b0073ab324f3a2fa55c6c6cec01f200e21434b Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Mon, 8 Apr 2024 09:08:58 -0600 Subject: [PATCH 2/9] chore: exclude windows target on non-windows agents (cherry picked from commit 3fe132751826d5c442d20d862f030303c54ea364) --- .../MyExtensionsApp.1.MauiControls.csproj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj index e0ac3f09..5cec4ecd 100644 --- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj +++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj @@ -5,6 +5,9 @@ enable enable + + + $baseTargetFramework$-windows10.0.19041 $baseTargetFramework$; @@ -18,7 +21,7 @@ $baseTargetFramework$-maccatalyst; - $baseTargetFramework$-windows10.0.19041; + $(TargetFrameworks); From 87c2a8e603c2860b6830f41b6ff7571847859002 Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Mon, 8 Apr 2024 09:10:08 -0600 Subject: [PATCH 3/9] chore: bump Uno.Extensions for MAUI Embedding (cherry picked from commit 0e34ec55e7263716fa9239213f56b4b3fcda3fe3) # Conflicts: # src/Directory.Build.targets --- src/Directory.Build.targets | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index cbde7772..dcb324d6 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -2,11 +2,19 @@ +<<<<<<< HEAD 5.2.7 4.1.1 5.0.1 6.0.2 5.2.0 +======= + 5.2.0-dev.2290 + 4.2.0-dev.13 + 4.2.0-dev.30 + 5.2.0-dev.56 + 5.3.0-dev.11 +>>>>>>> 0e34ec5 (chore: bump Uno.Extensions for MAUI Embedding) 8.0.11 9.0.0-dev.39 1.7.0 From b74718e480c3b897ca1eafd7b663c316fc9b041d Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Tue, 9 Apr 2024 05:37:41 -0600 Subject: [PATCH 4/9] chore: fixing MAUI build (cherry picked from commit e036bd551e76175792491e569528e4ac65fdfdf1) # Conflicts: # src/Directory.Build.targets --- src/Directory.Build.targets | 4 ++++ src/Uno.Templates/content/unoapp/Directory.Packages.props | 4 ++++ .../MyExtensionsApp.1.MauiControls.csproj | 5 +++-- .../content/unomauilib/Directory.Packages.props | 6 ++++++ 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 src/Uno.Templates/content/unomauilib/Directory.Packages.props diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index dcb324d6..ce5aa8da 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -2,6 +2,7 @@ +<<<<<<< HEAD <<<<<<< HEAD 5.2.7 4.1.1 @@ -10,6 +11,9 @@ 5.2.0 ======= 5.2.0-dev.2290 +======= + 5.3.0-dev.111 +>>>>>>> e036bd5 (chore: fixing MAUI build) 4.2.0-dev.13 4.2.0-dev.30 5.2.0-dev.56 diff --git a/src/Uno.Templates/content/unoapp/Directory.Packages.props b/src/Uno.Templates/content/unoapp/Directory.Packages.props index 979f9ab6..15df4c00 100644 --- a/src/Uno.Templates/content/unoapp/Directory.Packages.props +++ b/src/Uno.Templates/content/unoapp/Directory.Packages.props @@ -29,6 +29,10 @@ + + + + $$EnableDeveloperMode_CPM_PackageVersion$$ diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj index 5cec4ecd..5ba86c41 100644 --- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj +++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj @@ -4,6 +4,7 @@ enable enable + true @@ -66,8 +67,8 @@ - - + + diff --git a/src/Uno.Templates/content/unomauilib/Directory.Packages.props b/src/Uno.Templates/content/unomauilib/Directory.Packages.props new file mode 100644 index 00000000..5198e1e4 --- /dev/null +++ b/src/Uno.Templates/content/unomauilib/Directory.Packages.props @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 16857dd17539ff4494c4bebd3e09646cde4f19ff Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Tue, 9 Apr 2024 07:40:15 -0600 Subject: [PATCH 5/9] chore: fixing PackageVersion (cherry picked from commit 751a12d5918f93ca348924bbc458c9adc60f9a35) --- src/Uno.Templates/content/unomauilib/Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Uno.Templates/content/unomauilib/Directory.Packages.props b/src/Uno.Templates/content/unomauilib/Directory.Packages.props index 5198e1e4..5efbf15c 100644 --- a/src/Uno.Templates/content/unomauilib/Directory.Packages.props +++ b/src/Uno.Templates/content/unomauilib/Directory.Packages.props @@ -1,6 +1,6 @@ - - + + \ No newline at end of file From 940fc51fd1da616a3a25fcd6b5b2d463bb9ced7d Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Tue, 9 Apr 2024 08:30:56 -0600 Subject: [PATCH 6/9] chore: resolving merge conflicts --- src/Directory.Build.targets | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index ce5aa8da..a1d0defe 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -2,23 +2,11 @@ -<<<<<<< HEAD -<<<<<<< HEAD - 5.2.7 - 4.1.1 + 5.2.13 + 4.1.2 5.0.1 - 6.0.2 + 6.0.4 5.2.0 -======= - 5.2.0-dev.2290 -======= - 5.3.0-dev.111 ->>>>>>> e036bd5 (chore: fixing MAUI build) - 4.2.0-dev.13 - 4.2.0-dev.30 - 5.2.0-dev.56 - 5.3.0-dev.11 ->>>>>>> 0e34ec5 (chore: bump Uno.Extensions for MAUI Embedding) 8.0.11 9.0.0-dev.39 1.7.0 From 5a7184f5f5e52c46ad78197e773862b29e200399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 10 Apr 2024 14:01:43 -0400 Subject: [PATCH 7/9] chore: Bump to latest stable --- src/Directory.Build.targets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index a1d0defe..3b349455 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -2,11 +2,11 @@ - 5.2.13 - 4.1.2 + 5.2.23 + 4.1.4 5.0.1 - 6.0.4 - 5.2.0 + 6.0.5 + 5.2.2 8.0.11 9.0.0-dev.39 1.7.0 From 5907690a3ad6a310cafc0efa7cf5438e59433364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 10 Apr 2024 14:17:10 -0400 Subject: [PATCH 8/9] chore: Adjust invalid version --- src/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 3b349455..c19044d9 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -2,7 +2,7 @@ - 5.2.23 + 5.2.22 4.1.4 5.0.1 6.0.5 From 1107e30974b6c3d573ac35d473e246a2e5ddcf55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 10 Apr 2024 14:59:53 -0400 Subject: [PATCH 9/9] chore: Adjust themes --- src/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index c19044d9..847190c2 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -4,7 +4,7 @@ 5.2.22 4.1.4 - 5.0.1 + 5.0.2 6.0.5 5.2.2 8.0.11