[release/7.0-rc1] Move runtimeconfig.template.json stuff to csproj (#…

…74144) * Move runtimeconfig.template.json stuff to csproj NativeAOT ignores this and emits a warning. This fails the test build. * It wasn't just one * Update src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj Co-authored-by: Michal Strehovský <[email protected]> Co-authored-by: Jan Kotas <[email protected]>
dotnet · carlossanlop · Aug 19, 2022 · Aug 17, 2022 · Aug 17, 2022 · Aug 17, 2022
commit 08fdcb7e2d86292b529e7d662b691d8c86de678d
diff --git a/...ce/tests/TestWithConfigSwitches/System.Diagnostics.DiagnosticSource.Switches.Tests.csproj b/...ce/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/...tem.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/runtimeconfig.template.json b/...tem.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/runtimeconfig.template.json
diff --git a/....Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj b/....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
diff --git a/src/libraries/System.Resources.ResourceManager/tests/runtimeconfig.template.json b/src/libraries/System.Resources.ResourceManager/tests/runtimeconfig.template.json
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
@@ -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