From cb70f61bc713786eff2a848b54a6f86c7d5b10a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Aug 2021 21:16:21 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20210727.1 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.ApiCompat From Version 5.0.0-beta.21328.3 -> To Version 5.0.0-beta.21377.1 --- eng/Version.Details.xml | 56 ++++++++++---------- eng/Versions.props | 20 +++---- eng/common/post-build/publish-using-darc.ps1 | 4 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 11 +++- eng/common/sdl/init-sdl.ps1 | 2 +- eng/common/sdl/push-gdn.ps1 | 31 ++++++----- eng/common/sdl/run-sdl.ps1 | 2 +- global.json | 8 +-- 8 files changed, 75 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97988db5dea5c8..38c7027e666d19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,61 +10,61 @@ - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 5aeea3f16a0dd0..33fc2cc5f7e7a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,16 +48,16 @@ - 5.0.0-beta.21328.3 - 5.0.0-beta.21328.3 - 5.0.0-beta.21328.3 - 5.0.0-beta.21328.3 - 5.0.0-beta.21328.3 - 5.0.0-beta.21328.3 - 2.5.1-beta.21328.3 - 5.0.0-beta.21328.3 - 5.0.0-beta.21328.3 - 5.0.0-beta.21328.3 + 5.0.0-beta.21377.1 + 5.0.0-beta.21377.1 + 5.0.0-beta.21377.1 + 5.0.0-beta.21377.1 + 5.0.0-beta.21377.1 + 5.0.0-beta.21377.1 + 2.5.1-beta.21377.1 + 5.0.0-beta.21377.1 + 5.0.0-beta.21377.1 + 5.0.0-beta.21377.1 5.0.0-rc.1.20451.14 5.0.0-rc.1.20451.14 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index a40ee827a43195..3396cd5271696e 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -15,8 +15,8 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - # Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel - $darc = Get-Darc "1.1.0-beta.20418.1" + + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index b681d797cdae9c..b6a7de26b47b32 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -32,7 +32,7 @@ try { $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true - $LASTEXITCODE = 0 + $global:LASTEXITCODE = 0 # `tools.ps1` checks $ci to perform some actions. Since the SDL # scripts don't necessarily execute in the same agent that run the @@ -82,13 +82,22 @@ try { if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) { & $(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 + if ($LASTEXITCODE -ne 0) { + ExitWithExitCode $LASTEXITCODE + } } if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { & $(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 + if ($LASTEXITCODE -ne 0) { + ExitWithExitCode $LASTEXITCODE + } } if ($UpdateBaseline) { & (Join-Path $PSScriptRoot 'push-gdn.ps1') -Repository $RepoName -BranchName $BranchName -GdnFolder $GdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason 'Update baseline' + if ($LASTEXITCODE -ne 0) { + ExitWithExitCode $LASTEXITCODE + } } if ($TsaPublish) { diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index bb6a4297110881..ac1bc4b87bb0a3 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -10,7 +10,7 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true -$LASTEXITCODE = 0 +$global:LASTEXITCODE = 0 # `tools.ps1` checks $ci to perform some actions. Since the SDL # scripts don't necessarily execute in the same agent that run the diff --git a/eng/common/sdl/push-gdn.ps1 b/eng/common/sdl/push-gdn.ps1 index d8fd2d82a68d04..c2eec7d92c94ef 100644 --- a/eng/common/sdl/push-gdn.ps1 +++ b/eng/common/sdl/push-gdn.ps1 @@ -9,7 +9,7 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true -$LASTEXITCODE = 0 +$global:LASTEXITCODE = 0 try { # `tools.ps1` checks $ci to perform some actions. Since the SDL @@ -46,19 +46,26 @@ try { Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git add failed with exit code $LASTEXITCODE." ExitWithExitCode $LASTEXITCODE } - Write-Host "git -c user.email=`"dn-bot@microsoft.com`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`"" - git -c user.email="dn-bot@microsoft.com" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName" + # check if there are any staged changes (0 = no changes, 1 = changes) + # if we don't do this and there's nothing to commit `git commit` will return + # exit code 1 and we will fail + Write-Host "git diff --cached --exit-code" + git diff --cached --exit-code + Write-Host "git diff exit code: $LASTEXITCODE" if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git commit failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE + Write-Host "git -c user.email=`"dn-bot@microsoft.com`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`"" + git -c user.email="dn-bot@microsoft.com" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName" + if ($LASTEXITCODE -ne 0) { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git commit failed with exit code $LASTEXITCODE." + ExitWithExitCode $LASTEXITCODE + } + Write-Host 'git push' + git push + if ($LASTEXITCODE -ne 0) { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git push failed with exit code $LASTEXITCODE." + ExitWithExitCode $LASTEXITCODE + } } - Write-Host 'git push' - git push - if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git push failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE - } - # Return to the original directory Pop-Location } diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index fe95ab35aa5d12..3d9c87aba6acf2 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -13,7 +13,7 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true -$LASTEXITCODE = 0 +$global:LASTEXITCODE = 0 try { # `tools.ps1` checks $ci to perform some actions. Since the SDL diff --git a/global.json b/global.json index d5459e34345fa8..3db0b4dc053e34 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21328.3", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21328.3", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21328.3", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21328.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21377.1", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21377.1", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21377.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21377.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "2.0.1",