diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bd787d7a..e116acc2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,25 +144,25 @@ - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e - + https://github.com/dotnet/arcade - 1571d6b095014ad63fdb48b10f5dea912f96872e + ff8fec9066eca51a26abf723dd7d92e20926a90e https://github.com/dotnet/source-build-reference-packages 639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1 - + https://github.com/dotnet/sourcelink - 5935ccd670197b059b98d299e5537ad1f10adecb + ccdb7ce5e41f26ad4d09c2813fee2eeee0a60480 - + https://github.com/dotnet/xliff-tasks - c71b2197c16684cea8b0372b0eff7f22b320786b + b173a3876e42de2d91cd2b99f0a101a8fed4ca68 diff --git a/eng/Versions.props b/eng/Versions.props index 9739d5529..4ff6060b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21058.3 + 6.0.0-beta.21062.10 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b33f06b95..612633074 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -3,6 +3,7 @@ parameters: sourceIndexPackageVersion: 1.0.0-beta5 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: [] binlogPath: artifacts/log/Debug/Build.binlog pool: vmImage: vs2017-win2016 @@ -21,12 +22,20 @@ jobs: pool: ${{ parameters.pool }} steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + - task: UseDotNet@2 displayName: Use .NET Core sdk 3.1 inputs: packageType: sdk version: 3.1.x + - task: UseDotNet@2 + displayName: Use .NET Core sdk + inputs: + useGlobalJson: true + - script: | dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools @@ -38,9 +47,12 @@ jobs: - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln + env: + DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) displayName: Upload stage1 artifacts to source index env: BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 41f2d96a6..bd776c767 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -224,7 +224,7 @@ stages: - ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}: - stage: publish_using_darc ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: Validate + dependsOn: ${{ parameters.publishDependsOn }} ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}: dependsOn: ${{ parameters.validateDependsOn }} displayName: Publish using Darc diff --git a/global.json b/global.json index ffff37d12..ad3dd0e43 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21058.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21062.10" } }