Fix Globalization tests (#72653)

* Fix Globalization tests * enable test in rolling runs
dotnet · Jul 22, 2022 · 0fbdb1e · 0fbdb1e
1 parent a969c53
commit 0fbdb1e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
@@ -6,6 +6,9 @@
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <UnicodeUcdVersion>14.0</UnicodeUcdVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <RdXmlFile Include="default.rd.xml" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="IcuTests.cs" />

diff --git a/src/libraries/System.Globalization/tests/default.rd.xml b/src/libraries/System.Globalization/tests/default.rd.xml
@@ -0,0 +1,15 @@
+<Directives>
+  <Application>
+    <Assembly Name="System.Linq">
+      <!-- called by xUnit in obscure MemberData scenarios  -->
+      <Type Name="System.Linq.Enumerable">
+        <Method Name="Cast" Dynamic="Required All">
+          <GenericArgument Name="System.Globalization.UnicodeCategory,System.Globalization" />
+        </Method>
+        <Method Name="ToArray" Dynamic="Required All">
+          <GenericArgument Name="System.Globalization.UnicodeCategory,System.Globalization" />
+        </Method>
+      </Type>
+    </Assembly>    
+  </Application>
+</Directives>
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
@@ -511,7 +511,6 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Drawing.Primitives\tests\System.Drawing.Primitives.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Dynamic.Runtime\tests\System.Dynamic.Runtime.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Formats.Cbor\tests\System.Formats.Cbor.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Globalization\tests\System.Globalization.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Globalization\tests\NlsTests\System.Globalization.Nls.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Globalization.Calendars\tests\CalendarTestWithConfigSwitch\System.Globalization.CalendarsWithConfigSwitch.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Queryable\tests\System.Linq.Queryable.Tests.csproj" />