Skip to content

Commit 38c9807

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20221221.1
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.22616.1 -> To Version 8.0.0-beta.22621.1
1 parent 41532b7 commit 38c9807

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
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="8.0.0-beta.22620.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22621.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>0cc119808e4affdda4b02cb81153de27bce9202e</Sha>
8+
<Sha>3003926e4126f827bca50d5b3ee179afc86d8a7b</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
1111
</ToolsetDependencies>

eng/common/tools.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,8 @@ function MSBuild-Core() {
815815
Write-Host "See log: $buildLog" -ForegroundColor DarkGray
816816
}
817817

818-
if ($ci) {
818+
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
819+
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null) {
819820
Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
820821
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
821822
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

eng/common/tools.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,9 @@ function MSBuild-Core {
472472
# We should not Write-PipelineTaskError here because that message shows up in the build summary
473473
# The build already logged an error, that's the reason it failed. Producing an error here only adds noise.
474474
echo "Build failed with exit code $exit_code. Check errors above."
475-
if [[ "$ci" == "true" ]]; then
475+
476+
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
477+
if [[ "$ci" == "true" && -n ${SYSTEM_TEAMPROJECT:-} ]]; then
476478
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
477479
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
478480
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
"rollForward": "patch"
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22620.3"
21+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22621.1"
2222
}
2323
}

0 commit comments

Comments
 (0)