diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5c795c0ddafd..c94f0370d0e9 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -64,16 +64,9 @@ extends: template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines parameters: containers: - alpine322Amd64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64 - centosStream9: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - debian12Amd64: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc15-amd64 - fedora39: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 - mariner20CrossArm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm + azureLinux30Net10BuildAmd64: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64 + sdl: sourceAnalysisPool: name: $(DncEngInternalBuildPool) @@ -162,60 +155,44 @@ extends: timeoutInMinutes: 90 linuxJobParameterSets: ### OFFICIAL ### - # Note: These builds are also portable like the Portable category, but that category uses containers, and doesn't publish zips and tarballs. + # Note: These builds are also glibc like the glibc category, but that category uses containers, and doesn't publish zips and tarballs. - categoryName: Official publishArgument: $(_publishArgument) officialBuildProperties: $(_officialBuildProperties) - osProperties: $(linuxOsPortableProperties) + osProperties: $(linuxOsglibcProperties) runTests: false - categoryName: Official targetArchitecture: arm runtimeIdentifier: linux-arm publishArgument: $(_publishArgument) officialBuildProperties: $(_officialBuildProperties) - osProperties: $(linuxOsPortableProperties) + osProperties: $(linuxOsglibcProperties) runTests: false - categoryName: Official targetArchitecture: arm64 runtimeIdentifier: linux-arm64 publishArgument: $(_publishArgument) officialBuildProperties: $(_officialBuildProperties) - osProperties: $(linuxOsPortableProperties) - runTests: false - ### PORTABLE ### - - categoryName: Portable - # Do not publish zips and tarballs. The linux-x64 binaries are already published by Official. - publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false - officialBuildProperties: $(_officialBuildProperties) - osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true - runTests: false - - categoryName: Portable - targetArchitecture: arm64 - runtimeIdentifier: linux-arm64 - # Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official. - publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false - officialBuildProperties: $(_officialBuildProperties) - osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true + osProperties: $(linuxOsglibcProperties) runTests: false - - categoryName: Portable - container: centosStream9 + ### glibc ### + - categoryName: glibc # Do not publish zips and tarballs. The linux-x64 binaries are already published by Official. publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false officialBuildProperties: $(_officialBuildProperties) - osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true + osProperties: $(linuxOsglibcProperties) /p:BuildSdkDeb=true runTests: false - - categoryName: Portable - container: centosStream9 + - categoryName: glibc targetArchitecture: arm64 runtimeIdentifier: linux-arm64 # Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official. publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false officialBuildProperties: $(_officialBuildProperties) - osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true + osProperties: $(linuxOsglibcProperties) /p:BuildSdkDeb=true runTests: false - ### MUSL ### - - categoryName: Musl - container: alpine322Amd64 + ### musl ### + - categoryName: musl + container: azureLinux30Net10BuildAmd64 runtimeIdentifier: linux-musl-x64 publishArgument: $(_publishArgument) officialBuildProperties: $(_officialBuildProperties) @@ -224,15 +201,15 @@ extends: # SBOM generation is not supported for alpine. enableSbom: false runTests: false - - categoryName: Musl - container: mariner20CrossArm + - categoryName: musl + container: azureLinux30Net10BuildAmd64 targetArchitecture: arm runtimeIdentifier: linux-musl-arm publishArgument: $(_publishArgument) officialBuildProperties: $(_officialBuildProperties) osProperties: /p:OSName=linux-musl runTests: false - - categoryName: Musl + - categoryName: musl targetArchitecture: arm64 runtimeIdentifier: linux-musl-arm64 publishArgument: $(_publishArgument) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index b59682c50b0c..3671ff2e7156 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -27,16 +27,8 @@ variables: resources: containers: - - container: alpine322Amd64 - image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64 - - container: centosStream9 - image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - - container: debian12Amd64 - image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc15-amd64 - - container: fedora39 - image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 - - container: ubuntu2204DebPkg - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg + - container: azureLinux30Net10BuildAmd64 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64 stages: ############### BUILD STAGE ############### diff --git a/eng/Badge.proj b/eng/Badge.proj index 7e3108caf761..f8b454bf233e 100644 --- a/eng/Badge.proj +++ b/eng/Badge.proj @@ -9,7 +9,6 @@ $(OSName.Replace('-', '_'))_$(TargetArchitecture) - linux_$(TargetArchitecture) $(ArtifactsShippingPackagesDir)$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg $(MSBuildThisFileDirectory)version_badge.svg diff --git a/eng/pipelines/templates/jobs/sdk-job-matrix.yml b/eng/pipelines/templates/jobs/sdk-job-matrix.yml index fcfac4403eac..7695cbabaa93 100644 --- a/eng/pipelines/templates/jobs/sdk-job-matrix.yml +++ b/eng/pipelines/templates/jobs/sdk-job-matrix.yml @@ -21,49 +21,20 @@ parameters: ### LINUX ### linuxJobParameterSets: - categoryName: TestBuild - osProperties: $(linuxOsPortableProperties) + osProperties: $(linuxOsglibcProperties) - categoryName: TestBuild targetArchitecture: arm64 runtimeIdentifier: linux-arm64 - osProperties: $(linuxOsPortableProperties) + osProperties: $(linuxOsglibcProperties) # Don't run the tests on arm64. Only perform the build itself. runTests: false - categoryName: ContainerBased - container: ubuntu2204DebPkg - helixTargetContainer: $(helixTargetContainerPrefix)ubuntu-22.04-helix-amd64 - osProperties: $(linuxOsPortableProperties) - runTests: true - - categoryName: ContainerBased - container: fedora39 - # No fedora Helix container is available, so use the ubuntu one instead. - helixTargetContainer: $(helixTargetContainerPrefix)ubuntu-22.04-helix-amd64 - osProperties: $(linuxOsPortableProperties) - # Skipping all container-based testing for now. - # See: https://github.com/dotnet/sdk/issues/40935 - runTests: false - - categoryName: ContainerBased - container: centosStream9 - helixTargetContainer: $(helixTargetContainerPrefix)centos-stream9-helix - osProperties: /p:OSName=linux - runTests: true - - categoryName: ContainerBased - container: debian12Amd64 - helixTargetContainer: $(helixTargetContainerPrefix)debian-11-helix-amd64 + container: azureLinux30Net10BuildAmd64 + helixTargetContainer: $(helixTargetContainerPrefix)azurelinux.3.amd64.open osProperties: /p:OSName=linux /p:BuildSdkDeb=true runTests: true - - categoryName: ContainerBased - container: alpine322Amd64 - helixTargetContainer: $(helixTargetContainerPrefix)alpine-3.22-helix-amd64 - runtimeIdentifier: linux-musl-x64 - # Use HostOSName when running on alpine. - osProperties: /p:HostOSName=linux-musl - # SBOM generation is not supported for alpine. - enableSbom: false - # Skipping all container-based testing for now. - # See: https://github.com/dotnet/sdk/issues/40935 - runTests: false - categoryName: TemplateEngine - osProperties: $(linuxOsPortableProperties) + osProperties: $(linuxOsglibcProperties) testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj publishXunitResults: true ### MACOS ### diff --git a/eng/pipelines/templates/variables/sdk-defaults.yml b/eng/pipelines/templates/variables/sdk-defaults.yml index f9097cfc211a..9c5e07f2ad18 100644 --- a/eng/pipelines/templates/variables/sdk-defaults.yml +++ b/eng/pipelines/templates/variables/sdk-defaults.yml @@ -1,7 +1,7 @@ variables: ############### BUILD ############### buildConfiguration: Release - linuxOsPortableProperties: /p:OSName=linux /p:IsLinuxPortable=true + linuxOsglibcProperties: /p:OSName=linux helixTargetContainerPrefix: '@mcr.microsoft.com/dotnet-buildtools/prereqs:' ############### ARCADE ###############