Skip to content

Commit c0681c2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20220309.5 (#6364)
[release/5.0] Update dependencies from dotnet/arcade
1 parent 8be8ff4 commit c0681c2

File tree

8 files changed

+21
-26
lines changed

8 files changed

+21
-26
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8-
<add key="darc-int-dotnet-runtime-3065735" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3065735b/nuget/v3/index.json" />
98
<!-- End: Package sources from dotnet-runtime -->
109
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1110
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -17,7 +16,6 @@
1716
<disabledPackageSources>
1817
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1918
<!-- Begin: Package sources from dotnet-runtime -->
20-
<add key="darc-int-dotnet-runtime-3065735" value="true" />
2119
<!-- End: Package sources from dotnet-runtime -->
2220
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2321
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,25 +103,25 @@
103103
</Dependency>
104104
</ProductDependencies>
105105
<ToolsetDependencies>
106-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.22055.3">
106+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.22159.5">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>e5953f277abe1f5bd45003fb5834f5b1674be1eb</Sha>
108+
<Sha>ee744068a4fcccc5b8b56e0025f9c95aa19ff318</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.22055.3">
110+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.22159.5">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>e5953f277abe1f5bd45003fb5834f5b1674be1eb</Sha>
112+
<Sha>ee744068a4fcccc5b8b56e0025f9c95aa19ff318</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.22055.3">
114+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.22159.5">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>e5953f277abe1f5bd45003fb5834f5b1674be1eb</Sha>
116+
<Sha>ee744068a4fcccc5b8b56e0025f9c95aa19ff318</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.22055.3">
118+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.22159.5">
119119
<Uri>https://github.com/dotnet/arcade</Uri>
120-
<Sha>e5953f277abe1f5bd45003fb5834f5b1674be1eb</Sha>
120+
<Sha>ee744068a4fcccc5b8b56e0025f9c95aa19ff318</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.22055.3">
122+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.22159.5">
123123
<Uri>https://github.com/dotnet/arcade</Uri>
124-
<Sha>e5953f277abe1f5bd45003fb5834f5b1674be1eb</Sha>
124+
<Sha>ee744068a4fcccc5b8b56e0025f9c95aa19ff318</Sha>
125125
</Dependency>
126126
</ToolsetDependencies>
127127
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
</PropertyGroup>
4343
<!-- Packages that come from https://github.com/dotnet/arcade -->
4444
<PropertyGroup>
45-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.22055.3</MicrosoftDotNetApiCompatVersion>
46-
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.22055.3</MicrosoftDotNetCodeAnalysisPackageVersion>
47-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.22055.3</MicrosoftDotNetGenAPIVersion>
45+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.22159.5</MicrosoftDotNetApiCompatVersion>
46+
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.22159.5</MicrosoftDotNetCodeAnalysisPackageVersion>
47+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.22159.5</MicrosoftDotNetGenAPIVersion>
4848
</PropertyGroup>
4949
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
5050
<PropertyGroup>

‎eng/common/templates/job/job.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ parameters:
2525
enablePublishTestResults: false
2626
enablePublishUsingPipelines: false
2727
useBuildManifest: false
28+
disableComponentGovernance: false
2829
mergeTestResults: false
2930
testRunTitle: ''
3031
name: ''
@@ -136,6 +137,10 @@ jobs:
136137
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
137138
continueOnError: true
138139

140+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
141+
- task: ComponentGovernanceComponentDetection@0
142+
continueOnError: true
143+
139144
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
140145
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
141146
- task: MicroBuildCleanup@1

‎eng/common/templates/job/publish-build-assets.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ jobs:
3737
- name: _BuildConfig
3838
value: ${{ parameters.configuration }}
3939
- group: Publish-Build-Assets
40-
# Skip component governance and codesign validation for SDL. These jobs
41-
# create no content.
42-
- name: skipComponentGovernanceDetection
43-
value: true
4440
- name: runCodesignValidationInjection
4541
value: false
4642

‎eng/common/templates/jobs/jobs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77

88
# Optional: Enable publishing using release pipelines
99
enablePublishUsingPipelines: false
10-
10+
1111
graphFileGeneration:
1212
# Optional: Enable generating the graph files at the end of the build
1313
enabled: false

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,5 @@ variables:
9191
- name: InternalInstallersBlobFeedKey
9292
value: $(dotnetclimsrc-access-key)
9393

94-
# Skip component governance and codesign validation for SDL. These jobs
95-
# create no content.
96-
- name: skipComponentGovernanceDetection
97-
value: true
9894
- name: runCodesignValidationInjection
9995
value: false

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.22055.3",
16-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.22055.3"
15+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.22159.5",
16+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.22159.5"
1717
},
1818
"sdk": {
1919
"version": "5.0.401"

0 commit comments

Comments
 (0)