From 4a59ba10233dfcf7a998b7daf2d558140b8907a8 Mon Sep 17 00:00:00 2001
From: Nathan Ricci <naricc@microsoft.com>
Date: Mon, 14 Jun 2021 13:59:14 -0400
Subject: [PATCH 1/6] Added interpreter test.

---
 .../monointerpreter/runningmonointerpreter.cs | 28 +++++++++++++++++++
 .../runningmonointerpreter.csproj             | 11 ++++++++
 src/tests/issues.targets                      |  6 ++++
 3 files changed, 45 insertions(+)
 create mode 100644 src/tests/baseservices/monointerpreter/runningmonointerpreter.cs
 create mode 100644 src/tests/baseservices/monointerpreter/runningmonointerpreter.csproj

diff --git a/src/tests/baseservices/monointerpreter/runningmonointerpreter.cs b/src/tests/baseservices/monointerpreter/runningmonointerpreter.cs
new file mode 100644
index 00000000000000..0fdf32c821bde5
--- /dev/null
+++ b/src/tests/baseservices/monointerpreter/runningmonointerpreter.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+using System;
+using System.Runtime.CompilerServices;
+
+namespace TestRunningMono
+{
+    class Program
+    {
+        public static int Main(string[] args)
+        {
+             const int Pass = 100, Fail = 1;
+             bool isMono = typeof(object).Assembly.GetType("Mono.RuntimeStructs") != null;
+
+	         bool isInterpreter = RuntimeFeature.IsDynamicCodeSupported == true && RuntimeFeature.IsDynamicCodeCompiled == false;
+
+             if(isMono && isInterpreter)
+             {
+                 return Pass;
+             }
+             else
+             {
+                 return Fail;
+             }
+        }
+   }
+}
+
diff --git a/src/tests/baseservices/monointerpreter/runningmonointerpreter.csproj b/src/tests/baseservices/monointerpreter/runningmonointerpreter.csproj
new file mode 100644
index 00000000000000..ee1662480ee655
--- /dev/null
+++ b/src/tests/baseservices/monointerpreter/runningmonointerpreter.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <Optimize>false</Optimize>
+    <CLRTestPriority>0</CLRTestPriority>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="runningmonointerpreter.cs" />
+  </ItemGroup>
+</Project>
+
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 06867ff7ee8a1f..806ba20c8cb1f3 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -3147,4 +3147,10 @@
             <Issue>https://github.com/dotnet/runtime/issues/52781</Issue>
         </ExcludeList>
     </ItemGroup>
+
+    <ItemGroup Condition=" '$(RuntimeVariant)' != 'monointerpreter' or '$(RuntimeFlavor)' != 'mono' " >
+        <ExcludeList Include = "$(XunitTestBinBase)/baseservices/monointerpreter/**">
+            <Issue>This test tests that we are running the mono interpreter, and so is excluded in all other cases.</Issue>
+        </ExcludeList>
+    </ItemGroup>
 </Project>

From 2ab9b9e1ea4f02e02150622b51fb0e9f33fb5f7d Mon Sep 17 00:00:00 2001
From: Nathan Ricci <naricc@microsoft.com>
Date: Thu, 1 Jul 2021 12:09:07 -0400
Subject: [PATCH 2/6] Simplified condition.

---
 src/tests/issues.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 806ba20c8cb1f3..4d17d69328bab9 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -3148,7 +3148,7 @@
         </ExcludeList>
     </ItemGroup>
 
-    <ItemGroup Condition=" '$(RuntimeVariant)' != 'monointerpreter' or '$(RuntimeFlavor)' != 'mono' " >
+    <ItemGroup Condition=" '$(RuntimeVariant)' != 'monointerpreter' " >
         <ExcludeList Include = "$(XunitTestBinBase)/baseservices/monointerpreter/**">
             <Issue>This test tests that we are running the mono interpreter, and so is excluded in all other cases.</Issue>
         </ExcludeList>

From 04b075537d83eea2c31b7069164bbdecf9779651 Mon Sep 17 00:00:00 2001
From: Nathan Ricci <naricc@microsoft.com>
Date: Thu, 1 Jul 2021 12:09:27 -0400
Subject: [PATCH 3/6] Fixed whitespace.

---
 .../baseservices/monointerpreter/runningmonointerpreter.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/baseservices/monointerpreter/runningmonointerpreter.cs b/src/tests/baseservices/monointerpreter/runningmonointerpreter.cs
index 0fdf32c821bde5..dc549cde695190 100644
--- a/src/tests/baseservices/monointerpreter/runningmonointerpreter.cs
+++ b/src/tests/baseservices/monointerpreter/runningmonointerpreter.cs
@@ -12,7 +12,7 @@ public static int Main(string[] args)
              const int Pass = 100, Fail = 1;
              bool isMono = typeof(object).Assembly.GetType("Mono.RuntimeStructs") != null;
 
-	         bool isInterpreter = RuntimeFeature.IsDynamicCodeSupported == true && RuntimeFeature.IsDynamicCodeCompiled == false;
+             bool isInterpreter = RuntimeFeature.IsDynamicCodeSupported == true && RuntimeFeature.IsDynamicCodeCompiled == false;
 
              if(isMono && isInterpreter)
              {

From 3fba274eb8ef8a69d53c431d206bf4e7adef5f43 Mon Sep 17 00:00:00 2001
From: Nathan Ricci <naricc@microsoft.com>
Date: Thu, 1 Jul 2021 12:12:34 -0400
Subject: [PATCH 4/6] Moved runninginterpreter test into mono test directory.

---
 src/tests/baseservices/mono/{ => runningmono}/runningmono.cs      | 0
 src/tests/baseservices/mono/{ => runningmono}/runningmono.csproj  | 0
 .../runningmonointerpreter}/runningmonointerpreter.cs             | 0
 .../runningmonointerpreter}/runningmonointerpreter.csproj         | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename src/tests/baseservices/mono/{ => runningmono}/runningmono.cs (100%)
 rename src/tests/baseservices/mono/{ => runningmono}/runningmono.csproj (100%)
 rename src/tests/baseservices/{monointerpreter => mono/runningmonointerpreter}/runningmonointerpreter.cs (100%)
 rename src/tests/baseservices/{monointerpreter => mono/runningmonointerpreter}/runningmonointerpreter.csproj (100%)

diff --git a/src/tests/baseservices/mono/runningmono.cs b/src/tests/baseservices/mono/runningmono/runningmono.cs
similarity index 100%
rename from src/tests/baseservices/mono/runningmono.cs
rename to src/tests/baseservices/mono/runningmono/runningmono.cs
diff --git a/src/tests/baseservices/mono/runningmono.csproj b/src/tests/baseservices/mono/runningmono/runningmono.csproj
similarity index 100%
rename from src/tests/baseservices/mono/runningmono.csproj
rename to src/tests/baseservices/mono/runningmono/runningmono.csproj
diff --git a/src/tests/baseservices/monointerpreter/runningmonointerpreter.cs b/src/tests/baseservices/mono/runningmonointerpreter/runningmonointerpreter.cs
similarity index 100%
rename from src/tests/baseservices/monointerpreter/runningmonointerpreter.cs
rename to src/tests/baseservices/mono/runningmonointerpreter/runningmonointerpreter.cs
diff --git a/src/tests/baseservices/monointerpreter/runningmonointerpreter.csproj b/src/tests/baseservices/mono/runningmonointerpreter/runningmonointerpreter.csproj
similarity index 100%
rename from src/tests/baseservices/monointerpreter/runningmonointerpreter.csproj
rename to src/tests/baseservices/mono/runningmonointerpreter/runningmonointerpreter.csproj

From 86249be40341ae56c1d6a36a73bdc2234ee4b9f6 Mon Sep 17 00:00:00 2001
From: Nathan Ricci <naricc@microsoft.com>
Date: Thu, 1 Jul 2021 14:43:39 -0400
Subject: [PATCH 5/6] Fixed paths in issues.targets.

---
 src/tests/issues.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 4d17d69328bab9..5d9e5388d4a3f7 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -3149,7 +3149,7 @@
     </ItemGroup>
 
     <ItemGroup Condition=" '$(RuntimeVariant)' != 'monointerpreter' " >
-        <ExcludeList Include = "$(XunitTestBinBase)/baseservices/monointerpreter/**">
+        <ExcludeList Include = "$(XunitTestBinBase)/baseservices/mono/runningmonointerpreter/**">
             <Issue>This test tests that we are running the mono interpreter, and so is excluded in all other cases.</Issue>
         </ExcludeList>
     </ItemGroup>

From 5aad96880c448c5805bc45a95fd316725cd0a30b Mon Sep 17 00:00:00 2001
From: Nathan Ricci <naricc@microsoft.com>
Date: Fri, 2 Jul 2021 16:02:31 -0400
Subject: [PATCH 6/6] Fix path.

---
 src/tests/issues.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 5d9e5388d4a3f7..6f991101ccfc69 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -3149,7 +3149,7 @@
     </ItemGroup>
 
     <ItemGroup Condition=" '$(RuntimeVariant)' != 'monointerpreter' " >
-        <ExcludeList Include = "$(XunitTestBinBase)/baseservices/mono/runningmonointerpreter/**">
+        <ExcludeList Include = "$(XunitTestBinBase)/baseservices/baseservices/mono/runningmonointerpreter/**">
             <Issue>This test tests that we are running the mono interpreter, and so is excluded in all other cases.</Issue>
         </ExcludeList>
     </ItemGroup>