Skip to content

Commit 1fe1242

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210727.1 (#56801)
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 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 56dd1c1 commit 1fe1242

File tree

8 files changed

+75
-59
lines changed

8 files changed

+75
-59
lines changed

‎eng/Version.Details.xml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,61 +10,61 @@
1010
</Dependency>
1111
</ProductDependencies>
1212
<ToolsetDependencies>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21328.3">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21377.1">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
15+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21328.3">
17+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21377.1">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
19+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.21328.3">
21+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.21377.1">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
23+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.21328.3">
25+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.21377.1">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
27+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.21328.3">
29+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.21377.1">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
31+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.21328.3">
33+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.21377.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
35+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21328.3">
37+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21377.1">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
39+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.21328.3">
41+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.21377.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
43+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.21328.3">
45+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.21377.1">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
47+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.21328.3">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.21377.1">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
51+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.21328.3">
53+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.21377.1">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
55+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.21328.3">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.21377.1">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
59+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.21328.3">
61+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.21377.1">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
63+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.21328.3">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.21377.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>5266aa9856457785b84739fda2616f21da7ee6b4</Sha>
67+
<Sha>37d6692a72171966d9d1d786f03577cd5a3b8c12</Sha>
6868
</Dependency>
6969
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
7070
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848
</ItemGroup>
4949
<PropertyGroup>
5050
<!-- Arcade dependencies -->
51-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.21328.3</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.21328.3</MicrosoftDotNetBuildTasksFeedVersion>
53-
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.21328.3</MicrosoftDotNetCodeAnalysisVersion>
54-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.21328.3</MicrosoftDotNetGenAPIVersion>
55-
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.21328.3</MicrosoftDotNetGenFacadesVersion>
56-
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.21328.3</MicrosoftDotNetXUnitExtensionsVersion>
57-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21328.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
58-
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.21328.3</MicrosoftDotNetBuildTasksPackagingVersion>
59-
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.21328.3</MicrosoftDotNetRemoteExecutorVersion>
60-
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.21328.3</MicrosoftDotNetVersionToolsTasksVersion>
51+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.21377.1</MicrosoftDotNetApiCompatVersion>
52+
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.21377.1</MicrosoftDotNetBuildTasksFeedVersion>
53+
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.21377.1</MicrosoftDotNetCodeAnalysisVersion>
54+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.21377.1</MicrosoftDotNetGenAPIVersion>
55+
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.21377.1</MicrosoftDotNetGenFacadesVersion>
56+
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.21377.1</MicrosoftDotNetXUnitExtensionsVersion>
57+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21377.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
58+
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.21377.1</MicrosoftDotNetBuildTasksPackagingVersion>
59+
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.21377.1</MicrosoftDotNetRemoteExecutorVersion>
60+
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.21377.1</MicrosoftDotNetVersionToolsTasksVersion>
6161
<!-- Installer dependencies -->
6262
<MicrosoftNETCoreAppVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreAppVersion>
6363
<MicrosoftNETCoreDotNetHostVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreDotNetHostVersion>

‎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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"python3": "3.7.1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21328.3",
16-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21328.3",
17-
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21328.3",
18-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21328.3",
15+
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21377.1",
16+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21377.1",
17+
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21377.1",
18+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21377.1",
1919
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2020
"Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",
2121
"Microsoft.Build.NoTargets": "2.0.1",

0 commit comments

Comments
 (0)