Skip to content

Commit bccd031

Browse files
dotnet-maestro[bot]baronfel
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20190718.7 (#7256)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19368.7
1 parent d4866e4 commit bccd031

File tree

4 files changed

+87
-20
lines changed

4 files changed

+87
-20
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.19367.8">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19368.7">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>2359dc4184133defa27c8f3072622270b71b4ecf</Sha>
8+
<Sha>eecde8a8751dbe7fdb17ba4dfbd032e26f4cae7d</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/pipeline-logging-functions.sh

Lines changed: 76 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ function Write-PipelineTaskError {
3939
return
4040
fi
4141

42-
message_type="error"
43-
sourcepath=''
44-
linenumber=''
45-
columnnumber=''
46-
error_code=''
42+
local message_type="error"
43+
local sourcepath=''
44+
local linenumber=''
45+
local columnnumber=''
46+
local error_code=''
4747

4848
while [[ $# -gt 0 ]]; do
4949
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
@@ -76,7 +76,7 @@ function Write-PipelineTaskError {
7676
shift
7777
done
7878

79-
message="##vso[task.logissue"
79+
local message="##vso[task.logissue"
8080

8181
message="$message type=$message_type"
8282

@@ -100,3 +100,73 @@ function Write-PipelineTaskError {
100100
echo "$message"
101101
}
102102

103+
function Write-PipelineSetVariable {
104+
if [[ "$ci" != true ]]; then
105+
return
106+
fi
107+
108+
local name=''
109+
local value=''
110+
local secret=false
111+
local as_output=false
112+
local is_multi_job_variable=true
113+
114+
while [[ $# -gt 0 ]]; do
115+
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
116+
case "$opt" in
117+
-name|-n)
118+
name=$2
119+
shift
120+
;;
121+
-value|-v)
122+
value=$2
123+
shift
124+
;;
125+
-secret|-s)
126+
secret=true
127+
;;
128+
-as_output|-a)
129+
as_output=true
130+
;;
131+
-is_multi_job_variable|-i)
132+
is_multi_job_variable=$2
133+
shift
134+
;;
135+
esac
136+
shift
137+
done
138+
139+
value=${value/;/%3B}
140+
value=${value/\\r/%0D}
141+
value=${value/\\n/%0A}
142+
value=${value/]/%5D}
143+
144+
local message="##vso[task.setvariable variable=$name;isSecret=$secret;isOutput=$is_multi_job_variable]$value"
145+
146+
if [[ "$as_output" == true ]]; then
147+
$message
148+
else
149+
echo "$message"
150+
fi
151+
}
152+
153+
function Write-PipelinePrependPath {
154+
local prepend_path=''
155+
156+
while [[ $# -gt 0 ]]; do
157+
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
158+
case "$opt" in
159+
-path|-p)
160+
prepend_path=$2
161+
shift
162+
;;
163+
esac
164+
shift
165+
done
166+
167+
export PATH="$prepend_path:$PATH"
168+
169+
if [[ "$ci" == true ]]; then
170+
echo "##vso[task.prependpath]$prepend_path"
171+
fi
172+
}

eng/common/tools.sh

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,10 @@ function InitializeDotNetCli {
146146

147147
# Add dotnet to PATH. This prevents any bare invocation of dotnet in custom
148148
# build steps from using anything other than what we've downloaded.
149-
export PATH="$dotnet_root:$PATH"
149+
Write-PipelinePrependPath -path "$dotnet_root"
150150

151-
if [[ $ci == true ]]; then
152-
# Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build
153-
echo "##vso[task.prependpath]$dotnet_root"
154-
echo "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0"
155-
echo "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1"
156-
fi
151+
Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
152+
Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1"
157153

158154
# return value
159155
_InitializeDotNetCli="$dotnet_root"
@@ -387,7 +383,8 @@ mkdir -p "$toolset_dir"
387383
mkdir -p "$temp_dir"
388384
mkdir -p "$log_dir"
389385

390-
if [[ $ci == true ]]; then
391-
export TEMP="$temp_dir"
392-
export TMP="$temp_dir"
393-
fi
386+
Write-PipelineSetVariable -name "Artifacts" -value "$artifacts_dir"
387+
Write-PipelineSetVariable -name "Artifacts.Toolset" -value "$toolset_dir"
388+
Write-PipelineSetVariable -name "Artifacts.Log" -value "$log_dir"
389+
Write-PipelineSetVariable -name "Temp" -value "$temp_dir"
390+
Write-PipelineSetVariable -name "TMP" -value "$temp_dir"

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.19367.8",
13+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19368.7",
1414
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1515
}
1616
}

0 commit comments

Comments
 (0)