Skip to content

Move one more 20H2 queue to server 2022 #64919

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
merged 3 commits into from
Feb 7, 2022
Merged

Move one more 20H2 queue to server 2022 #64919

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
a147611
Move one more 20H2 queue to server 2022
sbomer Feb 7, 2022
9ff44f1
Update IsIcuCompatiblePlatform
sbomer Feb 7, 2022
95e0211
Remove left-over ActiveIssue attribute
sbomer Feb 7, 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
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- Windows.10.Amd64.ServerRS5.Open
- Windows.10.Amd64.Server20H2.Open
- Windows.Amd64.Server2022.Open
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- Windows.10.Amd64.Server19H1.ES.Open
- Windows.7.Amd64.Open
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