From 17e71494b242c7b1289b8c92ebcf09746917744b Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 10 Jul 2024 10:11:34 -0500 Subject: [PATCH 01/12] .NET Source-Build 6.0.132 July 2024 Updates (#19974) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e866b5269b9a..44df0a84b8f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -144,7 +144,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.131 + 6.0.132 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index c1bb5c5b1887..9160faaabc09 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.131" + "dotnet": "6.0.132" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From c42f8e4308c23b6c38624f68506df8388c4c487c Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Thu, 11 Jul 2024 06:48:50 -0600 Subject: [PATCH 02/12] Update MsftToSbSdk.diff (#19983) --- .../assets/baselines/MsftToSbSdk.diff | 17 +++++++++++++++++ 1 file changed, 17 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 537b03e4f2bb..6d3d215c4b7c 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/ From ace39de76005869f0ab181976df47406f7229309 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 11 Jul 2024 08:25:55 -0500 Subject: [PATCH 03/12] Update SB CI to Fedora 40 (#19929) --- .vsts-ci.yml | 4 ++-- .../templates/job/source-build-create-tarball.yml | 2 +- .../job/source-build-run-tarball-build-pr.yml | 12 ++++++------ .../templates/job/source-build-run-tarball-build.yml | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 2c5d77b5697e..66492d6dc091 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -61,8 +61,8 @@ extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines parameters: containers: - fedora39: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 + fedora40: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40 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 d9df2e4e523e..8b5b456b662c 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: fedora39 + container: fedora40 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 c38b7ce43a38..a0599df5aa06 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,7 +12,7 @@ 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 - fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 + fedora40Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40 ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal @@ -63,9 +63,9 @@ jobs: _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: true _RunOnline: false - Fedora39-Offline: + fedora40-Offline: _BootstrapPrep: false - _Container: ${{ parameters.fedora39Container }} + _Container: ${{ parameters.fedora40Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false @@ -108,9 +108,9 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Fedora39-Offline: - _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts - _Container: ${{ parameters.fedora39Container }} + fedora40-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 fedora40-Offline_Artifacts + _Container: ${{ parameters.fedora40Container }} _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 c13a1778ce18..24e4948b9987 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,7 +12,7 @@ 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 - fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 + fedora40Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40 ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal @@ -69,9 +69,9 @@ jobs: _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: true _RunOnline: false - Fedora39-Offline: + fedora40-Offline: _BootstrapPrep: false - _Container: ${{ parameters.fedora39Container }} + _Container: ${{ parameters.fedora40Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false @@ -114,9 +114,9 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Fedora39-Offline: - _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts - _Container: ${{ parameters.fedora39Container }} + fedora40-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 fedora40-Offline_Artifacts + _Container: ${{ parameters.fedora40Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false From 0271f414871775867448bea631b5a6bb8e6ad253 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 19:29:56 +0000 Subject: [PATCH 04/12] [release/6.0.1xx] Update dependencies from dotnet/arcade (#19992) [release/6.0.1xx] Update dependencies from dotnet/arcade --- NuGet.config | 36 ++++++++++++++++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc938de7b351..c0378a005e7d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,41 @@ + + + + + + + + + + + + + + + + + + + + @@ -43,16 +63,32 @@ + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d94cd270b5fb..35719daa970c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 1844d819e6f33f1106083c5066ea01e0310eefa3 + fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 - + https://github.com/dotnet/arcade - 1844d819e6f33f1106083c5066ea01e0310eefa3 + fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 - + https://github.com/dotnet/arcade - 1844d819e6f33f1106083c5066ea01e0310eefa3 + fbc993a9e8fb4926ce04c95ba2e48852c9d9df65 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 44df0a84b8f7..0e6fe8dac2d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24326.2 + 6.0.0-beta.24360.7 diff --git a/global.json b/global.json index 750534f91754..18b0acd2a4c5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.130", + "dotnet": "6.0.132", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24326.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24326.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24360.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24360.7" } } From 1d8eddc15254a97a6c0ab1698efead78a049120c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 12 Jul 2024 12:23:09 -0500 Subject: [PATCH 05/12] Add Alma Linux leg to source build CI (#19995) --- eng/pipelines/templates/stages/vmr-build.yml | 17 +++++++++++++++++ eng/pipelines/templates/variables/vmr-build.yml | 6 ++++++ .../pipelines/source-build-sdk-diff-tests.yml | 7 +++++++ 3 files changed, 30 insertions(+) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 04d06cda74a1..6c20e8048f93 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -91,6 +91,23 @@ stages: # CI - Stage 1 x64 legs ------------------------------------ + # This AlmaLinux leg is intended to build with the min supported glibc version + - 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: ${{ format('{0}_Offline_MsftSdk', variables.almaLinuxName) }} + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: ${{ parameters.pool_Linux }} + container: ${{ variables.almaLinuxContainer }} + buildFromArchive: false # 🚫 + enablePoison: false # 🚫 + excludeOmniSharpTests: true # ✅ + runOnline: false # 🚫 + useMonoRuntime: false # 🚫 + withPreviousSDK: false # 🚫 + - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index 2d8db158721e..89858e6d9918 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -1,4 +1,6 @@ variables: +- name: almaLinuxContainer + value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build - name: alpineContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode - name: centOSStreamContainer @@ -10,6 +12,8 @@ variables: - name: ubuntuArmContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-arm64 +- name: almaLinuxName + value: AlmaLinux8 - name: alpineName value: Alpine319 - name: centOSStreamName @@ -19,6 +23,8 @@ variables: - name: ubuntuName value: Ubuntu2204 +- name: almaLinuxX64Rid + value: almalinux.8-x64 - name: alpineX64Rid value: alpine.3.19-x64 - name: centOSStreamX64Rid diff --git a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml index 6642c705bd26..5b020fe1d9d4 100644 --- a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml @@ -45,6 +45,13 @@ jobs: dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} publishTestResultsPr: true +- template: templates/jobs/sdk-diff-tests.yml + parameters: + buildName: ${{ format('{0}_Offline_MsftSdk', variables.almaLinuxName) }} + targetRid: ${{ variables.almaLinuxX64Rid }} + architecture: x64 + dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} + - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: ${{ format('{0}_Offline_MsftSdk', variables.alpineName) }} From 8d70937de5100791180b9a52d767dc2a8506ba2f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 12 Jul 2024 12:34:40 -0500 Subject: [PATCH 06/12] [release/8.0.1xx] Update Alpine 3.19 CI legs to Alpine 3.20 (#19994) --- eng/pipelines/templates/variables/vmr-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index 89858e6d9918..8c83572d3a2d 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -2,7 +2,7 @@ variables: - name: almaLinuxContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build - name: alpineContainer - value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode + value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode - name: centOSStreamContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - name: fedoraContainer @@ -15,7 +15,7 @@ variables: - name: almaLinuxName value: AlmaLinux8 - name: alpineName - value: Alpine319 + value: Alpine320 - name: centOSStreamName value: CentOSStream9 - name: fedoraName @@ -26,7 +26,7 @@ variables: - name: almaLinuxX64Rid value: almalinux.8-x64 - name: alpineX64Rid - value: alpine.3.19-x64 + value: alpine.3.20-x64 - name: centOSStreamX64Rid value: centos.9-x64 - name: fedoraX64Rid From f60b80806dee69ad815d0644f2ef57f6d448aceb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Jul 2024 16:31:39 +0000 Subject: [PATCH 07/12] Update dependencies from https://github.com/dotnet/source-build-externals build 20240711.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24361.1 --- NuGet.config | 36 ++++++++++++++++++++++++++++++++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f83e4126271..3cf1a0bbdd22 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,41 @@ + + + + + + + + + + + + + + + + + + + + @@ -42,14 +62,30 @@ + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21f00e59b05b..ab4d93016728 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,9 +198,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 4f2151df120194f0268944f1b723c14820738fc8 + b086ae0e4cf1ae64f1237f976fa65221f87cd4a0 From 5d81c4c47a769b3b03216668d77be59f441668fa Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 15 Jul 2024 13:47:08 -0500 Subject: [PATCH 08/12] Copy artifacts to publishing directory (#20003) --- eng/pipelines/templates/jobs/vmr-build.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 542320fd7b67..bc9bc3af11a8 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -100,7 +100,7 @@ jobs: - output: pipelineArtifact displayName: 'Publish Artifacts' condition: succeededOrFailed() - targetPath: '${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/' + targetPath: $(Build.ArtifactStagingDirectory)/publishing artifactName: $(Agent.JobName)_Artifacts steps: @@ -267,6 +267,13 @@ jobs: continueOnError: true condition: succeededOrFailed() + - task: CopyFiles@2 + inputs: + SourceFolder: ${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/ + TargetFolder: $(Build.ArtifactStagingDirectory)/publishing + displayName: Copy artifacts to Artifact Staging Directory + condition: succeededOrFailed() + - ${{ if eq(variables['System.TeamProject'], 'public') }}: - publish: '$(Build.StagingDirectory)/BuildLogs' artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) @@ -274,7 +281,7 @@ jobs: continueOnError: true condition: succeededOrFailed() - - publish: '${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/' + - publish: $(Build.ArtifactStagingDirectory)/publishing artifact: $(Agent.JobName)_Artifacts displayName: Publish Artifacts condition: succeededOrFailed() From 60684132786e85cbb6a2398190ee00b47f0d0aba Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Mon, 15 Jul 2024 14:39:34 -0700 Subject: [PATCH 09/12] Add support for targeting Windows version 26100 and update Windows SDK projection versions --- eng/ManualVersions.props | 13 +++++++------ src/redist/targets/GenerateBundledVersions.targets | 1 + test/EndToEnd/GivenWindowsApp.cs | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 57a4b6415199..8ea5be208a97 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,12 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.31 - 10.0.18362.31 - 10.0.19041.31 - 10.0.20348.31 - 10.0.22000.31 - 10.0.22621.31 + 10.0.17763.34 + 10.0.18362.34 + 10.0.19041.34 + 10.0.20348.34 + 10.0.22000.34 + 10.0.22621.34 + 10.0.26100.34 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 299a76d5eb71..392755ec1d5e 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -1143,6 +1143,7 @@ Copyright (c) .NET Foundation. All rights reserved. /> + diff --git a/test/EndToEnd/GivenWindowsApp.cs b/test/EndToEnd/GivenWindowsApp.cs index 59f28eee89af..96595fe2704c 100644 --- a/test/EndToEnd/GivenWindowsApp.cs +++ b/test/EndToEnd/GivenWindowsApp.cs @@ -19,6 +19,7 @@ public class GivenWindowsApp : TestBase [InlineData("10.0.20348.0")] [InlineData("10.0.22000.0")] [InlineData("10.0.22621.0")] + [InlineData("10.0.26100.0")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") From e015fad65dc12f0209abc37d86a2bf50e96d5ad4 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 15 Jul 2024 23:32:51 -0700 Subject: [PATCH 10/12] Revert eng/Version.Details.xml --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59d6d8a31ba0..ff5bcdc6c667 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - b086ae0e4cf1ae64f1237f976fa65221f87cd4a0 + 4f2151df120194f0268944f1b723c14820738fc8 From d1e5274456b56eef679f5de0cb65d49fed9edce2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 16:13:19 +0000 Subject: [PATCH 11/12] [release/8.0.3xx] Update dependencies from dotnet/arcade (#20022) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/sdl/NuGet.config | 4 ++-- eng/common/sdl/execute-all-sdl-tools.ps1 | 4 +--- eng/common/sdl/init-sdl.ps1 | 8 -------- eng/common/sdl/sdl.ps1 | 4 +++- .../templates-official/steps/execute-sdl.yml | 2 -- .../steps/get-federated-access-token.yml | 14 +++++++++++++- eng/common/templates/steps/execute-sdl.yml | 7 ++++--- .../templates/steps/get-federated-access-token.yml | 14 +++++++++++++- global.json | 6 +++--- 11 files changed, 46 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff5bcdc6c667..5bdeafcb2044 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - c9efa535175049eb9cba06cae1f8c3d5dbe768a9 + fa3d544b066661522f1ec5d5e8cfd461a29b0f8a - + https://github.com/dotnet/arcade - c9efa535175049eb9cba06cae1f8c3d5dbe768a9 + fa3d544b066661522f1ec5d5e8cfd461a29b0f8a - + https://github.com/dotnet/arcade - c9efa535175049eb9cba06cae1f8c3d5dbe768a9 + fa3d544b066661522f1ec5d5e8cfd461a29b0f8a https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b5c54f07a34e..a26a0ff48368 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24360.5 + 8.0.0-beta.24367.1 diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config index 3849bdb3cf51..5bfbb02ef043 100644 --- a/eng/common/sdl/NuGet.config +++ b/eng/common/sdl/NuGet.config @@ -5,11 +5,11 @@ - + - + diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 4715d75e974d..81ded5b7f477 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -6,7 +6,6 @@ Param( [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located - [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list # format. @@ -75,7 +74,7 @@ try { } Exec-BlockVerbosely { - & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -GuardianLoggerLevel $GuardianLoggerLevel } $gdnFolder = Join-Path $workingDirectory '.gdn' @@ -104,7 +103,6 @@ try { -TargetDirectory $targetDirectory ` -GdnFolder $gdnFolder ` -ToolsList $tools ` - -AzureDevOpsAccessToken $AzureDevOpsAccessToken ` -GuardianLoggerLevel $GuardianLoggerLevel ` -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 3ac1d92b3700..588ff8e22fbe 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -3,7 +3,6 @@ Param( [string] $Repository, [string] $BranchName='master', [string] $WorkingDirectory, - [string] $AzureDevOpsAccessToken, [string] $GuardianLoggerLevel='Standard' ) @@ -21,14 +20,7 @@ $ci = $true # Don't display the console progress UI - it's a huge perf hit $ProgressPreference = 'SilentlyContinue' -# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file -$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) -$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") -$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0" -$zipFile = "$WorkingDirectory/gdn.zip" - Add-Type -AssemblyName System.IO.Compression.FileSystem -$gdnFolder = (Join-Path $WorkingDirectory '.gdn') try { # if the folder does not exist, we'll do a guardian init and push it to the remote repository diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 index 648c5068d7d6..7fe603fe995d 100644 --- a/eng/common/sdl/sdl.ps1 +++ b/eng/common/sdl/sdl.ps1 @@ -4,6 +4,8 @@ function Install-Gdn { [Parameter(Mandatory=$true)] [string]$Path, + [string]$Source = "https://pkgs.dev.azure.com/dnceng/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json", + # If omitted, install the latest version of Guardian, otherwise install that specific version. [string]$Version ) @@ -19,7 +21,7 @@ function Install-Gdn { $ci = $true . $PSScriptRoot\..\tools.ps1 - $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + $argumentList = @("install", "Microsoft.Guardian.Cli.win-x64", "-Source $Source", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") if ($Version) { $argumentList += "-Version $Version" diff --git a/eng/common/templates-official/steps/execute-sdl.yml b/eng/common/templates-official/steps/execute-sdl.yml index 07426fde05d8..301d5c591ebd 100644 --- a/eng/common/templates-official/steps/execute-sdl.yml +++ b/eng/common/templates-official/steps/execute-sdl.yml @@ -9,8 +9,6 @@ parameters: steps: - task: NuGetAuthenticate@1 - inputs: - nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml index e3786cef6dfd..55e33bd38f71 100644 --- a/eng/common/templates-official/steps/get-federated-access-token.yml +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -3,6 +3,12 @@ parameters: type: string - name: outputVariableName type: string +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' # Resource to get a token for. Common values include: # - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps # - 'https://storage.azure.com/' for storage @@ -10,10 +16,16 @@ parameters: - name: resource type: string default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false steps: - task: AzureCLI@2 displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} inputs: azureSubscription: ${{ parameters.federatedServiceConnection }} scriptType: 'pscore' @@ -25,4 +37,4 @@ steps: exit 1 } Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 07426fde05d8..fe0ebf8c904e 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -9,8 +9,6 @@ parameters: steps: - task: NuGetAuthenticate@1 - inputs: - nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' @@ -36,16 +34,19 @@ steps: displayName: Execute SDL (Overridden) continueOnError: ${{ parameters.sdlContinueOnError }} condition: ${{ parameters.condition }} + env: + GUARDIAN_DEFAULT_PACKAGE_SOURCE_SECRET: $(System.AccessToken) - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} displayName: Execute SDL continueOnError: ${{ parameters.sdlContinueOnError }} condition: ${{ parameters.condition }} + env: + GUARDIAN_DEFAULT_PACKAGE_SOURCE_SECRET: $(System.AccessToken) - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: # We want to publish the Guardian results and configuration for easy diagnosis. However, the diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml index c8c49cc0e8f0..55e33bd38f71 100644 --- a/eng/common/templates/steps/get-federated-access-token.yml +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -3,6 +3,12 @@ parameters: type: string - name: outputVariableName type: string +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' # Resource to get a token for. Common values include: # - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps # - 'https://storage.azure.com/' for storage @@ -10,10 +16,16 @@ parameters: - name: resource type: string default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false steps: - task: AzureCLI@2 displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} inputs: azureSubscription: ${{ parameters.federatedServiceConnection }} scriptType: 'pscore' @@ -25,4 +37,4 @@ steps: exit 1 } Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/global.json b/global.json index 0889eebd5a6e..65129a52f8b6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.101", + "dotnet": "8.0.107", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24360.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24360.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24367.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24367.1" } } From f3841c500a49e648074877bf16ed25194c03a37e Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 18 Jul 2024 23:53:15 -0700 Subject: [PATCH 12/12] Update publish path --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index c697aaf78d50..1a90ff50aebb 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -283,7 +283,7 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/' + - publish: $(Build.ArtifactStagingDirectory)/publishing artifact: $(Agent.JobName)_Artifacts displayName: Publish Artifacts condition: succeededOrFailed()