From ebf9c02c90d0ecd0ae6344001018dd3e2a677eeb Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 16 May 2024 17:40:02 -0700 Subject: [PATCH 01/11] Update branding to 6.0.132 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 17a176eee..26ca1e6cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 31 + 32 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 6dd1a6d0398923f8ed8f2be682a6a626ce79668b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 16 May 2024 17:40:06 -0700 Subject: [PATCH 02/11] Update branding to 6.0.424 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 65e96fbbf..8e66ee36b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 23 + 24 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 1293b87cff12f456f43783212bb4975a5593ca9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 19:12:18 +0000 Subject: [PATCH 03/11] [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19772) [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 21 ++++++++++++--------- eng/Version.Details.xml | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad69301d0..4096b1bff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,28 @@ - - - - - - + + + + + + @@ -51,21 +51,24 @@ - - - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35620a293..97b8fcd52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/source-build-reference-packages - 86390422715f8f11400ff7fca9c2449888e47b6e + b6e3937b3818bb214a967e990da7002dd8f20fad From 9f98e10e56516b88cc0dda4c6edd7e29402b014b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 19:14:16 +0000 Subject: [PATCH 04/11] [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19773) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 21 ++++++++++++--------- eng/Version.Details.xml | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 50296aa3b..a29209246 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,28 @@ - - - - - - + + + + + + @@ -51,22 +51,25 @@ - - - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3330b9752..440603f5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/source-build-reference-packages - 86390422715f8f11400ff7fca9c2449888e47b6e + b6e3937b3818bb214a967e990da7002dd8f20fad From aac91328f13d9e0e952b5614bffa9fefe298bb3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 14:35:52 -0700 Subject: [PATCH 05/11] [release/6.0.1xx] Update dependencies from dotnet/arcade (#19805) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 26 ------------------- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- .../job/source-index-stage1.yml | 6 ++--- .../templates-official/jobs/source-build.yml | 2 +- .../templates/job/source-index-stage1.yml | 6 ++--- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 6 ++--- 8 files changed, 18 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index a29209246..a35108a91 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,23 +14,10 @@ - - - - - - - - - - - - - @@ -55,22 +42,9 @@ - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 440603f5e..360425031 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 26ca1e6cb..0c21be3f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24204.4 + 6.0.0-beta.24266.4 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index e96ec3cbe..f04ad04c2 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210614.1 + sourceIndexPackageVersion: 1.0.1-20240320.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -32,10 +32,10 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core sdk 3.1 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 3.1.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 2159009dc..b9a1f67b9 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index d8990549e..b710698eb 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210614.1 + sourceIndexPackageVersion: 1.0.1-20240320.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -30,10 +30,10 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core sdk 3.1 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 3.1.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3..7c240e654 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/global.json b/global.json index ab4fa5d59..f624a99df 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.128", + "dotnet": "6.0.130", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24204.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24266.4" } } From 45db330cbdedb3a583e1246a9ac490542eec3d04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 14:36:23 -0700 Subject: [PATCH 06/11] [release/6.0.4xx] Update dependencies from dotnet/arcade (#19806) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 26 ------------------- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- .../job/source-index-stage1.yml | 6 ++--- .../templates-official/jobs/source-build.yml | 2 +- .../templates/job/source-index-stage1.yml | 6 ++--- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 6 ++--- 8 files changed, 18 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4096b1bff..c6e6fab3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,23 +14,10 @@ - - - - - - - - - - - - - @@ -53,23 +40,10 @@ - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97b8fcd52..512605343 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8e66ee36b..3a2864dae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24204.4 + 6.0.0-beta.24266.4 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index e96ec3cbe..f04ad04c2 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210614.1 + sourceIndexPackageVersion: 1.0.1-20240320.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -32,10 +32,10 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core sdk 3.1 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 3.1.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 2159009dc..b9a1f67b9 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index d8990549e..b710698eb 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210614.1 + sourceIndexPackageVersion: 1.0.1-20240320.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -30,10 +30,10 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core sdk 3.1 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 3.1.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3..7c240e654 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/global.json b/global.json index ab4fa5d59..f624a99df 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.128", + "dotnet": "6.0.130", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24204.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24266.4" } } From 8af47e50042cf6a7cdd5ecef3097bdc5a2c18982 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 21 May 2024 15:20:40 -0700 Subject: [PATCH 07/11] [release/8.0.1xx-staging] Remove PGO builds --- .vsts-ci.yml | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 61a96f900..8f0fa0df6 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -329,53 +329,6 @@ extends: buildArchitecture: arm64 runTests: false - # Windows PGO Instrumentation builds - - template: eng/build.yml@self - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - additionalBuildParameters: '/p:PublishInternalAsset=true' - runTests: false - - template: eng/build.yml@self - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_x86 - buildConfiguration: Release - buildArchitecture: x86 - runTests: false - - template: eng/build.yml@self - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - runTests: false - - # Linux PGO Instrumentation builds - - template: eng/build.yml@self - parameters: - agentOs: Linux - pgoInstrument: true - jobName: Build_LinuxPortable_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - linuxPortable: true - runTests: false - - template: eng/build.yml@self - parameters: - agentOs: Linux - pgoInstrument: true - jobName: Build_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - linuxPortable: true - runTests: false - # Source Build - template: /eng/common/templates-official/jobs/source-build.yml@self From c67756174d3f0b5412b3f8edfff4cc88a629074e Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 22 May 2024 10:43:15 -0500 Subject: [PATCH 08/11] [release/6.0.1xx] Update 6.0 source-build CI distro matrix (#19828) Co-authored-by: Matt Thalman --- .vsts-ci.yml | 4 +-- .../job/source-build-create-tarball.yml | 2 +- .../job/source-build-run-tarball-build-pr.yml | 26 +++++++------------ .../job/source-build-run-tarball-build.yml | 26 +++++++------------ .../pipelines/security-partners-dotnet.yml | 4 +-- 5 files changed, 23 insertions(+), 39 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 52443cb34..8d60a5b02 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -63,8 +63,8 @@ extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines parameters: containers: - fedora38: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + fedora39: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 sdl: sourceAnalysisPool: name: $(DncEngInternalBuildPool) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 7cba0c4ea..d9df2e4e5 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -2,7 +2,7 @@ jobs: - job: Source_Build_Create_Tarball - container: fedora38 + container: fedora39 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml index 277fee33f..c38b7ce43 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml @@ -12,9 +12,8 @@ parameters: alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 - fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 - ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 + ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 @@ -64,20 +63,13 @@ jobs: _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: true _RunOnline: false - Fedora38-Offline: + Fedora39-Offline: _BootstrapPrep: false - _Container: ${{ parameters.fedora38Container }} + _Container: ${{ parameters.fedora39Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false _RunOnline: false - Ubuntu1804-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.ubuntu1804Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _OverrideDistroDisablingSha1: false - _RunOnline: false name: Build_Tarball_x64 pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: @@ -95,9 +87,9 @@ jobs: dependsOn: ${{ parameters.dependsOn }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Debian11-Offline: + Ubuntu2004-Offline: _BootstrapPrep: true - _Container: ${{ parameters.debian11Arm64Container }} + _Container: ${{ parameters.ubuntu2004Arm64Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false @@ -116,9 +108,9 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Fedora38-Offline: - _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts - _Container: ${{ parameters.fedora38Container }} + Fedora39-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts + _Container: ${{ parameters.fedora39Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 65b221f27..c13a1778c 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -12,9 +12,8 @@ parameters: alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 - fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 - ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 + ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal image: 1es-ubuntu-2004 @@ -70,20 +69,13 @@ jobs: _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: true _RunOnline: false - Fedora38-Offline: + Fedora39-Offline: _BootstrapPrep: false - _Container: ${{ parameters.fedora38Container }} + _Container: ${{ parameters.fedora39Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false _RunOnline: false - Ubuntu1804-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.ubuntu1804Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _OverrideDistroDisablingSha1: false - _RunOnline: false name: Build_Tarball_x64 pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: @@ -101,9 +93,9 @@ jobs: dependsOn: ${{ parameters.dependsOn }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Debian11-Offline: + Ubuntu2004-Offline: _BootstrapPrep: true - _Container: ${{ parameters.debian11Arm64Container }} + _Container: ${{ parameters.ubuntu2004Arm64Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false @@ -122,9 +114,9 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Fedora38-Offline: - _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts - _Container: ${{ parameters.fedora38Container }} + Fedora39-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts + _Container: ${{ parameters.fedora39Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 9130b7552..b6e0caaa4 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -37,9 +37,9 @@ extends: architecture: x64 excludeSdkContentTests: true matrix: - Ubuntu1804-Offline: + Ubuntu2004-Offline: _BootstrapPrep: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false From 35e9dc1c22398afd9ae2f13cb7dcb02e30c4fee4 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 22 May 2024 10:38:28 -0700 Subject: [PATCH 09/11] Update 6.0 Test Baselines (#19798) --- .../assets/baselines/MsftToSbSdk.diff | 17 +++ .../assets/baselines/PoisonUsage.txt | 114 ++++++++++++++++++ 2 files changed, 131 insertions(+) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 537b03e4f..6d3d215c4 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,7 +14,20 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -29,6 +42,10 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 56f3b8d1c..5bf77d895 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -107,6 +107,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -119,6 +125,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -251,12 +263,30 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -269,6 +299,18 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -317,6 +359,24 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -491,12 +551,24 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -509,6 +581,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -911,6 +989,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -923,6 +1007,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -935,6 +1025,12 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute @@ -1259,6 +1355,24 @@ AssemblyAttribute + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + + + AssemblyAttribute + AssemblyAttribute From 784115bdd01a1b1b5745de5da2a23e07ad7cbc0a Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 29 May 2024 10:56:09 -0700 Subject: [PATCH 10/11] .NET Source-Build 8.0.106 May 2024 Updates (#19857) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index a78403a54..6423c125b 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.105-servicing.24224.1.centos.9-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.105-centos.9-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.106-servicing.24278.1.centos.9-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.106-centos.9-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index c598d7514..ce17211bb 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.105" + "dotnet": "8.0.106" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From c57b364a5eb17f16dea6d96a4ff29a54efa323d8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 29 May 2024 14:17:00 -0700 Subject: [PATCH 11/11] Update to the final 7.0.20 release --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index aad8c9682..169a20019 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ 32 17 $([MSBuild]::Add($(VersionFeature), 25)) - 19 + 20 <_NET70ILLinkPackVersion>7.0.100-1.23211.1