From 179e5cdd70bd861ee91fa3521b769937788fb053 Mon Sep 17 00:00:00 2001 From: "Matthew Scheffer (Aditi Technologies Private LTD)" Date: Mon, 25 Mar 2024 17:12:33 -0700 Subject: [PATCH 1/7] Initial checkin for maui tests --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index af0dbf946..e79a89f86 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,8 @@ + + From 5c72e48a29272cac50e523b7e9dc5acf751bc9d5 Mon Sep 17 00:00:00 2001 From: "Matthew Scheffer (Aditi Technologies Private LTD)" Date: Mon, 25 Mar 2024 17:12:44 -0700 Subject: [PATCH 2/7] Revert "Initial checkin for maui tests" This reverts commit 179e5cdd70bd861ee91fa3521b769937788fb053. --- NuGet.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index e79a89f86..af0dbf946 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,6 @@ - - From 4ff8a32c47ca5281671615710f3461a5b05063aa Mon Sep 17 00:00:00 2001 From: "Matthew Scheffer (Aditi Technologies Private LTD)" Date: Mon, 25 Mar 2024 17:13:02 -0700 Subject: [PATCH 3/7] Initial checkin for maui tests --- .../DotNetSdkTemplate.cs | 2 + .../SdkTemplateTests.cs | 39 ++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/DotNetSdkTemplate.cs b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/DotNetSdkTemplate.cs index 589a0f6bc..a1325565f 100644 --- a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/DotNetSdkTemplate.cs +++ b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/DotNetSdkTemplate.cs @@ -23,4 +23,6 @@ public enum DotNetSdkTemplate Wpf, Winforms, Aspire, + maui, + maccatalyst } diff --git a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs index c43fdd661..72c0ebbdc 100644 --- a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs +++ b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs @@ -219,7 +219,6 @@ public void VerifyWorkloadCmd() [Fact] [Trait("Category", "Workload")] - [Trait("Category", "InProgress")] public void VerifyAspireTemplate() { var setup = new DotnetWorkloadTest( @@ -236,6 +235,44 @@ public void VerifyAspireTemplate() cleanup.Execute(_sdkHelper, _scenarioTestInput.TestRoot, "aspire"); } + [Fact] + [Trait("Category", "Workload")] + //[Trait("Category", "InProgress")] + public void VerifyMaccatalystTemplate() + { + var setup = new DotnetWorkloadTest( + nameof(SdkTemplateTest), _scenarioTestInput.TargetRid, + DotNetSdkActions.WorkloadInstall); + setup.Execute(_sdkHelper, _scenarioTestInput.TestRoot, "maui-desktop"); + var newTest = new SdkTemplateTest( + nameof(SdkTemplateTest), DotNetLanguage.CSharp, _scenarioTestInput.TargetRid, DotNetSdkTemplate.maccatalyst, + DotNetSdkActions.Build | DotNetSdkActions.Publish | DotNetSdkActions.Run); + newTest.Execute(_sdkHelper, _scenarioTestInput.TestRoot); + var cleanup = new DotnetWorkloadTest( + nameof(SdkTemplateTest), _scenarioTestInput.TargetRid, + DotNetSdkActions.WorkloadUninstall); + cleanup.Execute(_sdkHelper, _scenarioTestInput.TestRoot, "maui-desktop"); + } + + [Fact] + [Trait("Category", "Workload")] + [Trait("Category", "InProgress")] + public void VerifyMauiDesktopWorkload() + { + var setup = new DotnetWorkloadTest( + nameof(SdkTemplateTest), _scenarioTestInput.TargetRid, + DotNetSdkActions.WorkloadInstall); + setup.Execute(_sdkHelper, _scenarioTestInput.TestRoot, "maui"); + var newTest = new SdkTemplateTest( + nameof(SdkTemplateTest), DotNetLanguage.CSharp, _scenarioTestInput.TargetRid, DotNetSdkTemplate.maui, + DotNetSdkActions.Build | DotNetSdkActions.Publish); + newTest.Execute(_sdkHelper, _scenarioTestInput.TestRoot); + var cleanup = new DotnetWorkloadTest( + nameof(SdkTemplateTest), _scenarioTestInput.TargetRid, + DotNetSdkActions.WorkloadUninstall); + cleanup.Execute(_sdkHelper, _scenarioTestInput.TestRoot, "maui"); + } + [Fact] [Trait("Category", "Offline")] public void VerifyPreMadeSolution() From 52b9868323faa9bed68cf14f9b64cbdbeb54ae9d Mon Sep 17 00:00:00 2001 From: "Matthew Scheffer (Aditi Technologies Private LTD)" Date: Wed, 27 Mar 2024 13:09:54 -0700 Subject: [PATCH 4/7] Removing run action for maccatalyst --- .../SdkTemplateTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs index 72c0ebbdc..02a58927a 100644 --- a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs +++ b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs @@ -246,14 +246,14 @@ public void VerifyMaccatalystTemplate() setup.Execute(_sdkHelper, _scenarioTestInput.TestRoot, "maui-desktop"); var newTest = new SdkTemplateTest( nameof(SdkTemplateTest), DotNetLanguage.CSharp, _scenarioTestInput.TargetRid, DotNetSdkTemplate.maccatalyst, - DotNetSdkActions.Build | DotNetSdkActions.Publish | DotNetSdkActions.Run); + DotNetSdkActions.Build | DotNetSdkActions.Publish); newTest.Execute(_sdkHelper, _scenarioTestInput.TestRoot); var cleanup = new DotnetWorkloadTest( nameof(SdkTemplateTest), _scenarioTestInput.TargetRid, DotNetSdkActions.WorkloadUninstall); cleanup.Execute(_sdkHelper, _scenarioTestInput.TestRoot, "maui-desktop"); } - + /* [Fact] [Trait("Category", "Workload")] [Trait("Category", "InProgress")] @@ -271,7 +271,7 @@ public void VerifyMauiDesktopWorkload() nameof(SdkTemplateTest), _scenarioTestInput.TargetRid, DotNetSdkActions.WorkloadUninstall); cleanup.Execute(_sdkHelper, _scenarioTestInput.TestRoot, "maui"); - } + }*/ [Fact] [Trait("Category", "Offline")] From 07bf8b586d4c06365a565a004969ac5b96b38180 Mon Sep 17 00:00:00 2001 From: "Matthew Scheffer (Aditi Technologies Private LTD)" Date: Wed, 27 Mar 2024 14:41:01 -0700 Subject: [PATCH 5/7] Skipping execution of Maccatalyst if Linux. Maui-desktop workload isn't supported --- .../SdkTemplateTests.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs index 02a58927a..5360aec55 100644 --- a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs +++ b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs @@ -237,7 +237,8 @@ public void VerifyAspireTemplate() [Fact] [Trait("Category", "Workload")] - //[Trait("Category", "InProgress")] + [Trait("Category", "InProgress")] + [Trait("SkipIfPlatform", "LINUX")] public void VerifyMaccatalystTemplate() { var setup = new DotnetWorkloadTest( @@ -257,6 +258,7 @@ public void VerifyMaccatalystTemplate() [Fact] [Trait("Category", "Workload")] [Trait("Category", "InProgress")] + [Trait("SkipIfPlatform", "LINUX")] public void VerifyMauiDesktopWorkload() { var setup = new DotnetWorkloadTest( From 936543a2fb848893dd0f0629b08e46160703510b Mon Sep 17 00:00:00 2001 From: "Matthew Scheffer (Aditi Technologies Private LTD)" Date: Fri, 5 Apr 2024 13:26:41 -0700 Subject: [PATCH 6/7] Skip OSX as maccatalyst on Mac requires xcode --- .../SdkTemplateTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs index 5360aec55..cae987b04 100644 --- a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs +++ b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs @@ -239,6 +239,7 @@ public void VerifyAspireTemplate() [Trait("Category", "Workload")] [Trait("Category", "InProgress")] [Trait("SkipIfPlatform", "LINUX")] + [Trait("SkipIfPlatform", "OSX")] public void VerifyMaccatalystTemplate() { var setup = new DotnetWorkloadTest( From b962ee72b6636c22f661abc2d634bcf307c8a822 Mon Sep 17 00:00:00 2001 From: "Matthew Scheffer (Aditi Technologies Private LTD)" Date: Mon, 8 Apr 2024 16:05:51 -0700 Subject: [PATCH 7/7] Removing commented out test as it wasn't working without additional sdks being installed. --- .../SdkTemplateTests.cs | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs index cae987b04..2e55ea992 100644 --- a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs +++ b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/SdkTemplateTests.cs @@ -237,7 +237,6 @@ public void VerifyAspireTemplate() [Fact] [Trait("Category", "Workload")] - [Trait("Category", "InProgress")] [Trait("SkipIfPlatform", "LINUX")] [Trait("SkipIfPlatform", "OSX")] public void VerifyMaccatalystTemplate() @@ -255,26 +254,6 @@ public void VerifyMaccatalystTemplate() DotNetSdkActions.WorkloadUninstall); cleanup.Execute(_sdkHelper, _scenarioTestInput.TestRoot, "maui-desktop"); } - /* - [Fact] - [Trait("Category", "Workload")] - [Trait("Category", "InProgress")] - [Trait("SkipIfPlatform", "LINUX")] - public void VerifyMauiDesktopWorkload() - { - var setup = new DotnetWorkloadTest( - nameof(SdkTemplateTest), _scenarioTestInput.TargetRid, - DotNetSdkActions.WorkloadInstall); - setup.Execute(_sdkHelper, _scenarioTestInput.TestRoot, "maui"); - var newTest = new SdkTemplateTest( - nameof(SdkTemplateTest), DotNetLanguage.CSharp, _scenarioTestInput.TargetRid, DotNetSdkTemplate.maui, - DotNetSdkActions.Build | DotNetSdkActions.Publish); - newTest.Execute(_sdkHelper, _scenarioTestInput.TestRoot); - var cleanup = new DotnetWorkloadTest( - nameof(SdkTemplateTest), _scenarioTestInput.TargetRid, - DotNetSdkActions.WorkloadUninstall); - cleanup.Execute(_sdkHelper, _scenarioTestInput.TestRoot, "maui"); - }*/ [Fact] [Trait("Category", "Offline")]