From 5de3e0e2e68f776f76ca82b54021b06f9577fceb Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Wed, 10 Nov 2021 00:51:23 -0800
Subject: [PATCH] Add activeissues.targets and disable test

activeissues.targets is meant to only disable CI-blocking tests. This PR also
skips the DictionaryExpansion tests on Mono Android to address https://github.com/dotnet/runtime/issues/61322
---
 src/tests/activeissues.targets | 8 ++++++++
 src/tests/build.cmd            | 2 ++
 src/tests/build.proj           | 1 +
 src/tests/build.sh             | 2 ++
 4 files changed, 13 insertions(+)
 create mode 100644 src/tests/activeissues.targets

diff --git a/src/tests/activeissues.targets b/src/tests/activeissues.targets
new file mode 100644
index 0000000000000..fae9ee43a5d61
--- /dev/null
+++ b/src/tests/activeissues.targets
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<!-- Tracks ci-blocking issues -->
+<Project DefaultTargets = "GetListOfTestCmds" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DictionaryExpansion/*"
+        Condition="'$(RuntimeFlavor)' == 'mono' and '$(TargetOs)' == 'Android'">
+        <Issue>https://github.com/dotnet/runtime/issues/61322</Issue>
+    </ExcludeList>
+</Project>
\ No newline at end of file
diff --git a/src/tests/build.cmd b/src/tests/build.cmd
index 46e5ea5eb3079..9d9e431ee88af 100644
--- a/src/tests/build.cmd
+++ b/src/tests/build.cmd
@@ -32,6 +32,7 @@ set "__RootBinDir=%__RepoRootDir%\artifacts"
 set "__LogsDir=%__RootBinDir%\log"
 set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs"
 
+set __ActiveIssuesList=%__RepoRootDir%\src\tests\activeissues.targets
 :: Default __Exclude to issues.targets
 set __Exclude=%__RepoRootDir%\src\tests\issues.targets
 
@@ -119,6 +120,7 @@ if /i "%1" == "crossgen2"             (set __DoCrossgen2=1&set __TestBuildMode=c
 if /i "%1" == "composite"             (set __CompositeBuildMode=1&set __DoCrossgen2=1&set __TestBuildMode=crossgen2&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "pdb"                   (set __CreatePdb=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "perfmap"               (set __CreatePerfmap=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+if /i "%1" == "ActiveIssuesList"      (set __ActiveIssuesList=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop)
 if /i "%1" == "Exclude"               (set __Exclude=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop)
 if /i "%1" == "-priority"             (set __Priority=%2&shift&set processedArgs=!processedArgs! %1=%2&shift&goto Arg_Loop)
 if /i "%1" == "allTargets"            (set "__BuildNeedTargetArg=/p:CLRTestBuildAllTargets=%1"&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
diff --git a/src/tests/build.proj b/src/tests/build.proj
index f8f67ff905e33..dbd69bdb7d6f6 100644
--- a/src/tests/build.proj
+++ b/src/tests/build.proj
@@ -99,6 +99,7 @@
     </ItemGroup>
   </Target>
 
+  <Import Project="$(__ActiveIssuesList)" Condition="'$(__ActiveIssuesList)' != '' AND '$(XunitTestBinBase)' != ''" />
   <Import Project="$(__Exclude)" Condition="'$(__Exclude)' != '' AND '$(XunitTestBinBase)' != ''" />
   <PropertyGroup>
     <HaveExcludes>False</HaveExcludes>
diff --git a/src/tests/build.sh b/src/tests/build.sh
index 27ba8e3512d03..cba219a985547 100755
--- a/src/tests/build.sh
+++ b/src/tests/build.sh
@@ -6,6 +6,7 @@ build_Tests()
 
     __ProjectFilesDir="$__TestDir"
     __TestBinDir="$__TestWorkingDir"
+    __ActiveIssuesList="$__RepoRootDir/src/tests/activeissues.targets"
     __Exclude="$__RepoRootDir/src/tests/issues.targets"
 
     if [[ -f  "${__TestWorkingDir}/build_info.json" ]]; then
@@ -110,6 +111,7 @@ build_Tests()
     export __MonoBinDir
     export __MsgPrefix
     export __ErrMsgPrefix
+    export __ActiveIssuesList
     export __Exclude
 
     # Generate build command