From 64eb93c253abf250acab4ee0559c25832eb0aa19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Mar 2019 08:17:39 -0700 Subject: [PATCH] [master] Update dependencies from dotnet/arcade (#23406) * Update dependencies from https://github.com/dotnet/arcade build 20190327.11 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19177.11 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19177.11 --- eng/Version.Details.xml | 8 ++++---- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/generate-graph-files.ps1 | 2 +- eng/common/templates/steps/send-to-helix.yml | 3 ++- global.json | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4909bc2..ac6eff8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - f70fa34786cff993625a4548ae0125335eabe82e + 69f276904fdd6d8f81404b857f295537894b81d3 - + https://github.com/dotnet/arcade - f70fa34786cff993625a4548ae0125335eabe82e + 69f276904fdd6d8f81404b857f295537894b81d3 https://github.com/dotnet/corefx diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 2467ebd..29c4432 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -19,7 +19,7 @@ function InstallDarcCli ($darcVersion) { # Until we can anonymously query the BAR API for the latest arcade-services # build applied to the PROD channel, this is hardcoded. if (-not $darcVersion) { - $darcVersion = '1.1.0-beta.19151.3' + $darcVersion = '1.1.0-beta.19175.6' } $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json' diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 8d63dd7..cab6cd5 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash source="${BASH_SOURCE[0]}" -darcVersion="1.1.0-beta.19151.3" +darcVersion="1.1.0-beta.19175.6" while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1 index 76f5707..a05b84f 100644 --- a/eng/common/generate-graph-files.ps1 +++ b/eng/common/generate-graph-files.ps1 @@ -3,7 +3,7 @@ Param( [Parameter(Mandatory=$true)][string] $gitHubPat, # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed) [Parameter(Mandatory=$true)][string] $azdoPat, # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed) [Parameter(Mandatory=$true)][string] $outputFolder, # Where the graphviz.txt file will be created - [string] $darcVersion = '1.1.0-beta.19169.5', # darc's version + [string] $darcVersion = '1.1.0-beta.19175.6', # darc's version [string] $graphvizVersion = '2.38', # GraphViz version [switch] $includeToolset # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about # toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index 0187597..7c185e9 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -1,3 +1,4 @@ +# Please remember to update the documentation if you make changes to these parameters! parameters: HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' @@ -84,4 +85,4 @@ steps: Creator: ${{ parameters.Creator }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} \ No newline at end of file + continueOnError: ${{ parameters.continueOnError }} diff --git a/global.json b/global.json index 1fd361f..68df6af 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19170.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19170.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19177.11", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19177.11" } } -- 2.7.4