[master] Update dependencies from dotnet/arcade (#632)

* Update dependencies from https://github.com/dotnet/arcade build 20190221.1

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19121.1

* Update dependencies from https://github.com/dotnet/arcade build 20190221.5

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19121.5
This commit is contained in:
dotnet-maestro[bot] 2019-02-22 13:41:53 +00:00 committed by GitHub
parent e14cc58da4
commit c7a8617ed9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 7 deletions

View file

@ -36,9 +36,9 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19119.2"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19121.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8549f0f5f303b53dcafd5b26c5f2ec4c5137521b</Sha> <Sha>660f6cd006b276edb3764f4d7d726cedf6c29d8e</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

View file

@ -19,7 +19,7 @@ function InstallDarcCli ($darcVersion) {
# Until we can anonymously query the BAR API for the latest arcade-services # Until we can anonymously query the BAR API for the latest arcade-services
# build applied to the PROD channel, this is hardcoded. # build applied to the PROD channel, this is hardcoded.
if (-not $darcVersion) { if (-not $darcVersion) {
$darcVersion = '1.1.0-beta.19081.1' $darcVersion = '1.1.0-beta.19120.2'
} }
$arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json' $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json'

View file

@ -1,6 +1,24 @@
#!/usr/bin/env bash #!/usr/bin/env bash
source="${BASH_SOURCE[0]}" source="${BASH_SOURCE[0]}"
darcVersion="1.1.0-beta.19120.2"
while [[ $# > 0 ]]; do
opt="$(echo "$1" | awk '{print tolower($0)}')"
case "$opt" in
--darcversion)
darcVersion=$2
shift
;;
*)
echo "Invalid argument: $1"
usage
exit 1
;;
esac
shift
done
# resolve $source until the file is no longer a symlink # resolve $source until the file is no longer a symlink
while [[ -h "$source" ]]; do while [[ -h "$source" ]]; do
@ -27,12 +45,11 @@ function InstallDarcCli {
echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g) echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g)
fi fi
ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk" local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json"
local toolset_version=$_ReadGlobalVersion
echo "Installing Darc CLI version $toolset_version..." echo "Installing Darc CLI version $toolset_version..."
echo "You may need to restart your command shell if this is the first dotnet tool you have installed." echo "You may need to restart your command shell if this is the first dotnet tool you have installed."
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $toolset_version -v $verbosity -g) echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g)
} }
InstallDarcCli InstallDarcCli

View file

@ -108,6 +108,10 @@ jobs:
- name: ${{ pair.key }} - name: ${{ pair.key }}
value: ${{ pair.value }} value: ${{ pair.value }}
# DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds
- ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: DotNet-HelixApi-Access
${{ if ne(parameters.workspace, '') }}: ${{ if ne(parameters.workspace, '') }}:
workspace: ${{ parameters.workspace }} workspace: ${{ parameters.workspace }}

View file

@ -3,6 +3,6 @@
"dotnet": "3.0.100-preview-009812" "dotnet": "3.0.100-preview-009812"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19119.2" "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19121.5"
} }
} }