diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5a477ec2f..ff04a8a6f 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -8,12 +8,17 @@ trigger: - internal/release/3.* - internal/release/5.* - internal/release/6.* + - internal/release/7.* variables: - name: _PublishUsingPipelines value: false -- name: PostBuildSign - value: true +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - name: PostBuildSign + value: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-DotNetCli-Storage - group: DotNet-Installer-SDLValidation-Params diff --git a/NuGet.config b/NuGet.config index d2a6d621d..dbd29f96e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa211913d..727a54e2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 622c2dc5ced5df5af002a3b06a52f9584b726b28 + a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 - + https://github.com/dotnet/arcade - 622c2dc5ced5df5af002a3b06a52f9584b726b28 + a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 - + https://github.com/dotnet/arcade - 622c2dc5ced5df5af002a3b06a52f9584b726b28 + a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 1c5965e76..a55282169 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22458.5 + 7.0.0-beta.22462.6 diff --git a/global.json b/global.json index 834d82468..2735d8bee 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22458.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22458.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22462.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22462.6" } }