From 9ae38ff858148e8e43287d20a0bfd660a6246fc6 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Mon, 12 Aug 2019 12:03:38 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20190811.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19411.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19411.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19411.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 2 ++ eng/common/templates/post-build/post-build.yml | 1 + global.json | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c87d7d092e..99a0198568e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,17 +76,17 @@ - + https://github.com/dotnet/arcade - b1c2f33f0cef32d1df6e7f388017fd6761d3fcad + a11024c8c22cc762011addafc30c653c938048f4 - + https://github.com/dotnet/arcade - b1c2f33f0cef32d1df6e7f388017fd6761d3fcad + a11024c8c22cc762011addafc30c653c938048f4 - + https://github.com/dotnet/arcade - b1c2f33f0cef32d1df6e7f388017fd6761d3fcad + a11024c8c22cc762011addafc30c653c938048f4 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 98478ce1b9e..5ca9ad8cf5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,7 +61,7 @@ 3.0.0-preview9.19409.17 - 1.0.0-beta.19404.1 + 1.0.0-beta.19411.1 3.3.0-beta3-19409-05 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index f657a4dc91d..91621cf88fd 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -10,6 +10,8 @@ jobs: displayName: Run SDL tool variables: - group: DotNet-VSTS-Bot + pool: + name: Hosted VS2017 steps: - checkout: self clean: true diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 33db50ce261..aba0b0fcafb 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -52,6 +52,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine dotnet /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' /p:Configuration=Release - ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}: diff --git a/global.json b/global.json index bf455da232c..15a23cfba36 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19404.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19404.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19411.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19411.1" } }