Skip to content

Commit ef99bf4

Browse files
dotnet-maestro[bot]baronfel
dotnet-maestro[bot]
authored and
baronfel
committed
Update dependencies from https://github.com/dotnet/arcade build 20190731.19 (#7320)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19381.19
1 parent 81d0e62 commit ef99bf4

File tree

6 files changed

+128
-7
lines changed

6 files changed

+128
-7
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19380.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19381.19">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>def377f94747dac91482aad67b33a1c011ffc770</Sha>
8+
<Sha>48787606d809963cc800151cbfbefe0a74ae74b4</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/init-tools-native.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ function ReadGlobalJsonNativeTools {
7070
# Only extract the contents of the object.
7171
local native_tools_list=$(echo $native_tools_section | awk -F"[{}]" '{print $2}')
7272
native_tools_list=${native_tools_list//[\" ]/}
73-
native_tools_list=${native_tools_list//,/$'\n'}
74-
native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[[:space:]]')"
73+
native_tools_list=$( echo "$native_tools_list" | sed 's/\s//g' | sed 's/,/\n/g' )
7574

7675
local old_IFS=$IFS
7776
while read -r line; do
@@ -108,6 +107,7 @@ else
108107
installer_command+=" --baseuri $base_uri"
109108
installer_command+=" --installpath $install_bin"
110109
installer_command+=" --version $tool_version"
110+
echo $installer_command
111111

112112
if [[ $force = true ]]; then
113113
installer_command+=" --force"

‎eng/common/native/install-cmake-test.sh‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
#!/usr/bin/env bash
2+
3+
source="${BASH_SOURCE[0]}"
4+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
5+
6+
. $scriptroot/common-library.sh
7+
8+
base_uri=
9+
install_path=
10+
version=
11+
clean=false
12+
force=false
13+
download_retries=5
14+
retry_wait_time_seconds=30
15+
16+
while (($# > 0)); do
17+
lowerI="$(echo $1 | awk '{print tolower($0)}')"
18+
case $lowerI in
19+
--baseuri)
20+
base_uri=$2
21+
shift 2
22+
;;
23+
--installpath)
24+
install_path=$2
25+
shift 2
26+
;;
27+
--version)
28+
version=$2
29+
shift 2
30+
;;
31+
--clean)
32+
clean=true
33+
shift 1
34+
;;
35+
--force)
36+
force=true
37+
shift 1
38+
;;
39+
--downloadretries)
40+
download_retries=$2
41+
shift 2
42+
;;
43+
--retrywaittimeseconds)
44+
retry_wait_time_seconds=$2
45+
shift 2
46+
;;
47+
--help)
48+
echo "Common settings:"
49+
echo " --baseuri <value> Base file directory or Url wrom which to acquire tool archives"
50+
echo " --installpath <value> Base directory to install native tool to"
51+
echo " --clean Don't install the tool, just clean up the current install of the tool"
52+
echo " --force Force install of tools even if they previously exist"
53+
echo " --help Print help and exit"
54+
echo ""
55+
echo "Advanced settings:"
56+
echo " --downloadretries Total number of retry attempts"
57+
echo " --retrywaittimeseconds Wait time between retry attempts in seconds"
58+
echo ""
59+
exit 0
60+
;;
61+
esac
62+
done
63+
64+
tool_name="cmake-test"
65+
tool_os=$(GetCurrentOS)
66+
tool_folder=$(echo $tool_os | awk '{print tolower($0)}')
67+
tool_arch="x86_64"
68+
tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch"
69+
tool_install_directory="$install_path/$tool_name/$version"
70+
tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name"
71+
shim_path="$install_path/$tool_name.sh"
72+
uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz"
73+
74+
# Clean up tool and installers
75+
if [[ $clean = true ]]; then
76+
echo "Cleaning $tool_install_directory"
77+
if [[ -d $tool_install_directory ]]; then
78+
rm -rf $tool_install_directory
79+
fi
80+
81+
echo "Cleaning $shim_path"
82+
if [[ -f $shim_path ]]; then
83+
rm -rf $shim_path
84+
fi
85+
86+
tool_temp_path=$(GetTempPathFileName $uri)
87+
echo "Cleaning $tool_temp_path"
88+
if [[ -f $tool_temp_path ]]; then
89+
rm -rf $tool_temp_path
90+
fi
91+
92+
exit 0
93+
fi
94+
95+
# Install tool
96+
if [[ -f $tool_file_path ]] && [[ $force = false ]]; then
97+
echo "$tool_name ($version) already exists, skipping install"
98+
exit 0
99+
fi
100+
101+
DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds
102+
103+
if [[ $? != 0 ]]; then
104+
echo "Installation failed" >&2
105+
exit 1
106+
fi
107+
108+
# Generate Shim
109+
# Always rewrite shims so that we are referencing the expected version
110+
NewScriptShim $shim_path $tool_file_path true
111+
112+
if [[ $? != 0 ]]; then
113+
echo "Shim generation failed" >&2
114+
exit 1
115+
fi
116+
117+
exit 0

‎eng/common/native/install-cmake.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch"
6969
tool_install_directory="$install_path/$tool_name/$version"
7070
tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name"
7171
shim_path="$install_path/$tool_name.sh"
72-
uri="${base_uri}/$tool_folder/cmake/$tool_name_moniker.tar.gz"
72+
uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz"
7373

7474
# Clean up tool and installers
7575
if [[ $clean = true ]]; then

‎eng/common/templates/job/job.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ parameters:
3737
# Optional: Enable publishing to the build asset registry
3838
enablePublishBuildAssets: false
3939

40+
# Optional: Prevent gather/push manifest from executing when using publishing pipelines
41+
enablePublishUsingPipelines: false
42+
4043
# Optional: Include PublishTestResults task
4144
enablePublishTestResults: false
4245

@@ -187,14 +190,15 @@ jobs:
187190
continueOnError: true
188191
condition: always()
189192

190-
- ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(variables['_PublishUsingPipelines'], 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
193+
- ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
191194
- task: CopyFiles@2
192195
displayName: Gather Asset Manifests
193196
inputs:
194197
SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest'
195198
TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
196199
continueOnError: ${{ parameters.continueOnError }}
197200
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
201+
198202
- task: PublishBuildArtifacts@1
199203
displayName: Push Asset Manifests
200204
inputs:

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19380.3",
13+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19381.19",
1414
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1515
}
1616
}

0 commit comments

Comments
 (0)