Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Merging internal commits for release/6.0 #83404

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 25 commits into from
Mar 14, 2023
Merged

Merging internal commits for release/6.0 #83404

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
54bb24f
Merge in 'release/6.0' changes
dotnet-bot Feb 8, 2023
c2c7afa
Merge in 'release/6.0' changes
dotnet-bot Feb 8, 2023
d411de8
Merge in 'release/6.0' changes
dotnet-bot Feb 8, 2023
3961581
Merge in 'release/6.0' changes
dotnet-bot Feb 8, 2023
3859f81
Merge in 'release/6.0' changes
dotnet-bot Feb 8, 2023
75e3eac
Merge in 'release/6.0' changes
dotnet-bot Feb 8, 2023
3d2923d
Merge in 'release/6.0' changes
dotnet-bot Feb 8, 2023
6275102
Merge in 'release/6.0' changes
dotnet-bot Feb 8, 2023
7f24ff7
Merge in 'release/6.0' changes
dotnet-bot Feb 8, 2023
b100014
Merge in 'release/6.0' changes
dotnet-bot Feb 8, 2023
1b85704
Merge in 'release/6.0' changes
dotnet-bot Feb 9, 2023
8c4e317
Merge in 'release/6.0' changes
dotnet-bot Feb 9, 2023
ca4d7bb
Merge in 'release/6.0' changes
dotnet-bot Feb 9, 2023
47b46c3
Merge in 'release/6.0' changes
dotnet-bot Feb 10, 2023
e0c5bf0
Merge in 'release/6.0' changes
dotnet-bot Feb 10, 2023
d0004a3
Merged PR 28980: Fix TimeZone when reading invalid TZ files
tarekgh Feb 10, 2023
3a8c500
Merge in 'release/6.0' changes
dotnet-bot Feb 10, 2023
d4a7595
Merge in 'release/6.0' changes
dotnet-bot Feb 11, 2023
4ef7e67
Merge in 'release/6.0' changes
dotnet-bot Feb 13, 2023
5789ff7
Merge in 'release/6.0' changes
dotnet-bot Feb 13, 2023
9b4f0e3
Merge in 'release/6.0' changes
dotnet-bot Feb 14, 2023
0aa8845
Merge in 'release/6.0' changes
dotnet-bot Feb 14, 2023
22da7ee
Merge in 'release/6.0' changes
dotnet-bot Feb 15, 2023
5edef4b
Merge in 'release/6.0' changes
dotnet-bot Feb 16, 2023
adc4201
Merge commit '5edef4b20babd4c3ddac7460e536f86fd0f2d724' into internal…
vseanreesermsft Mar 14, 2023
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
34 changes: 17 additions & 17 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,28 @@ jobs:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Ubuntu.1804.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Debian.10.Arm32)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm32v7-20210304164340-6616c63
- (Debian.11.Arm32)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7-20210304164347-5a7c380
- (Debian.10.Arm32)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm32v7
- (Debian.11.Arm32)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
- (Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7

# Linux arm64
- ${{ if eq(parameters.platform, 'Linux_arm64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Ubuntu.1804.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- (Debian.10.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm64v8-20210304164340-56c6673
- (Debian.11.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20210304164340-5a7c380
- (Debian.10.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm64v8
- (Debian.11.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Debian.10.Arm64)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm64v8-20210304164340-56c6673
- (Debian.11.Arm64)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20210304164340-5a7c380
- (Debian.10.Arm64)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm64v8
- (Debian.11.Arm64)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
- (Ubuntu.1804.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8

# Linux musl x64
- ${{ if eq(parameters.platform, 'Linux_musl_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
- (Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Alpine.314.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
- (Alpine.314.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64

# Linux musl arm32
- ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
Expand All @@ -89,17 +89,17 @@ jobs:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- Ubuntu.1804.Amd64.Open
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64-20210304164434-56c6673
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64-20210304164428-5a7c380
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
- Ubuntu.1804.Amd64.Open
- (Centos.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
- (Centos.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-8-helix
- RedHat.7.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Debian.10.Amd64)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64-20210304164434-56c6673
- (Debian.11.Amd64)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64-20210304164428-5a7c380
- (Debian.10.Amd64)[email protected]/dotnet-buildtools/prereqs:debian-10-helix
- (Debian.11.Amd64)[email protected]/dotnet-buildtools/prereqs:debian-11-helix
- Ubuntu.1804.Amd64
- (Centos.8.Amd64)[email protected]/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
- (Fedora.34.Amd64)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix-20210728124700-4f64125
- (Centos.8.Amd64)[email protected]/dotnet-buildtools/prereqs:centos-8-helix
- (Fedora.34.Amd64)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix
- RedHat.7.Amd64

# OSX arm64
Expand All @@ -121,7 +121,7 @@ jobs:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- Windows.10.Amd64.Open
- ${{ 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.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64
- Windows.7.Amd64.Open
- Windows.81.Amd64.Open
- Windows.10.Amd64.Open
Expand All @@ -130,7 +130,7 @@ jobs:
- Windows.81.Amd64
- Windows.10.Amd64
- Windows.10.Amd64.Core
- (Windows.Nano.1809.Amd64)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504
- (Windows.Nano.1809.Amd64)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64

# windows x86
- ${{ if eq(parameters.platform, 'windows_x86') }}:
Expand Down
50 changes: 25 additions & 25 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ jobs:
# Linux arm
- ${{ if eq(parameters.platform, 'Linux_arm') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Debian.10.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm32v7-20210304164340-6616c63
- (Debian.11.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7-20210304164347-5a7c380
- (Debian.10.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm32v7
- (Debian.11.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7

# Linux arm64
- ${{ if eq(parameters.platform, 'Linux_arm64') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Ubuntu.1804.Arm64.Open)Ubuntu.1804.Armarch[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20230201170341-8b7d579
- (Ubuntu.1804.ArmArch.Open)Ubuntu.1804.ArmArch[email protected]/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- (Ubuntu.1804.Arm64.Open)Ubuntu.1804.Armarch[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20230201170341-8b7d579
- (Ubuntu.1804.ArmArch.Open)Ubuntu.1804.ArmArch[email protected]/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8

# Linux musl x64
- ${{ if eq(parameters.platform, 'Linux_musl_x64') }}:
- (Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19
- (Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Alpine.313.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.13-helix-amd64-20210910135845-8a6f4f3
- (Alpine.313.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.13-helix-amd64

# Linux musl arm64
- ${{ if and(eq(parameters.platform, 'Linux_musl_arm64'), eq(parameters.jobParameters.isFullMatrix, true)) }}:
Expand All @@ -54,33 +54,33 @@ jobs:
- ${{ if eq(parameters.platform, 'Linux_x64') }}:
- ${{ if and(eq(parameters.jobParameters.interpreter, ''), ne(parameters.jobParameters.isSingleFile, true)) }}:
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- (Centos.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
- (Centos.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-8-helix
- RedHat.7.Amd64.Open
- SLES.15.Amd64.Open
- (Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix-20210913123654-4f64125
- (Ubuntu.1910.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-19.10-helix-amd64-cfcfd50-20191030180623
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64-bfcd90a-20200121150006
- (Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix
- (Ubuntu.1910.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-19.10-helix-amd64
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210714125435-dde38af
- (Centos.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-8-helix-20201229003624-c1bf759
- (Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix
- (Centos.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-8-helix
- RedHat.7.Amd64.Open
- Ubuntu.1804.Amd64.Open
- SLES.12.Amd64.Open
- SLES.15.Amd64.Open
- (Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix-20210913123654-4f64125
- (Ubuntu.1910.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-19.10-helix-amd64-cfcfd50-20191030180623
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64-20210304164434-56c6673
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64-20210304164428-5a7c380
- (Mariner.1.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620
- (Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix
- (Ubuntu.1910.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-19.10-helix-amd64
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
- (Mariner.1.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- (Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210714125435-dde38af
- (Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix
- RedHat.7.Amd64.Open
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64-20210304164434-56c6673
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
- Ubuntu.1804.Amd64.Open
- ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}:
# Limiting interp runs as we don't need as much coverage.
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64-20210304164434-56c6673
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64

# Linux s390x
- ${{ if eq(parameters.platform, 'Linux_s390x') }}:
Expand Down Expand Up @@ -129,16 +129,16 @@ jobs:
- Windows.10.Amd64.ServerRS5.Open
- Windows.Amd64.Server2022.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.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64
- (Windows.Server.Core.1909.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64
- ${{ if ne(parameters.jobParameters.isFullMatrix, true) }}:
- Windows.81.Amd64.Open
- Windows.10.Amd64.Server2022.ES.Open
- Windows.11.Amd64.Client.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.1909.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64
- ${{ if ne(parameters.jobParameters.runtimeFlavor, 'mono') }}:
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64

# .NETFramework
- ${{ if eq(parameters.jobParameters.framework, 'net48') }}:
Expand Down Expand Up @@ -181,6 +181,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.1909.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-webassembly-amd64

${{ insert }}: ${{ parameters.jobParameters }}