From e8994f07aab02706334605c3c76f4f3a3a4a527b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Thu, 18 Aug 2022 11:56:52 +0900
Subject: [PATCH 1/3] Move runtimeconfig.template.json stuff to csproj

NativeAOT ignores this and emits a warning. This fails the test build.
---
 .../tests/System.Resources.ResourceManager.Tests.csproj      | 3 +++
 .../tests/runtimeconfig.template.json                        | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 src/libraries/System.Resources.ResourceManager/tests/runtimeconfig.template.json

diff --git a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
index 66cb937a3d1e20..2094592859a52c 100644
--- a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
+++ b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
@@ -63,6 +63,9 @@
     <!--Reference to System.Resources.Extensions is required in order to be able to embed a resource that requires a custom reader-->
     <ProjectReference Include="$(LibrariesProjectRoot)System.Resources.Extensions\src\System.Resources.Extensions.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="System.Drawing.EnableUnixSupport" Value="true" />
+  </ItemGroup>
   <!--
     MSBuild on .NET Core doesn't support non-string resources. See https://github.com/Microsoft/msbuild/issues/2221
     Workaround this for now by invoking the desktop resgen.exe on Windows manually to regenerate the resource files.
diff --git a/src/libraries/System.Resources.ResourceManager/tests/runtimeconfig.template.json b/src/libraries/System.Resources.ResourceManager/tests/runtimeconfig.template.json
deleted file mode 100644
index e3ad204dd9e512..00000000000000
--- a/src/libraries/System.Resources.ResourceManager/tests/runtimeconfig.template.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "configProperties": {
-        "System.Drawing.EnableUnixSupport": true
-    }
-}
\ No newline at end of file

From 2883db5407b58cbc9934dcdf90291356bc8373d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Thu, 18 Aug 2022 15:30:22 +0900
Subject: [PATCH 2/3] It wasn't just one

---
 ...System.Diagnostics.DiagnosticSource.Switches.Tests.csproj | 3 +++
 .../tests/TestWithConfigSwitches/runtimeconfig.template.json | 5 -----
 .../System.Globalization.Extensions.Nls.Tests.csproj         | 3 +++
 .../tests/NlsTests/runtimeconfig.template.json               | 5 -----
 .../tests/NlsTests/System.Runtime.Nls.Tests.csproj           | 3 +++
 .../tests/NlsTests/runtimeconfig.template.json               | 5 -----
 6 files changed, 9 insertions(+), 15 deletions(-)
 delete mode 100644 src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/runtimeconfig.template.json
 delete mode 100644 src/libraries/System.Globalization.Extensions/tests/NlsTests/runtimeconfig.template.json
 delete mode 100644 src/libraries/System.Runtime/tests/NlsTests/runtimeconfig.template.json

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/System.Diagnostics.DiagnosticSource.Switches.Tests.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/System.Diagnostics.DiagnosticSource.Switches.Tests.csproj
index e9dd8a7adec528..90a660f236118d 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/System.Diagnostics.DiagnosticSource.Switches.Tests.csproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/System.Diagnostics.DiagnosticSource.Switches.Tests.csproj
@@ -3,6 +3,9 @@
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="System.Diagnostics.DefaultActivityIdFormatIsHierarchial" Value="true" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="ActivityTests.cs" />
   </ItemGroup>
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/runtimeconfig.template.json b/src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/runtimeconfig.template.json
deleted file mode 100644
index 1b600a96bff58a..00000000000000
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/runtimeconfig.template.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "configProperties": {
-    "System.Diagnostics.DefaultActivityIdFormatIsHierarchial": true
-  }
-}
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj b/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj
index 573565c9decac6..61a409ffedc326 100644
--- a/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj
+++ b/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj
@@ -3,6 +3,9 @@
     <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="System.Globalization.UseNls" Value="true" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GetStringComparerTests.cs"
              Link="GetStringComparerTests.cs" />
diff --git a/src/libraries/System.Globalization.Extensions/tests/NlsTests/runtimeconfig.template.json b/src/libraries/System.Globalization.Extensions/tests/NlsTests/runtimeconfig.template.json
deleted file mode 100644
index ec1e96166f3b3c..00000000000000
--- a/src/libraries/System.Globalization.Extensions/tests/NlsTests/runtimeconfig.template.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "configProperties": {
-    "System.Globalization.UseNls": true
-  }
-}
diff --git a/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj b/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj
index b93223c66887c6..849edc8cd5c2c1 100644
--- a/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj
+++ b/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj
@@ -6,6 +6,9 @@
     <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
     <NoWarn>$(NoWarn),SYSLIB0013</NoWarn>
   </PropertyGroup>
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="System.Globalization.UseNls" Value="true" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Helpers.cs"
              Link="Helpers.cs" />
diff --git a/src/libraries/System.Runtime/tests/NlsTests/runtimeconfig.template.json b/src/libraries/System.Runtime/tests/NlsTests/runtimeconfig.template.json
deleted file mode 100644
index f93c6039127bd1..00000000000000
--- a/src/libraries/System.Runtime/tests/NlsTests/runtimeconfig.template.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "configProperties": {
-        "System.Globalization.UseNls": true
-    }
-}

From 5adc2569d74a6d63f4a6e33ccbf048951f3fdb25 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Thu, 18 Aug 2022 08:52:58 +0200
Subject: [PATCH 3/3] Update
 src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj

---
 .../tests/System.Resources.ResourceManager.Tests.csproj        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
index 2094592859a52c..66cb937a3d1e20 100644
--- a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
+++ b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
@@ -63,9 +63,6 @@
     <!--Reference to System.Resources.Extensions is required in order to be able to embed a resource that requires a custom reader-->
     <ProjectReference Include="$(LibrariesProjectRoot)System.Resources.Extensions\src\System.Resources.Extensions.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <RuntimeHostConfigurationOption Include="System.Drawing.EnableUnixSupport" Value="true" />
-  </ItemGroup>
   <!--
     MSBuild on .NET Core doesn't support non-string resources. See https://github.com/Microsoft/msbuild/issues/2221
     Workaround this for now by invoking the desktop resgen.exe on Windows manually to regenerate the resource files.