From 1c3799bd2133dcfec6f6d60937c6594a076cf444 Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Thu, 17 Jul 2025 21:26:00 +0200 Subject: [PATCH 1/9] feat(uiTestAssertion): Add option which assertion library should be used default to none --- src/Directory.Build.targets | 1 + src/Uno.Templates/Uno.Templates.csproj | 1 + .../MyExtensionsApp.1.UITests.csproj | 4 +++ .../.template.config/dotnetcli.host.json | 4 +++ .../.template.config/template.json | 25 +++++++++++++++++++ .../unolib-uitest/UnoUITestsLibrary.csproj | 4 +++ 6 files changed, 39 insertions(+) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 13c6c8136..4a9595831 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -8,6 +8,7 @@ 4.1.0 4.5.0 6.12.0 + 4.3.0 6.0.2 13.0.3 4.3.4 diff --git a/src/Uno.Templates/Uno.Templates.csproj b/src/Uno.Templates/Uno.Templates.csproj index c2b3010b5..0213319d7 100644 --- a/src/Uno.Templates/Uno.Templates.csproj +++ b/src/Uno.Templates/Uno.Templates.csproj @@ -46,6 +46,7 @@ + diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.UITests/MyExtensionsApp.1.UITests.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.UITests/MyExtensionsApp.1.UITests.csproj index de94fc3f5..f408900fb 100644 --- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.UITests/MyExtensionsApp.1.UITests.csproj +++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.UITests/MyExtensionsApp.1.UITests.csproj @@ -6,7 +6,11 @@ + + + + diff --git a/src/Uno.Templates/content/unolib-uitest/.template.config/dotnetcli.host.json b/src/Uno.Templates/content/unolib-uitest/.template.config/dotnetcli.host.json index 16d4dfc26..53f16708c 100644 --- a/src/Uno.Templates/content/unolib-uitest/.template.config/dotnetcli.host.json +++ b/src/Uno.Templates/content/unolib-uitest/.template.config/dotnetcli.host.json @@ -7,6 +7,10 @@ }, "unoUITestHelpersVersion": { "isHidden": true + }, + "assertionLibrary": { + "longName": "assertionLibrary", + "shortName": "assertion" } } } diff --git a/src/Uno.Templates/content/unolib-uitest/.template.config/template.json b/src/Uno.Templates/content/unolib-uitest/.template.config/template.json index 72c693a53..b42065eeb 100644 --- a/src/Uno.Templates/content/unolib-uitest/.template.config/template.json +++ b/src/Uno.Templates/content/unolib-uitest/.template.config/template.json @@ -49,6 +49,31 @@ "description": "Target .NET 9.0 (Standard Term Support)" } ] + }, + "assertionLibrary": { + "displayName": "Assertion Library", + "type": "parameter", + "datatype": "choice", + "defaultValue": "none", + "replaces": "$assertionLibrary$", + "description": "Choose the assertion library for tests", + "choices": [ + { + "choice": "none", + "displayName": "No Assertion Library", + "description": "Do not use any specific assertion library" + }, + { + "choice": "Shouldly", + "displayName": "Shouldly", + "description": "Use Shouldly for assertions in tests" + }, + { + "choice": "FluentAssertions", + "displayName": "Fluent Assertions", + "description": "Use Fluent Assertions for assertions in tests" + } + ] } }, "primaryOutputs": [ diff --git a/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj b/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj index 8fb661817..559eb67a1 100644 --- a/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj +++ b/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj @@ -8,7 +8,11 @@ + + + + From 123a297a3d9718b3d4bea2346a7d3c4b8d1cf664 Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Thu, 17 Jul 2025 21:26:52 +0200 Subject: [PATCH 2/9] chore: Update Constants file to match the uiTests one from unoapp template --- .../content/unolib-uitest/Constants.cs | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/Uno.Templates/content/unolib-uitest/Constants.cs b/src/Uno.Templates/content/unolib-uitest/Constants.cs index 33437383d..778a17a58 100644 --- a/src/Uno.Templates/content/unolib-uitest/Constants.cs +++ b/src/Uno.Templates/content/unolib-uitest/Constants.cs @@ -1,19 +1,12 @@ -//-:cnd:noEmit -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Uno.UITest.Helpers.Queries; - -namespace UnoUITestsLibrary; +namespace UnoUITestsLibrary; public class Constants { - public readonly static string WebAssemblyDefaultUri = "http://localhost:64555/"; - public readonly static string iOSAppName = "com.example.app"; - public readonly static string AndroidAppName = "com.example.app"; - public readonly static string iOSDeviceNameOrId = "iPad Pro (12.9-inch) (3rd generation)"; + public readonly static string WebAssemblyDefaultUri = "http://localhost:5000/"; + public readonly static string iOSAppName = "com.companyname.myextensionsapp"; + public readonly static string AndroidAppName = "com.companyname.myextensionsapp"; + public readonly static string iOSDeviceNameOrId = "iPad Pro (12.9-inch) (3rd generation)"; - public readonly static Platform CurrentPlatform = Platform.Browser; + public readonly static Platform CurrentPlatform = Platform.Browser; + public readonly static Browser WebAssemblyBrowser = Browser.Chrome; } From bd2ae37c55009e1db6a562227c5df5d880aaf026 Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Thu, 17 Jul 2025 21:28:10 +0200 Subject: [PATCH 3/9] chore: Add GlobalUsings file from unoapp template to reduce each files header usings --- src/Uno.Templates/content/unolib-uitest/Given_MainPage.cs | 8 -------- src/Uno.Templates/content/unolib-uitest/GlobalUsings.cs | 6 ++++++ src/Uno.Templates/content/unolib-uitest/TestBase.cs | 6 ------ 3 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 src/Uno.Templates/content/unolib-uitest/GlobalUsings.cs diff --git a/src/Uno.Templates/content/unolib-uitest/Given_MainPage.cs b/src/Uno.Templates/content/unolib-uitest/Given_MainPage.cs index 9b0058cf0..68f07e2f8 100644 --- a/src/Uno.Templates/content/unolib-uitest/Given_MainPage.cs +++ b/src/Uno.Templates/content/unolib-uitest/Given_MainPage.cs @@ -1,12 +1,4 @@ //-:cnd:noEmit -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using NUnit.Framework; -using Uno.UITest.Helpers.Queries; -using Query = System.Func; namespace UnoUITestsLibrary; diff --git a/src/Uno.Templates/content/unolib-uitest/GlobalUsings.cs b/src/Uno.Templates/content/unolib-uitest/GlobalUsings.cs new file mode 100644 index 000000000..c0650669c --- /dev/null +++ b/src/Uno.Templates/content/unolib-uitest/GlobalUsings.cs @@ -0,0 +1,6 @@ +//-:cnd:noEmit +global using NUnit.Framework; +global using Uno.UITest; +global using Uno.UITest.Helpers.Queries; +global using Uno.UITests.Helpers; +global using Query = System.Func; diff --git a/src/Uno.Templates/content/unolib-uitest/TestBase.cs b/src/Uno.Templates/content/unolib-uitest/TestBase.cs index 960270bc1..25895958e 100644 --- a/src/Uno.Templates/content/unolib-uitest/TestBase.cs +++ b/src/Uno.Templates/content/unolib-uitest/TestBase.cs @@ -1,10 +1,4 @@ //-:cnd:noEmit -using System; -using System.IO; -using NUnit.Framework; -using Uno.UITest; -using Uno.UITest.Selenium; -using Uno.UITests.Helpers; namespace UnoUITestsLibrary; From fb5a162734dc6dcd479adb1202a5c4b3847cdc57 Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Fri, 18 Jul 2025 14:01:02 +0200 Subject: [PATCH 4/9] feat(AssertionLibrary): Add option also to unoapp template and wizard --- .../.template.config/TemplateWizard.json | 39 +++++++++++++++++- .../.template.config/dotnetcli.host.json | 4 ++ .../unoapp/.template.config/template.json | 41 +++++++++++++++++++ .../content/unoapp/Directory.Packages.props | 5 +++ .../MyExtensionsApp.1.Tests/AppInfoTests.cs | 10 ++++- .../MyExtensionsApp.1.Tests/GlobalUsings.cs | 9 +++- .../MyExtensionsApp.1.Tests.csproj | 5 +++ .../MyExtensionsApp.1.UITests.csproj | 5 ++- .../.template.config/template.json | 14 ++++++- .../content/unolib-uitest/Constants.cs | 3 +- .../content/unolib-uitest/GlobalUsings.cs | 6 +++ .../unolib-uitest/UnoUITestsLibrary.csproj | 5 ++- 12 files changed, 134 insertions(+), 12 deletions(-) diff --git a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json index ac5f08d77..4b40ea5b4 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json +++ b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json @@ -97,6 +97,7 @@ "server": "false", "skipRestore": "true", "tests": "none", + "assertionLibrary": "none", "tfm": "net9.0", "toolkit": "false", "vscode": "true", @@ -112,7 +113,7 @@ "renderer": "skia" }, "Features": [ - ".NET 8", + ".NET 9", "XAML" ] }, @@ -139,6 +140,7 @@ "server": "false", "skipRestore": "true", "tests": "none", + "assertionLibrary": "none", "tfm": "net9.0", "toolkit": "true", "vscode": "true", @@ -154,7 +156,7 @@ "renderer": "skia" }, "Features": [ - ".NET 8", + ".NET 9", "XAML", "MVUX", "Material", @@ -293,6 +295,13 @@ "SectionType": "MultiSelect", "SymbolId": "tests", "Choices": [ "unit", "ui" ] + }, + { + "Title": "Assertion Library", + "SectionType": "SingleSelect", + "SymbolId": "assertionLibrary", + "Choices": [ "none", "Shouldly", "FluentAssertions" ], + "NestedIn": "tests" } ], "Theme": [ @@ -653,6 +662,31 @@ "Icon": "/Assets/Test.UnitTest.svg" }, + "tests.ui.assertion": { + "NoValue": "none" + }, + "tests.ui.assertion.shouldly": { + // "Icon": "/Assets/Test.UiTest.Shouldly.svg" TODO: Add icon + "Sequence": 1, + "Tag":{ + "Requires": { + "tests": { + "RequiredValues": [ "!none" ], + "MoreInformation": "Test selection is required to use Shouldly Assertion library" + } + } + } + }, + "tests.ui.assertion.fluentAssertions": { + // "Icon": "/Assets/Test.UiTest.FluentAssertions.svg" TODO: Add icon + "Sequence": 2, + "Requires": { + "tests": { + "RequiredValues": [ "!none" ], + "MoreInformation": "Test selection is required to use Fluent Assertions library" + } + } + }, "tfm.net6.0": { "Sequence": 1, "Icon": "/Assets/Framework.NET6.svg" @@ -756,6 +790,7 @@ "appTheme", "platforms", "tests", + "assertionLibrary", "server", "dependencyInjection", "configuration", diff --git a/src/Uno.Templates/content/unoapp/.template.config/dotnetcli.host.json b/src/Uno.Templates/content/unoapp/.template.config/dotnetcli.host.json index fdfd02825..d091c1b6c 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/dotnetcli.host.json +++ b/src/Uno.Templates/content/unoapp/.template.config/dotnetcli.host.json @@ -49,6 +49,10 @@ "longName": "tests", "shortName": "tests" }, + "assertionLibrary": { + "longName": "assertion-library", + "shortName": "assertion" + }, "toolkit": { "longName": "toolkit", "shortName": "toolkit" diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json index 132bb9f75..941e385cd 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/template.json +++ b/src/Uno.Templates/content/unoapp/.template.config/template.json @@ -307,6 +307,39 @@ } ] }, + "assertionLibrary": { + "displayName": "Assertion Library", + "type": "parameter", + "datatype": "choice", + "defaultValue": "none", + "allowMultipleValues": false, + "description": "Choose the assertion library for tests", + "enableQuotelessLiterals": true, + "isEnabled": "tests != none", + "onlyIf": [ + { + "symbol": "tests", + "value":"unit|ui" + } + ], + "choices": [ + { + "choice": "none", + "displayName": "No Assertion Library", + "description": "Do not use any specific assertion library and only use the built-in assertions provided by the test framework" + }, + { + "choice": "Shouldly", + "displayName": "Shouldly", + "description": "Use Shouldly for assertions in tests" + }, + { + "choice": "FluentAssertions", + "displayName": "Fluent Assertions", + "description": "Use Fluent Assertions for assertions in tests" + } + ] + }, "AllowPrereleaseNetSdk": { "type": "generated", "generator": "switch", @@ -1190,6 +1223,14 @@ "pattern": ".*ui.*" } }, + "useFluentAssertions": { + "type": "computed", + "value": "(assertionLibrary == FluentAssertions)" + }, + "useShouldly": { + "type": "computed", + "value": "(assertionLibrary == Shouldly)" + }, "useServer": { "type": "computed", "datatype": "bool", diff --git a/src/Uno.Templates/content/unoapp/Directory.Packages.props b/src/Uno.Templates/content/unoapp/Directory.Packages.props index fe82ce06e..5aaf8c25a 100644 --- a/src/Uno.Templates/content/unoapp/Directory.Packages.props +++ b/src/Uno.Templates/content/unoapp/Directory.Packages.props @@ -8,7 +8,12 @@ + + + + + diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/AppInfoTests.cs b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/AppInfoTests.cs index f4b16405d..f336555b9 100644 --- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/AppInfoTests.cs +++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/AppInfoTests.cs @@ -12,8 +12,16 @@ public void Setup() public void AppInfoCreation() { var appInfo = new AppConfig { Environment = "Test" }; - +#if(useFluentAssertions) appInfo.Should().NotBeNull(); appInfo.Environment.Should().Be("Test"); +#endif +#if(useShouldly) + appInfo.ShouldNotBeNull(); + appInfo.Environment.ShouldBe("Test"); +#else + Assert.That(appInfo,Is.Not.Null); + Assert.That(appInfo.Environment, Is.EqualTo("Test")); +#endif } } diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/GlobalUsings.cs b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/GlobalUsings.cs index 5719c4b58..d989a811d 100644 --- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/GlobalUsings.cs +++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/GlobalUsings.cs @@ -1,6 +1,11 @@ -//+:cnd:noEmit -global using FluentAssertions; +//-:cnd:noEmit #if useBusinessModelsNamespace global using MyExtensionsApp._1.Models; #endif +#if(useFluentAssertions) +global using FluentAssertions; +#endif +#if(useShouldly) +global using Shouldly; +#endif global using NUnit.Framework; diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/MyExtensionsApp.1.Tests.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/MyExtensionsApp.1.Tests.csproj index efa574c43..ab7ac2d63 100644 --- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/MyExtensionsApp.1.Tests.csproj +++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/MyExtensionsApp.1.Tests.csproj @@ -7,7 +7,12 @@ + + + + + diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.UITests/MyExtensionsApp.1.UITests.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.UITests/MyExtensionsApp.1.UITests.csproj index f408900fb..db0b66cac 100644 --- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.UITests/MyExtensionsApp.1.UITests.csproj +++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.UITests/MyExtensionsApp.1.UITests.csproj @@ -6,9 +6,10 @@ - + - + + diff --git a/src/Uno.Templates/content/unolib-uitest/.template.config/template.json b/src/Uno.Templates/content/unolib-uitest/.template.config/template.json index b42065eeb..e193f31a0 100644 --- a/src/Uno.Templates/content/unolib-uitest/.template.config/template.json +++ b/src/Uno.Templates/content/unolib-uitest/.template.config/template.json @@ -55,13 +55,15 @@ "type": "parameter", "datatype": "choice", "defaultValue": "none", - "replaces": "$assertionLibrary$", + "enableQuotelessLiterals": true, + "allowMultipleValues": false, + "isEnabled": "tests != none", "description": "Choose the assertion library for tests", "choices": [ { "choice": "none", "displayName": "No Assertion Library", - "description": "Do not use any specific assertion library" + "description": "Do not use any specific assertion library and only use the built-in assertions provided by the test framework" }, { "choice": "Shouldly", @@ -74,6 +76,14 @@ "description": "Use Fluent Assertions for assertions in tests" } ] + }, + "useFluentAssertions": { + "type": "computed", + "value": "(assertionLibrary == FluentAssertions)" + }, + "useShouldly": { + "type": "computed", + "value": "(assertionLibrary == Shouldly)" } }, "primaryOutputs": [ diff --git a/src/Uno.Templates/content/unolib-uitest/Constants.cs b/src/Uno.Templates/content/unolib-uitest/Constants.cs index 778a17a58..df1463304 100644 --- a/src/Uno.Templates/content/unolib-uitest/Constants.cs +++ b/src/Uno.Templates/content/unolib-uitest/Constants.cs @@ -1,4 +1,5 @@ -namespace UnoUITestsLibrary; +//-:cnd:noEmit +namespace UnoUITestsLibrary; public class Constants { diff --git a/src/Uno.Templates/content/unolib-uitest/GlobalUsings.cs b/src/Uno.Templates/content/unolib-uitest/GlobalUsings.cs index c0650669c..06c5ad66e 100644 --- a/src/Uno.Templates/content/unolib-uitest/GlobalUsings.cs +++ b/src/Uno.Templates/content/unolib-uitest/GlobalUsings.cs @@ -1,4 +1,10 @@ //-:cnd:noEmit +#if (useFluentAssertions) +global using FluentAssertions; +#endif +#if (useShouldly) +global using Shouldly; +#endif global using NUnit.Framework; global using Uno.UITest; global using Uno.UITest.Helpers.Queries; diff --git a/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj b/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj index 559eb67a1..3ed347fb6 100644 --- a/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj +++ b/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj @@ -8,9 +8,10 @@ - + - + + From 00d149c33adf6ce40d976f1859fcceb447dea421 Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Fri, 18 Jul 2025 14:34:00 +0200 Subject: [PATCH 5/9] chore: Add intendation and case for unit test wanted --- .../.template.config/TemplateWizard.json | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json index 4b40ea5b4..fe144fddc 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json +++ b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json @@ -674,8 +674,8 @@ "RequiredValues": [ "!none" ], "MoreInformation": "Test selection is required to use Shouldly Assertion library" } + } } - } }, "tests.ui.assertion.fluentAssertions": { // "Icon": "/Assets/Test.UiTest.FluentAssertions.svg" TODO: Add icon @@ -687,6 +687,31 @@ } } }, + "tests.unit.assertion": { + "NoValue": "none" + }, + "tests.unit.assertion.shouldly": { + // "Icon": "/Assets/Test.UiTest.Shouldly.svg" TODO: Add icon + "Sequence": 1, + "Tag":{ + "Requires": { + "tests": { + "RequiredValues": [ "!none" ], + "MoreInformation": "Test selection is required to use Shouldly Assertion library" + } + } + } + }, + "tests.unit.assertion.fluentAssertions": { + // "Icon": "/Assets/Test.UiTest.FluentAssertions.svg" TODO: Add icon + "Sequence": 2, + "Requires": { + "tests": { + "RequiredValues": [ "!none" ], + "MoreInformation": "Test selection is required to use Fluent Assertions library" + } + } + }, "tfm.net6.0": { "Sequence": 1, "Icon": "/Assets/Framework.NET6.svg" From 9a5e1eb8f4b6ebc25b100ebeee8c1cbb6ff13ad7 Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Fri, 18 Jul 2025 14:37:42 +0200 Subject: [PATCH 6/9] chore: add default case and implement review suggestions --- .../unoapp/MyExtensionsApp.1.Tests/AppInfoTests.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/AppInfoTests.cs b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/AppInfoTests.cs index f336555b9..304af1fc1 100644 --- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/AppInfoTests.cs +++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.Tests/AppInfoTests.cs @@ -17,10 +17,11 @@ public void AppInfoCreation() appInfo.Environment.Should().Be("Test"); #endif #if(useShouldly) - appInfo.ShouldNotBeNull(); - appInfo.Environment.ShouldBe("Test"); -#else - Assert.That(appInfo,Is.Not.Null); + appInfo.ShouldNotBeNull(); + appInfo.Environment.ShouldBe("Test"); +#endif +#if(!useShouldly && !useFluentAssertions) + Assert.That(appInfo, Is.Not.Null); Assert.That(appInfo.Environment, Is.EqualTo("Test")); #endif } From 78d4862387fd095755d7acfd4f5d92a7aa63441c Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Fri, 28 Nov 2025 19:54:42 +0100 Subject: [PATCH 7/9] chore: Apply PR Review suggestion Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../content/unolib-uitest/UnoUITestsLibrary.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj b/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj index 3ed347fb6..0e1274d6a 100644 --- a/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj +++ b/src/Uno.Templates/content/unolib-uitest/UnoUITestsLibrary.csproj @@ -12,7 +12,7 @@ - + From d7100b84ec7377d4fa478dd2accd1a9644627ad2 Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Fri, 28 Nov 2025 20:00:37 +0100 Subject: [PATCH 8/9] chore: Update default .NET version from 9 to 10 in TemplateWizard --- .../content/unoapp/.template.config/TemplateWizard.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json index dbe0d37ce..347a1b55d 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json +++ b/src/Uno.Templates/content/unoapp/.template.config/TemplateWizard.json @@ -113,7 +113,7 @@ "renderer": "skia" }, "Features": [ - ".NET 9", + ".NET 10", "XAML" ] }, @@ -156,7 +156,7 @@ "renderer": "skia" }, "Features": [ - ".NET 9", + ".NET 10", "XAML", "MVUX", "Material", From 256212995bba9ad77f691ffb6af9d5554da9df6e Mon Sep 17 00:00:00 2001 From: DevTKSS Date: Fri, 28 Nov 2025 20:02:04 +0100 Subject: [PATCH 9/9] fix: Shouldly version variable in Directory.Packages.props --- src/Uno.Templates/content/unoapp/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Uno.Templates/content/unoapp/Directory.Packages.props b/src/Uno.Templates/content/unoapp/Directory.Packages.props index 5aaf8c25a..235a8d63a 100644 --- a/src/Uno.Templates/content/unoapp/Directory.Packages.props +++ b/src/Uno.Templates/content/unoapp/Directory.Packages.props @@ -12,7 +12,7 @@ - +