Skip to content

[release/6.0] Port ICU tests fix for server core x86 #65038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
safern merged 3 commits into from
Feb 14, 2022
Merged

[release/6.0] Port ICU tests fix for server core x86 #65038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51a706a
[release/6.0] Port ICU tests fix for server core x86
safern Feb 9, 2022
d4e6c73
Update src/libraries/System.Globalization/tests/IcuTests.cs
tarekgh Feb 10, 2022
57536be
Add PlatformDetection.IsX86Process
akoeplinger Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public static partial class PlatformDetection
public static bool IsNotArm64Process => !IsArm64Process;
public static bool IsArmOrArm64Process => IsArmProcess || IsArm64Process;
public static bool IsNotArmNorArm64Process => !IsArmOrArm64Process;
public static bool IsX86Process => RuntimeInformation.ProcessArchitecture == Architecture.X86;
public static bool IsArgIteratorSupported => IsMonoRuntime || (IsWindows && IsNotArmProcess);
public static bool IsArgIteratorNotSupported => !IsArgIteratorSupported;
public static bool Is32BitProcess => IntPtr.Size == 4;
Expand Down
4 changes: 3 additions & 1 deletion src/libraries/System.Globalization/tests/IcuTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ namespace System.Globalization.Tests
public class IcuTests
{
private static bool IsIcuCompatiblePlatform => PlatformDetection.IsNotWindows ||
PlatformDetection.IsWindows10Version1903OrGreater;
PlatformDetection.IsWindows10Version1903OrGreater &&
// Server core doesn't have icu.dll on SysWOW64
!(PlatformDetection.IsWindowsServerCore && PlatformDetection.IsX86Process);

[ConditionalFact(nameof(IsIcuCompatiblePlatform))]
public static void IcuShouldBeUsedByDefault()
Expand Down