[CI] Re-enable Mac Mono Tests (#5945)

NuGet · Aug 1, 2024 · dc44240 · dc44240
1 parent 3b318e3
commit dc44240
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -61,6 +61,7 @@
     <PackageVersion Include="Microsoft.PowerShell.3.ReferenceAssemblies" Version="1.0.0" />
     <PackageVersion Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="16.153.0" />
     <PackageVersion Include="Microsoft.Test.Apex.VisualStudio" Version="17.11.35005.70" />
+    <PackageVersion Include="Microsoft.TestPlatform.Portable" Version="17.1.0" />
     <PackageVersion Include="Microsoft.VisualStudio.LanguageServices" Version="4.3.1" />
     <PackageVersion Include="Microsoft.VisualStudio.ProjectSystem" Version="17.4.221-pre" />
     <PackageVersion Include="Microsoft.VisualStudio.ProjectSystem.Managed" Version="17.2.0-beta1-20502-01" />

diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml
@@ -41,7 +41,7 @@ parameters:
 - name: RunMonoTestsOnMac
   displayName: Run Mono tests on Mac
   type: boolean
-  default: false
+  default: true
 
 resources:
   pipelines:

diff --git a/eng/pipelines/pull_request.yml b/eng/pipelines/pull_request.yml
@@ -37,7 +37,7 @@ parameters:
 - name: RunMonoTestsOnMac
   displayName: Run Mono tests on Mac
   type: boolean
-  default: false
+  default: true
 - name: RunStaticAnalysis
   displayName: Run static analysis
   type: boolean

diff --git a/eng/pipelines/templates/pipeline.yml b/eng/pipelines/templates/pipeline.yml
@@ -470,7 +470,7 @@ stages:
       TestRunCommandLineArguments: "--mono-tests"
     pool:
       name: 'Azure Pipelines'
-      vmImage: macos-13
+      vmImage: macos-latest
       os: macOS
     templateContext:
       outputs:

diff --git a/scripts/funcTests/runFuncTests.sh b/scripts/funcTests/runFuncTests.sh
@@ -68,21 +68,22 @@ if [ "$MONO_TESTS" == "1" ]; then
     rm -rf "$TestDir/System.*" "$TestDir/WindowsBase.dll" "$TestDir/Microsoft.CSharp.dll" "$TestDir/Microsoft.Build.Engine.dll"
 
     case "$(uname -s)" in
-		    Linux)
-			    # We are not testing Mono on linux currently, so comment it out.
-			    #echo "mono $VsTestConsole $TestDir/NuGet.CommandLine.Test.dll --TestCaseFilter:Platform!=Windows&Platform!=Darwin --logger:console;verbosity=$VsTestVerbosity --logger:"trx" --ResultsDirectory:$TestResultsDir"
-			    #mono $VsTestConsole "$TestDir/NuGet.CommandLine.Test.dll" --TestCaseFilter:"Platform!=Windows&Platform!=Darwin" --logger:"console;verbosity=$VsTestVerbosity" --logger:"trx" --ResultsDirectory:"$TestResultsDir"
-			    #EXIT_CODE=$?
-			    ;;
-		    Darwin)
+            Linux)
+                # We are not testing Mono on linux currently, so comment it out.
+                #echo "mono $VsTestConsole $TestDir/NuGet.CommandLine.Test.dll --TestCaseFilter:Platform!=Windows&Platform!=Darwin --logger:console;verbosity=$VsTestVerbosity --logger:"trx" --ResultsDirectory:$TestResultsDir"
+                #mono $VsTestConsole "$TestDir/NuGet.CommandLine.Test.dll" --TestCaseFilter:"Platform!=Windows&Platform!=Darwin" --logger:"console;verbosity=$VsTestVerbosity" --logger:"trx" --ResultsDirectory:"$TestResultsDir"
+                #EXIT_CODE=$?
+                ;;
+            Darwin)
                 echo "==================== Run mono tests started at `date -u +"%Y-%m-%dT%H:%M:%S"` ======================"
-			    echo "mono $VsTestConsole $TestDir/NuGet.CommandLine.Test.dll --TestCaseFilter:Platform!=Windows&Platform!=Linux --logger:console;verbosity=$VsTestVerbosity --logger:"trx" --ResultsDirectory:$TestResultsDir"
-			    mono $VsTestConsole "$TestDir/NuGet.CommandLine.Test.dll" --TestCaseFilter:"Platform!=Windows&Platform!=Linux" --logger:"console;verbosity=$VsTestVerbosity" --logger:"trx" --ResultsDirectory:"$TestResultsDir"
-			    EXIT_CODE=$?
+                set -x
+                mono $VsTestConsole $TestDir/NuGet.CommandLine.Test.dll --logger:"console;verbosity=$VsTestVerbosity" --logger:trx --diag:$BUILD_STAGINGDIRECTORY/binlog/vstest.diag.log --ResultsDirectory:$TestResultsDir --Settings:$DIR/build/xunit.runsettings
+                EXIT_CODE=$?
+                set +x
                 echo "================== mono tests finished at `date -u +"%Y-%m-%dT%H:%M:%S"` ==================="
                 echo ""
-			    ;;
-		    *) ;;
+                ;;
+            *) ;;
     esac
 fi
 

diff --git a/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/NuGet.CommandLine.Test.csproj b/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/NuGet.CommandLine.Test.csproj
@@ -24,6 +24,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" />
     <PackageReference Include="Microsoft.NET.StringTools" ExcludeAssets="Runtime" />
+    <PackageReference Include="Microsoft.TestPlatform.Portable" IncludeAssets="None" />
   </ItemGroup>
 
   <ItemGroup>
@@ -35,6 +36,8 @@
              CopyToOutputDirectory="PreserveNewest"
              Visible="false"
              Condition="'$(PkgMicrosoft_TestPlatform_Portable)' != ''" />
+    <None Include="xunit.runner.json"
+          CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/xunit.runner.json b/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/xunit.runner.json
@@ -0,0 +1,7 @@
+{
+  "diagnosticMessages": true,
+  "methodDisplay": "classAndMethod",
+  "parallelizeAssembly": true,
+  "parallelizeTestCollections": true,
+  "longRunningTestSeconds": 120
+}