diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/AndroidTemplateTests.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/AndroidTemplateTests.cs index 709f34b58ce4..b03363079db5 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/AndroidTemplateTests.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/AndroidTemplateTests.cs @@ -47,14 +47,14 @@ public void AndroidTemplateTearDown() [Test] - [TestCase("maui", "net6.0", "Debug")] - [TestCase("maui", "net6.0", "Release")] - [TestCase("maui", "net7.0", "Debug")] - [TestCase("maui", "net7.0", "Release")] - [TestCase("maui-blazor", "net6.0", "Debug")] - [TestCase("maui-blazor", "net6.0", "Release")] - [TestCase("maui-blazor", "net7.0", "Debug")] - [TestCase("maui-blazor", "net7.0", "Release")] + [TestCase("maui", DotNetPrevious, "Debug")] + [TestCase("maui", DotNetPrevious, "Release")] + [TestCase("maui", DotNetCurrent, "Debug")] + [TestCase("maui", DotNetCurrent, "Release")] + [TestCase("maui-blazor", DotNetPrevious, "Debug")] + [TestCase("maui-blazor", DotNetPrevious, "Release")] + [TestCase("maui-blazor", DotNetCurrent, "Debug")] + [TestCase("maui-blazor", DotNetCurrent, "Release")] public void RunOnAndroid(string id, string framework, string config) { var projectDir = TestDirectory; diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/AppleTemplateTests.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/AppleTemplateTests.cs index b9e7b0b403cf..0d04505ed5ff 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/AppleTemplateTests.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/AppleTemplateTests.cs @@ -25,14 +25,14 @@ public void AppleTemplateFxtTearDown() } [Test] - [TestCase("maui", "Debug", "net6.0")] - [TestCase("maui", "Release", "net6.0")] - [TestCase("maui", "Debug", "net7.0")] - [TestCase("maui", "Release", "net7.0")] - [TestCase("maui-blazor", "Debug", "net6.0")] - [TestCase("maui-blazor", "Release", "net6.0")] - [TestCase("maui-blazor", "Debug", "net7.0")] - [TestCase("maui-blazor", "Release", "net7.0")] + [TestCase("maui", "Debug", DotNetPrevious)] + [TestCase("maui", "Release", DotNetPrevious)] + [TestCase("maui", "Debug", DotNetCurrent)] + [TestCase("maui", "Release", DotNetCurrent)] + [TestCase("maui-blazor", "Debug", DotNetPrevious)] + [TestCase("maui-blazor", "Release", DotNetPrevious)] + [TestCase("maui-blazor", "Debug", DotNetCurrent)] + [TestCase("maui-blazor", "Release", DotNetCurrent)] public void RunOniOS(string id, string config, string framework) { var projectDir = TestDirectory; diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs index 7b40b0c2d6cd..0f3da4a88d81 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs @@ -3,6 +3,9 @@ namespace Microsoft.Maui.IntegrationTests { public class BaseBuildTest { + public const string DotNetCurrent = "net7.0"; + public const string DotNetPrevious = "net6.0"; + char[] invalidChars = { '{', '}', '(', ')', '$', ':', ';', '\"', '\'', ',', '=', '.', '-', }; public string TestName diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs index 4a6232732909..18269bd20623 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs @@ -14,18 +14,18 @@ public void TemplateTestsSetUp() [Test] // Parameters: short name, target framework, build config, use pack target - [TestCase("maui", "net6.0", "Debug", false)] - [TestCase("maui", "net6.0", "Release", false)] - [TestCase("maui", "net7.0", "Debug", false)] - [TestCase("maui", "net7.0", "Release", false)] - [TestCase("maui-blazor", "net6.0", "Debug", false)] - [TestCase("maui-blazor", "net6.0", "Release", false)] - [TestCase("maui-blazor", "net7.0", "Debug", false)] - [TestCase("maui-blazor", "net7.0", "Release", false)] - [TestCase("mauilib", "net6.0", "Debug", true)] - [TestCase("mauilib", "net6.0", "Release", true)] - [TestCase("mauilib", "net7.0", "Debug", true)] - [TestCase("mauilib", "net7.0", "Release", true)] + [TestCase("maui", DotNetPrevious, "Debug", false)] + [TestCase("maui", DotNetPrevious, "Release", false)] + [TestCase("maui", DotNetCurrent, "Debug", false)] + [TestCase("maui", DotNetCurrent, "Release", false)] + [TestCase("maui-blazor", DotNetPrevious, "Debug", false)] + [TestCase("maui-blazor", DotNetPrevious, "Release", false)] + [TestCase("maui-blazor", DotNetCurrent, "Debug", false)] + [TestCase("maui-blazor", DotNetCurrent, "Release", false)] + [TestCase("mauilib", DotNetPrevious, "Debug", true)] + [TestCase("mauilib", DotNetPrevious, "Release", true)] + [TestCase("mauilib", DotNetCurrent, "Debug", true)] + [TestCase("mauilib", DotNetCurrent, "Release", true)] public void Build(string id, string framework, string config, bool shouldPack) { var projectDir = TestDirectory; @@ -47,14 +47,14 @@ public void Build(string id, string framework, string config, bool shouldPack) } [Test] - [TestCase("maui", "net6.0", "Debug")] - [TestCase("maui", "net6.0", "Release")] - [TestCase("maui", "net7.0", "Debug")] - [TestCase("maui", "net7.0", "Release")] - [TestCase("maui-blazor", "net6.0", "Debug")] - [TestCase("maui-blazor", "net6.0", "Release")] - [TestCase("maui-blazor", "net7.0", "Debug")] - [TestCase("maui-blazor", "net7.0", "Release")] + [TestCase("maui", DotNetPrevious, "Debug")] + [TestCase("maui", DotNetPrevious, "Release")] + [TestCase("maui", DotNetCurrent, "Debug")] + [TestCase("maui", DotNetCurrent, "Release")] + [TestCase("maui-blazor", DotNetPrevious, "Debug")] + [TestCase("maui-blazor", DotNetPrevious, "Release")] + [TestCase("maui-blazor", DotNetCurrent, "Debug")] + [TestCase("maui-blazor", DotNetCurrent, "Release")] public void BuildUnpackaged(string id, string framework, string config) { var projectDir = TestDirectory; @@ -73,7 +73,7 @@ public void BuildUnpackaged(string id, string framework, string config) } [Test] - [TestCase("maui", "net7.0", "Release")] + [TestCase("maui", DotNetCurrent, "Release")] public void PublishUnpackaged(string id, string framework, string config) { if (!TestEnvironment.IsWindows) @@ -106,10 +106,10 @@ void AssetExists(string filename) } [Test] - [TestCase("mauilib", "net6.0", "Debug")] - [TestCase("mauilib", "net6.0", "Release")] - [TestCase("mauilib", "net7.0", "Debug")] - [TestCase("mauilib", "net7.0", "Release")] + [TestCase("mauilib", DotNetPrevious, "Debug")] + [TestCase("mauilib", DotNetPrevious, "Release")] + [TestCase("mauilib", DotNetCurrent, "Debug")] + [TestCase("mauilib", DotNetCurrent, "Release")] public void PackCoreLib(string id, string framework, string config) { var projectDir = TestDirectory; @@ -131,9 +131,9 @@ public void PackCoreLib(string id, string framework, string config) } [Test] - [TestCase("maui", "net7.0", "Debug")] - [TestCase("mauilib", "net7.0", "Debug")] - [TestCase("maui-blazor", "net7.0", "Debug")] + [TestCase("maui", DotNetCurrent, "Debug")] + [TestCase("mauilib", DotNetCurrent, "Debug")] + [TestCase("maui-blazor", DotNetCurrent, "Debug")] public void BuildWithoutPackageReference(string id, string framework, string config) { var projectDir = TestDirectory;