Skip to content

Commit d298bc4

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210727.1 (#35013)
[release/5.0] Update dependencies from dotnet/arcade
1 parent 93e5635 commit d298bc4

File tree

9 files changed

+42
-30
lines changed

9 files changed

+42
-30
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7-
<add key="darc-int-dotnet-efcore-1af30fd" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-1af30fd9/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-efcore -->
98
<!-- Begin: Package sources from dotnet-runtime -->
10-
<add key="darc-int-dotnet-runtime-35964c9" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-35964c92/nuget/v3/index.json" />
119
<!-- End: Package sources from dotnet-runtime -->
1210
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1311
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,10 +20,8 @@
2220
<clear />
2321
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2422
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-35964c9" value="true" />
2623
<!-- End: Package sources from dotnet-runtime -->
2724
<!-- Begin: Package sources from dotnet-efcore -->
28-
<add key="darc-int-dotnet-efcore-1af30fd" value="true" />
2925
<!-- End: Package sources from dotnet-efcore -->
3026
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3127
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,17 @@
313313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
314314
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
315315
</Dependency>
316-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21328.3">
316+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21377.1">
317317
<Uri>https://github.com/dotnet/arcade</Uri>
318-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
318+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
319319
</Dependency>
320-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21328.3">
320+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21377.1">
321321
<Uri>https://github.com/dotnet/arcade</Uri>
322-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
322+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
323323
</Dependency>
324-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21328.3">
324+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21377.1">
325325
<Uri>https://github.com/dotnet/arcade</Uri>
326-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
326+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
327327
</Dependency>
328328
</ToolsetDependencies>
329329
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<MicrosoftEntityFrameworkCorePackageVersion>5.0.8</MicrosoftEntityFrameworkCorePackageVersion>
137137
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.8</MicrosoftEntityFrameworkCoreDesignPackageVersion>
138138
<!-- Packages from dotnet/arcade -->
139-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21328.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
139+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21377.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
140140
</PropertyGroup>
141141
<!--
142142

‎eng/common/post-build/publish-using-darc.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ param(
1515

1616
try {
1717
. $PSScriptRoot\post-build-utils.ps1
18-
# Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel
19-
$darc = Get-Darc "1.1.0-beta.20418.1"
18+
19+
$darc = Get-Darc
2020

2121
$optionalParams = [System.Collections.ArrayList]::new()
2222

‎eng/common/sdl/execute-all-sdl-tools.ps1‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ try {
3232
$ErrorActionPreference = 'Stop'
3333
Set-StrictMode -Version 2.0
3434
$disableConfigureToolsetImport = $true
35-
$LASTEXITCODE = 0
35+
$global:LASTEXITCODE = 0
3636

3737
# `tools.ps1` checks $ci to perform some actions. Since the SDL
3838
# scripts don't necessarily execute in the same agent that run the
@@ -82,13 +82,22 @@ try {
8282

8383
if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) {
8484
& $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
85+
if ($LASTEXITCODE -ne 0) {
86+
ExitWithExitCode $LASTEXITCODE
87+
}
8588
}
8689
if ($SourceToolsList -and $SourceToolsList.Count -gt 0) {
8790
& $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
91+
if ($LASTEXITCODE -ne 0) {
92+
ExitWithExitCode $LASTEXITCODE
93+
}
8894
}
8995

9096
if ($UpdateBaseline) {
9197
& (Join-Path $PSScriptRoot 'push-gdn.ps1') -Repository $RepoName -BranchName $BranchName -GdnFolder $GdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason 'Update baseline'
98+
if ($LASTEXITCODE -ne 0) {
99+
ExitWithExitCode $LASTEXITCODE
100+
}
92101
}
93102

94103
if ($TsaPublish) {

‎eng/common/sdl/init-sdl.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Param(
1010
$ErrorActionPreference = 'Stop'
1111
Set-StrictMode -Version 2.0
1212
$disableConfigureToolsetImport = $true
13-
$LASTEXITCODE = 0
13+
$global:LASTEXITCODE = 0
1414

1515
# `tools.ps1` checks $ci to perform some actions. Since the SDL
1616
# scripts don't necessarily execute in the same agent that run the

‎eng/common/sdl/push-gdn.ps1‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Param(
99
$ErrorActionPreference = 'Stop'
1010
Set-StrictMode -Version 2.0
1111
$disableConfigureToolsetImport = $true
12-
$LASTEXITCODE = 0
12+
$global:LASTEXITCODE = 0
1313

1414
try {
1515
# `tools.ps1` checks $ci to perform some actions. Since the SDL
@@ -46,19 +46,26 @@ try {
4646
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git add failed with exit code $LASTEXITCODE."
4747
ExitWithExitCode $LASTEXITCODE
4848
}
49-
Write-Host "git -c user.email=`"[email protected]`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`""
50-
git -c user.email="[email protected]" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName"
49+
# check if there are any staged changes (0 = no changes, 1 = changes)
50+
# if we don't do this and there's nothing to commit `git commit` will return
51+
# exit code 1 and we will fail
52+
Write-Host "git diff --cached --exit-code"
53+
git diff --cached --exit-code
54+
Write-Host "git diff exit code: $LASTEXITCODE"
5155
if ($LASTEXITCODE -ne 0) {
52-
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git commit failed with exit code $LASTEXITCODE."
53-
ExitWithExitCode $LASTEXITCODE
56+
Write-Host "git -c user.email=`"[email protected]`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`""
57+
git -c user.email="[email protected]" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName"
58+
if ($LASTEXITCODE -ne 0) {
59+
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git commit failed with exit code $LASTEXITCODE."
60+
ExitWithExitCode $LASTEXITCODE
61+
}
62+
Write-Host 'git push'
63+
git push
64+
if ($LASTEXITCODE -ne 0) {
65+
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git push failed with exit code $LASTEXITCODE."
66+
ExitWithExitCode $LASTEXITCODE
67+
}
5468
}
55-
Write-Host 'git push'
56-
git push
57-
if ($LASTEXITCODE -ne 0) {
58-
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git push failed with exit code $LASTEXITCODE."
59-
ExitWithExitCode $LASTEXITCODE
60-
}
61-
6269
# Return to the original directory
6370
Pop-Location
6471
}

‎eng/common/sdl/run-sdl.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Param(
1313
$ErrorActionPreference = 'Stop'
1414
Set-StrictMode -Version 2.0
1515
$disableConfigureToolsetImport = $true
16-
$LASTEXITCODE = 0
16+
$global:LASTEXITCODE = 0
1717

1818
try {
1919
# `tools.ps1` checks $ci to perform some actions. Since the SDL

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21328.3",
34-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21328.3"
33+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21377.1",
34+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21377.1"
3535
}
3636
}

0 commit comments

Comments
 (0)