-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* CI matrix change: Windows * Remove Windows Server RS5 * Revert .net Framework change * Add 19H1 to rolling * Add Windows.Server.Core.20H2 to CI matrix * Remove Windows 8.1 * Remove 20H2 as thhere is a PR for it #60054 * Typo Co-authored-by: Jan Jahoda <[email protected]> Co-authored-by: Andy Gocke <[email protected]> Co-authored-by: Dan Moseley <[email protected]>
- Loading branch information
4 people
authored
Mar 28, 2022
1 parent
4019e83
commit bd43f55
Showing
2 changed files
with
7 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -124,7 +124,6 @@ jobs: | |
| - ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: | ||
| - (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504 | ||
| - Windows.7.Amd64.Open | ||
| - Windows.81.Amd64.Open | ||
| - Windows.10.Amd64.Open | ||
| - ${{ if eq(variables['System.TeamProject'], 'internal') }}: | ||
| - Windows.7.Amd64 | ||
|
|
@@ -139,7 +138,6 @@ jobs: | |
| - Windows.10.Amd64.Open | ||
| - ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: | ||
| - Windows.7.Amd64.Open | ||
| - Windows.81.Amd64.Open | ||
| - Windows.10.Amd64.Open | ||
| - ${{ if eq(variables['System.TeamProject'], 'internal') }}: | ||
| - Windows.7.Amd64 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -125,27 +125,26 @@ jobs: | |
| - ${{ if notIn(parameters.jobParameters.framework, 'net48') }}: | ||
| # libraries on mono outerloop | ||
| - ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}: | ||
| - Windows.81.Amd64.Open | ||
| - Windows.Amd64.Server2022.Open | ||
| # libraries on coreclr (outerloop and innerloop), or libraries on mono innerloop | ||
| - ${{ 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.Amd64.Server2022.Open | ||
| - ${{ if ne(parameters.jobParameters.testScope, 'outerloop') }}: | ||
| - Windows.Amd64.Server2022.Open | ||
| - (Windows.Server.Core.1909.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c | ||
| - (Windows.Server.Core.2004.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c | ||
| - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: | ||
| - Windows.81.Amd64.Open | ||
| - Windows.10.Amd64.Server2022.ES.Open | ||
| - Windows.11.Amd64.ClientPre.Open | ||
| - ${{ if eq(parameters.jobParameters.testScope, 'outerloop') }}: | ||
| - (Windows.Server.Core.1909.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c | ||
| - (Windows.Server.Core.2004.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c | ||
| - ${{ if ne(parameters.jobParameters.runtimeFlavor, 'mono') }}: | ||
| - (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504 | ||
|
|
||
| # .NETFramework | ||
| - ${{ if eq(parameters.jobParameters.framework, 'net48') }}: | ||
| - Windows.10.Amd64.Client21H1.Open | ||
| - Windows.11.Amd64.ClientPre.Open | ||
|
|
||
|
|
||
| # windows x86 | ||
| - ${{ if eq(parameters.platform, 'windows_x86') }}: | ||
|
|
@@ -154,11 +153,11 @@ jobs: | |
| # mono outerloop | ||
| - ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}: | ||
| - Windows.7.Amd64.Open | ||
| - Windows.10.Amd64.ServerRS5.Open | ||
| - Windows.11.Amd64.ClientPre.Open | ||
| # libraries on coreclr (outerloop and innerloop), or libraries on mono innerloop | ||
| - ${{ 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.11.Amd64.ClientPre.Open | ||
| - Windows.Amd64.Server2022.Open | ||
| - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: | ||
| - Windows.10.Amd64.Server2022.ES.Open | ||
|
|
||