-
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.
Merge remote-tracking branch 'origin/jajahoda/libmatrix-windows' into…
… jajahoda/libmatrix-windows
- Loading branch information
Showing
2 changed files
with
7 additions
and
16 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 |
|---|---|---|
|
|
@@ -124,47 +124,40 @@ jobs: | |
| # netcoreapp | ||
| - ${{ if notIn(parameters.jobParameters.framework, 'net48') }}: | ||
| - ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}: | ||
| - Windows.81.Amd64.Open | ||
| - Windows.10.Amd64.Server19H1.Open | ||
| - ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}: | ||
| - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: | ||
| - Windows.81.Amd64.Open | ||
| - Windows.10.Amd64.ServerRS5.Open | ||
| - Windows.10.Amd64.Server19H1.Open | ||
| - Windows.10.Amd64.Server19H1.ES.Open | ||
| - Windows.11.Amd64.ClientPre.Open | ||
| - ${{ if ne(parameters.jobParameters.runtimeFlavor, 'mono') }}: | ||
| - (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504 | ||
| - (Windows.Server.Core.1909.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c | ||
| - (Windows.Server.Core.20H2.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-20H2-helix-amd64-20210922171304-edc3733 | ||
| - (Windows.Server.Core.2004.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c | ||
| - ${{ if ne(parameters.jobParameters.isFullMatrix, true) }}: | ||
| - Windows.10.Amd64.Server19H1.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 | ||
| - (Windows.Server.Core.20H2.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-20H2-helix-amd64-20210922171304-edc3733 | ||
|
|
||
| # .NETFramework | ||
| - ${{ if eq(parameters.jobParameters.framework, 'net48') }}: | ||
| - Windows.10.Amd64.Client19H1.Open | ||
| - Windows.11.Amd64.ClientPre.Open | ||
|
|
||
| # windows x86 | ||
| - ${{ if eq(parameters.platform, 'windows_x86') }}: | ||
| # netcoreapp | ||
| - ${{ if notIn(parameters.jobParameters.framework, 'net48') }}: | ||
| - ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}: | ||
| - Windows.7.Amd64.Open | ||
| - Windows.10.Amd64.ServerRS5.Open | ||
| - ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}: | ||
| - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: | ||
| - Windows.7.Amd64.Open | ||
| - Windows.10.Amd64.ServerRS5.Open | ||
| - Windows.10.Amd64.Server19H1.Open | ||
| - Windows.11.Amd64.ClientPre.Open | ||
| - ${{ if ne(parameters.jobParameters.isFullMatrix, true) }}: | ||
| - ${{ if eq(parameters.jobParameters.buildConfig, 'Release') }}: | ||
| - Windows.10.Amd64.Server19H1.ES.Open | ||
| - ${{ if eq(parameters.jobParameters.buildConfig, 'Debug') }}: | ||
| - Windows.7.Amd64.Open | ||
| - Windows.10.Amd64.Server19H1.Open | ||
|
|
||
| # .NETFramework | ||
|
|
@@ -185,6 +178,6 @@ jobs: | |
|
|
||
| # WebAssembly windows | ||
| - ${{ if eq(parameters.platform, 'Browser_wasm_win') }}: | ||
| - (Windows.Server.Core.1909.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-webassembly-amd64-20210702131541-6837048 | ||
| - (Windows.Server.Core.2004.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-webassembly-amd64-20210702131541-6837048 | ||
|
|
||
| ${{ insert }}: ${{ parameters.jobParameters }} | ||