From 645397c9cbe1fafd4f3053e375e97d2b144f4b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Wed, 9 Aug 2023 20:46:45 +0200
Subject: [PATCH] Add IgnoreForCI property to certain no-op test suites
 (#90238)

A couple projects have all tests disabled, it makes no sense to send them to Helix to run 0 tests.
---
 .../tests/AssemblyAttributes.cs                                 | 2 +-
 .../tests/Microsoft.Extensions.Caching.Memory.Tests.csproj      | 2 ++
 .../Microsoft.Extensions.Hosting.Functional.Tests.csproj        | 2 ++
 .../tests/FunctionalTests/Properties/AssemblyInfo.cs            | 1 +
 .../tests/FunctionalTests/ShutdownTests.cs                      | 2 --
 .../System.ComponentModel.Composition/tests/AssemblyInfo.cs     | 2 +-
 .../tests/System.ComponentModel.Composition.Tests.csproj        | 2 ++
 7 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/AssemblyAttributes.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/AssemblyAttributes.cs
index 167b80352f5..2a244c823cc 100644
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/AssemblyAttributes.cs
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/AssemblyAttributes.cs
@@ -3,4 +3,4 @@
 
 using Xunit;
 
-[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/35970", TestRuntimes.Mono)]
+[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/35970", TestRuntimes.Mono)] // Note: remove IgnoreForCI from .csproj when reenabling
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj
index 429cde4c0db..1d602a71c16 100644
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <!-- ActiveIssue in AssemblyInfo.cs for Mono -->
+    <IgnoreForCI Condition="'$(RuntimeFlavor)' == 'Mono'">true</IgnoreForCI>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj
index 11a32baa9cc..83bb46beb44 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
+    <!-- ActiveIssue in AssemblyInfo.cs -->
+    <IgnoreForCI>true</IgnoreForCI>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Properties/AssemblyInfo.cs
index cc0c22363d4..3e1a24acf75 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Properties/AssemblyInfo.cs
+++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Properties/AssemblyInfo.cs
@@ -4,3 +4,4 @@
 using Xunit;
 
 [assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]
+[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/34090")] // Note: remove IgnoreForCI from .csproj when reenabling
diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/ShutdownTests.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/ShutdownTests.cs
index 96ebf6399b5..e55a29dd0de 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/ShutdownTests.cs
+++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/ShutdownTests.cs
@@ -29,7 +29,6 @@ public ShutdownTests(ITestOutputHelper output)
         }
 
         [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/34090")]
         [PlatformSpecific(TestPlatforms.Linux)]
         public async Task ShutdownTestRun()
         {
@@ -37,7 +36,6 @@ public async Task ShutdownTestRun()
         }
 
         [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/34090")]
         [PlatformSpecific(TestPlatforms.Linux)]
         public async Task ShutdownTestWaitForShutdown()
         {
diff --git a/src/libraries/System.ComponentModel.Composition/tests/AssemblyInfo.cs b/src/libraries/System.ComponentModel.Composition/tests/AssemblyInfo.cs
index b0523cb1a69..243d54910ab 100644
--- a/src/libraries/System.ComponentModel.Composition/tests/AssemblyInfo.cs
+++ b/src/libraries/System.ComponentModel.Composition/tests/AssemblyInfo.cs
@@ -3,4 +3,4 @@
 
 using Xunit;
 
-[assembly: ActiveIssue("https://github.com/mono/mono/issues/16417", TestRuntimes.Mono)] // flaky tests
+[assembly: ActiveIssue("https://github.com/mono/mono/issues/16417", TestRuntimes.Mono)] // flaky tests. Note: remove IgnoreForCI from .csproj when reenabling
diff --git a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
index a5f48c6102d..49cb241ddda 100644
--- a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <!-- ActiveIssue in AssemblyInfo.cs for Mono -->
+    <IgnoreForCI Condition="'$(RuntimeFlavor)' == 'Mono'">true</IgnoreForCI>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs"
-- 
GitLab