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

Merge branch 'release/8.0.2xx' into release/8.0.3xx

Browse source
This commit is contained in:
Jason Zhai 2024-04-18 22:55:12 -07:00
commit 4be0f59c87
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.vsts-ci.yml
View file

@ -64,8 +64,8 @@ extends:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
ubuntu2204: ubuntu2204:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
ubuntu2204CrossArmAlpine: mariner20CrossArm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine image: mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm
ubuntu2204DebPkg: ubuntu2204DebPkg:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
sdl: sdl:
@ -233,7 +233,7 @@ extends:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Linux_musl_Release_arm jobName: Build_Linux_musl_Release_arm
container: ubuntu2204CrossArmAlpine container: mariner20CrossArm
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: arm buildArchitecture: arm
runtimeIdentifier: 'linux-musl-arm' runtimeIdentifier: 'linux-musl-arm'

2
.vsts-pr.yml
View file

@ -203,7 +203,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Linux_musl_Release_arm jobName: Build_Linux_musl_Release_arm
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm'
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: arm buildArchitecture: arm
runtimeIdentifier: 'linux-musl-arm' runtimeIdentifier: 'linux-musl-arm'

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

@ -13,7 +13,7 @@ parameters:
# The following parameters aren't expected to be passed in rather they are used for encapsulation # The following parameters aren't expected to be passed in rather they are used for encapsulation
# ----------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------
alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 alpine319Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19
centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38
@ -119,7 +119,7 @@ stages:
pool: pool:
name: ${{ variables.defaultPoolName }} name: ${{ variables.defaultPoolName }}
demands: ${{ variables.defaultPoolDemands }} demands: ${{ variables.defaultPoolDemands }}
container: ${{ parameters.alpine317Container }} container: ${{ parameters.alpine319Container }}
buildFromArchive: false # ✅ buildFromArchive: false # ✅
enablePoison: false # 🚫 enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅ excludeOmniSharpTests: true # ✅

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

@ -47,8 +47,8 @@ jobs:
- template: templates/jobs/sdk-diff-tests.yml - template: templates/jobs/sdk-diff-tests.yml
parameters: parameters:
buildName: Alpine317_Offline_MsftSdk buildName: Alpine319_Offline_MsftSdk
targetRid: alpine.3.17-x64 targetRid: alpine.3.19-x64
architecture: x64 architecture: x64
dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}