Skip to content

Commit cd22be9

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20190221.1 (#318)
This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19121.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19121.1
1 parent dbbd43b commit cd22be9

File tree

5 files changed

+31
-10
lines changed

5 files changed

+31
-10
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<Dependencies>
33
<ProductDependencies></ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19119.2">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19121.1">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>8549f0f5f303b53dcafd5b26c5f2ec4c5137521b</Sha>
7+
<Sha>869b08099e519e0e1926434f2f2ac7a1f144c783</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19119.2">
9+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19121.1">
1010
<Uri>https://github.com/dotnet/arcade</Uri>
11-
<Sha>8549f0f5f303b53dcafd5b26c5f2ec4c5137521b</Sha>
11+
<Sha>869b08099e519e0e1926434f2f2ac7a1f144c783</Sha>
1212
</Dependency>
1313
</ToolsetDependencies>
1414
</Dependencies>

eng/common/darc-init.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function InstallDarcCli ($darcVersion) {
1919
# Until we can anonymously query the BAR API for the latest arcade-services
2020
# build applied to the PROD channel, this is hardcoded.
2121
if (-not $darcVersion) {
22-
$darcVersion = '1.1.0-beta.19081.1'
22+
$darcVersion = '1.1.0-beta.19120.2'
2323
}
2424

2525
$arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json'

eng/common/darc-init.sh

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
#!/usr/bin/env bash
22

33
source="${BASH_SOURCE[0]}"
4+
darcVersion="1.1.0-beta.19120.2"
5+
6+
while [[ $# > 0 ]]; do
7+
opt="$(echo "$1" | awk '{print tolower($0)}')"
8+
case "$opt" in
9+
--darcversion)
10+
darcVersion=$2
11+
shift
12+
;;
13+
*)
14+
echo "Invalid argument: $1"
15+
usage
16+
exit 1
17+
;;
18+
esac
19+
20+
shift
21+
done
422

523
# resolve $source until the file is no longer a symlink
624
while [[ -h "$source" ]]; do
@@ -27,12 +45,11 @@ function InstallDarcCli {
2745
echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g)
2846
fi
2947

30-
ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk"
31-
local toolset_version=$_ReadGlobalVersion
48+
local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json"
3249

3350
echo "Installing Darc CLI version $toolset_version..."
3451
echo "You may need to restart your command shell if this is the first dotnet tool you have installed."
35-
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $toolset_version -v $verbosity -g)
52+
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g)
3653
}
3754

3855
InstallDarcCli

eng/common/templates/job/job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ jobs:
108108
- name: ${{ pair.key }}
109109
value: ${{ pair.value }}
110110

111+
# DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds
112+
- ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
113+
- group: DotNet-HelixApi-Access
114+
111115
${{ if ne(parameters.workspace, '') }}:
112116
workspace: ${{ parameters.workspace }}
113117

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"dotnet": "2.1.403"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19119.2",
7-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19119.2"
6+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19121.1",
7+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19121.1"
88
},
99
"native-tools": {
1010
"python3": "3.7.1"

0 commit comments

Comments
 (0)