mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update EOL versions (#19119)

Browse source 
Co-authored-by: Michael Simons <msimons@microsoft.com>
This commit is contained in:
Rich Lander 2024-04-04 15:35:56 -07:00 committed by GitHub
parent 690d1b64ea
commit aed5a97477
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 70 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.vsts-ci.yml
View file

@ -56,8 +56,8 @@ extends:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
cblMariner20Fpm: cblMariner20Fpm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
centosStream8: centosStream9:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
debian11Amd64: debian11Amd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
fedora39: fedora39:
@ -128,8 +128,8 @@ extends:
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_CentOS_8_Stream_Debug_x64 jobName: Build_CentOS_9_Stream_Debug_x64
container: centosStream8 container: centosStream9
buildConfiguration: Debug buildConfiguration: Debug
buildArchitecture: x64 buildArchitecture: x64
linuxPortable: false linuxPortable: false

4
eng/build-pr.yml
View file

@ -91,10 +91,10 @@ jobs:
pool: pool:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool) name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $(DncEngInternalBuildPool) name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
container: ${{ parameters.container }} container: ${{ parameters.container }}
${{ if eq(parameters.agentOs, 'Darwin') }}: ${{ if eq(parameters.agentOs, 'Darwin') }}:
pool: pool:

140
eng/pipelines/templates/stages/vmr-build.yml
View file

@ -78,12 +78,12 @@ stages:
- template: ../jobs/vmr-build.yml - template: ../jobs/vmr-build.yml
parameters: parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: CentOSStream8_Online_MsftSdk buildName: CentOSStream9_Online_MsftSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }} vmrBranch: ${{ variables.VmrBranch }}
architecture: x64 architecture: x64
pool: ${{ parameters.pool_Linux }} pool: ${{ parameters.pool_Linux }}
container: ${{ variables.centOSStream8Container }} container: ${{ variables.centOSStream9Container }}
buildFromArchive: false # 🚫 buildFromArchive: false # 🚫
buildSourceOnly: true # ✅ buildSourceOnly: true # ✅
enablePoison: false # 🚫 enablePoison: false # 🚫
@ -99,12 +99,12 @@ stages:
- template: ../jobs/vmr-build.yml - template: ../jobs/vmr-build.yml
parameters: parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: CentOSStream8_Online_CurrentSourceBuiltSdk buildName: CentOSStream9_Online_CurrentSourceBuiltSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }} vmrBranch: ${{ variables.VmrBranch }}
architecture: x64 architecture: x64
pool: ${{ parameters.pool_Linux }} pool: ${{ parameters.pool_Linux }}
container: ${{ variables.centOSStream8Container }} container: ${{ variables.centOSStream9Container }}
buildFromArchive: false # 🚫 buildFromArchive: false # 🚫
buildSourceOnly: true # ✅ buildSourceOnly: true # ✅
enablePoison: false # 🚫 enablePoison: false # 🚫
@ -113,7 +113,7 @@ stages:
runTests: true # ✅ runTests: true # ✅
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
reuseBuildArtifactsFrom: CentOSStream8_Online_MsftSdk reuseBuildArtifactsFrom: centOSStream9_Online_MsftSdk
- template: ../jobs/vmr-build.yml - template: ../jobs/vmr-build.yml
parameters: parameters:
@ -155,80 +155,6 @@ stages:
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
- template: ../jobs/vmr-build.yml
parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: CentOSStream8_Offline_MsftSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.centOSStream8Container }}
buildFromArchive: true # ✅
buildSourceOnly: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
runOnline: false # 🚫
runTests: true # ✅
useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫
- template: ../jobs/vmr-build.yml
parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: CentOSStream8_Online_PreviousSourceBuiltSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
artifactsRid: centos.8-x64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.centOSStream8Container }}
buildFromArchive: false # 🚫
buildSourceOnly: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
runOnline: true # ✅
runTests: true # ✅
useMonoRuntime: false # 🚫
withPreviousSDK: true # ✅
- template: ../jobs/vmr-build.yml
parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: CentOSStream8_Offline_PreviousSourceBuiltSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
artifactsRid: centos.8-x64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.centOSStream8Container }}
buildFromArchive: false # 🚫
buildSourceOnly: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
runOnline: false # 🚫
runTests: true # ✅
useMonoRuntime: false # 🚫
withPreviousSDK: true # ✅
- template: ../jobs/vmr-build.yml
parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: CentOSStream8_Mono_Offline_MsftSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.centOSStream8Container }}
buildFromArchive: true # ✅
buildSourceOnly: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
runOnline: false # 🚫
runTests: true # ✅
useMonoRuntime: true # ✅
withPreviousSDK: false # 🚫
- template: ../jobs/vmr-build.yml - template: ../jobs/vmr-build.yml
parameters: parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
@ -247,6 +173,62 @@ stages:
useMonoRuntime: false # 🚫 useMonoRuntime: false # 🚫
withPreviousSDK: false # 🚫 withPreviousSDK: false # 🚫
- template: ../jobs/vmr-build.yml
parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: CentOSStream9_Online_PreviousSourceBuiltSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
artifactsRid: centos.9-x64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.centOSStream9Container }}
buildFromArchive: false # 🚫
buildSourceOnly: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫
runOnline: true # ✅
runTests: true # ✅
useMonoRuntime: false # 🚫
withPreviousSDK: true # ✅
- template: ../jobs/vmr-build.yml
parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: CentOSStream9_Offline_PreviousSourceBuiltSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
artifactsRid: centos.9-x64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.centOSStream9Container }}
buildFromArchive: false # 🚫
buildSourceOnly: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
runOnline: false # 🚫
runTests: true # ✅
useMonoRuntime: false # 🚫
withPreviousSDK: true # ✅
- template: ../jobs/vmr-build.yml
parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: CentOSStream9_Mono_Offline_MsftSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool: ${{ parameters.pool_Linux }}
container: ${{ variables.centOSStream9Container }}
buildFromArchive: true # ✅
buildSourceOnly: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
runOnline: false # 🚫
runTests: true # ✅
useMonoRuntime: true # ✅
withPreviousSDK: false # 🚫
- template: ../jobs/vmr-build.yml - template: ../jobs/vmr-build.yml
parameters: parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline

2
eng/pipelines/templates/variables/vmr-build.yml
View file

@ -12,8 +12,6 @@ variables:
- name: alpine319Container - name: alpine319Container
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
- name: centOSStream8Container
value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
- name: centOSStream9Container - name: centOSStream9Container
value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
- name: fedora39Container - name: fedora39Container

9
src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
View file

@ -21,20 +21,13 @@ parameters:
default: ' ' default: ' '
jobs: jobs:
- template: templates/jobs/sdk-diff-tests.yml
parameters:
buildName: CentOSStream8_Offline_MsftSdk
targetRid: centos.8-x64
architecture: x64
dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}
includeArtifactsSize: true
- template: templates/jobs/sdk-diff-tests.yml - template: templates/jobs/sdk-diff-tests.yml
parameters: parameters:
buildName: CentOSStream9_Offline_MsftSdk buildName: CentOSStream9_Offline_MsftSdk
targetRid: centos.9-x64 targetRid: centos.9-x64
architecture: x64 architecture: x64
dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}
includeArtifactsSize: true
- template: templates/jobs/sdk-diff-tests.yml - template: templates/jobs/sdk-diff-tests.yml
parameters: parameters:

4
src/SourceBuild/content/prep-source-build.sh
View file

@ -12,7 +12,7 @@
### --no-prebuilts Exclude the download of the prebuilts archive ### --no-prebuilts Exclude the download of the prebuilts archive
### --no-sdk Exclude the download of the .NET SDK ### --no-sdk Exclude the download of the .NET SDK
### --artifacts-rid The RID of the previously source-built artifacts archive to download ### --artifacts-rid The RID of the previously source-built artifacts archive to download
### Default is centos.8-x64 ### Default is centos.9-x64
### --runtime-source-feed URL of a remote server or a local directory, from which SDKs and ### --runtime-source-feed URL of a remote server or a local directory, from which SDKs and
### runtimes can be downloaded ### runtimes can be downloaded
### --runtime-source-feed-key Key for accessing the above server, if necessary ### --runtime-source-feed-key Key for accessing the above server, if necessary
@ -35,7 +35,7 @@ function print_help () {
} }
# SB prep default arguments # SB prep default arguments
defaultArtifactsRid='centos.8-x64' defaultArtifactsRid='centos.9-x64'
# Binary Tooling default arguments # Binary Tooling default arguments
defaultDotnetSdk="$REPO_ROOT/.dotnet" defaultDotnetSdk="$REPO_ROOT/.dotnet"