Skip to content

Commit 832a43b

Browse files
[main] Update dependencies from dotnet/arcade (#1931)
* Update dependencies from https://github.com/dotnet/arcade build 20220922.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22471.2 -> To Version 8.0.0-beta.22472.1 * Update dependencies from https://github.com/dotnet/arcade build 20220923.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22471.2 -> To Version 8.0.0-beta.22473.1 * Update dependencies from https://github.com/dotnet/arcade build 20220926.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22471.2 -> To Version 8.0.0-beta.22476.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent a914669 commit 832a43b

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22471.2">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22476.4">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>d179a8bfc4f295329bbbed456d088a0dfbc61a56</Sha>
6+
<Sha>56800483b84c4934d0312a84978c2be0ebe27fa0</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22471.2">
8+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22476.4">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>d179a8bfc4f295329bbbed456d088a0dfbc61a56</Sha>
10+
<Sha>56800483b84c4934d0312a84978c2be0ebe27fa0</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22471.2">
12+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22476.4">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>d179a8bfc4f295329bbbed456d088a0dfbc61a56</Sha>
14+
<Sha>56800483b84c4934d0312a84978c2be0ebe27fa0</Sha>
1515
</Dependency>
1616
</ToolsetDependencies>
1717
<!-- ProductDependencies -->

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- Disabling the check for End of live TFMs since we still target netcoreapp 2.1 -->
55
<CheckEolTargetFramework>false</CheckEolTargetFramework>
66
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
7-
<MicrosoftDotNetGenAPIPackageVersion>8.0.0-beta.22471.2</MicrosoftDotNetGenAPIPackageVersion>
7+
<MicrosoftDotNetGenAPIPackageVersion>8.0.0-beta.22476.4</MicrosoftDotNetGenAPIPackageVersion>
88
<!-- dotnet/corefx dependencies -->
99
<SystemDrawingCommonPackageVersion>5.0.3</SystemDrawingCommonPackageVersion>
1010
<SystemIOPortsPackageVersion>5.0.1</SystemIOPortsPackageVersion>

eng/common/templates/job/execute-sdl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- job: Run_SDL
3535
dependsOn: ${{ parameters.dependsOn }}
3636
displayName: Run SDL tool
37-
condition: eq( ${{ parameters.enable }}, 'true')
37+
condition: and(succeededOrFailed(), eq( ${{ parameters.enable }}, 'true'))
3838
variables:
3939
- group: DotNet-VSTS-Bot
4040
- name: AzDOProjectName

eng/common/templates/post-build/post-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ stages:
9898
jobs:
9999
- job:
100100
displayName: NuGet Validation
101-
condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
101+
condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true'))
102102
pool:
103103
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
104104
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
@@ -282,4 +282,4 @@ stages:
282282
-MaestroToken '$(MaestroApiAccessToken)'
283283
-WaitPublishingFinish true
284284
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
285-
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
285+
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"version": "7.0.100-rc.1.22431.12"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22471.2",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22471.2",
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22476.4",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22476.4",
1717
"Microsoft.Build.Traversal": "3.1.6"
1818
}
1919
}

0 commit comments

Comments
 (0)