diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a4fbab9fb..af5b9f64a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,25 +15,25 @@ - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 7a8eb36ad0..2ff96f429d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,8 +97,8 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 + 6.0.0-beta.21316.3 + 6.0.0-beta.21316.3 1.22.0 1.1.2 2.0.0 @@ -108,7 +108,7 @@ 1.1.0-beta.20258.6 1.1.0-beta-21228-01 1.1.0-beta-21228-01 - 6.0.0-beta.21314.1 + 6.0.0-beta.21316.3 1.0.0-beta.21265.1 1.1.0-beta.21228.1 1.0.0-prerelease.21264.3 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index a649d2b599..b58d42364b 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,15 +1,19 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210421.1 + sourceIndexPackageVersion: 1.0.1-20210614.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: [] binlogPath: artifacts/log/Debug/Build.binlog pool: vmImage: vs2017-win2016 + condition: '' + dependsOn: '' jobs: - job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} variables: - name: SourceIndexPackageVersion value: ${{ parameters.sourceIndexPackageVersion }} diff --git a/global.json b/global.json index 10b2bd33bc..a5ad0c87df 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "vswhere": "2.5.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21314.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21314.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21316.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21316.3" } }