From a53fd3a37f56d73699ab6934868965900810cf55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:10:51 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20240213.1 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24059.3 -> To Version 6.0.0-beta.24113.1 --- eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 30 ++++---- eng/common/post-build/publish-using-darc.ps1 | 4 +- .../templates/job/publish-build-assets.yml | 10 +-- eng/common/templates/jobs/jobs.yml | 10 +-- .../templates/post-build/post-build.yml | 20 ++--- global.json | 8 +- 7 files changed, 79 insertions(+), 79 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32168da88d9691..cfcc7ab2552606 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff https://github.com/microsoft/vstest @@ -222,9 +222,9 @@ https://github.com/dotnet/xharness 9cffd0b49204fa44c7577fa1a132e39e7cf4d038 - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 96facbceaca1e4eb498055c005088764d3b38dff https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 195acd90a34aac..e852cccec193f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,21 +42,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 - 2.5.1-beta.24059.3 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 - 6.0.0-beta.24059.3 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 + 2.5.1-beta.24113.1 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 + 6.0.0-beta.24113.1 6.0.0-preview.1.102 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1e779fec4dd1ea..5a3a32ea8d75b4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 239b17010fa7eb..bd3d54b760c230 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -51,7 +51,7 @@ jobs: checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: NuGetAuthenticate@1 @@ -74,7 +74,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -83,7 +83,7 @@ jobs: Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -109,7 +109,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -118,4 +118,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 9c4becbc859250..f70826518cca2c 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: enabled: false # Optional: Include toolset dependencies in the generated graph files includeToolset: false - + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job jobs: [] @@ -40,7 +40,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: @@ -68,7 +68,7 @@ jobs: ${{ parameter.key }}: ${{ parameter.value }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - template: ../job/publish-build-assets.yml parameters: @@ -88,8 +88,8 @@ jobs: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d49c6156bf0aa2..5a0bb8d96d2047 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -124,8 +124,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -220,9 +220,9 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true @@ -253,8 +253,8 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -266,10 +266,10 @@ stages: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/global.json b/global.json index 9f87ed8e140e07..21b5e4e68bb407 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.24059.3", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24059.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24059.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.24113.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24113.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24113.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"