Skip to content

Commit 257b22e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20230613.4 (#7936)
[release/7.0] Update dependencies from dotnet/arcade
1 parent 6af5c12 commit 257b22e

File tree

6 files changed

+44
-26
lines changed

6 files changed

+44
-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-5b20af4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5b20af47/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" />
@@ -21,7 +20,6 @@
2120
<disabledPackageSources>
2221
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2322
<!-- Begin: Package sources from dotnet-runtime -->
24-
<add key="darc-int-dotnet-runtime-5b20af4" value="true" />
2523
<!-- End: Package sources from dotnet-runtime -->
2624
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2725
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,25 @@
7575
</Dependency>
7676
</ProductDependencies>
7777
<ToolsetDependencies>
78-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23211.2">
78+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23313.4">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
80+
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23211.2">
82+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23313.4">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
84+
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23211.2">
86+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23313.4">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
88+
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23211.2">
90+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23313.4">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
92+
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23211.2">
94+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23313.4">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
96+
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
9797
</Dependency>
9898
</ToolsetDependencies>
9999
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/arcade -->
5151
<PropertyGroup>
52-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23211.2</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.23211.2</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23313.4</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.23313.4</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
5656
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

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

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ parameters:
2424
enablePublishBuildAssets: false
2525
enablePublishTestResults: false
2626
enablePublishUsingPipelines: false
27-
disableComponentGovernance: false
27+
disableComponentGovernance: ''
2828
mergeTestResults: false
2929
testRunTitle: ''
3030
testResultsFormat: ''
@@ -73,6 +73,10 @@ jobs:
7373
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
7474
- name: EnableRichCodeNavigation
7575
value: 'true'
76+
# Retry signature validation up to three times, waiting 2 seconds between attempts.
77+
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
78+
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
79+
value: 3,2000
7680
- ${{ each variable in parameters.variables }}:
7781
# handle name-value variable syntax
7882
# example:
@@ -81,7 +85,7 @@ jobs:
8185
- ${{ if ne(variable.name, '') }}:
8286
- name: ${{ variable.name }}
8387
value: ${{ variable.value }}
84-
88+
8589
# handle variable groups
8690
- ${{ if ne(variable.group, '') }}:
8791
- group: ${{ variable.group }}
@@ -142,14 +146,20 @@ jobs:
142146
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
143147
continueOnError: true
144148

145-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
146-
- task: ComponentGovernanceComponentDetection@0
147-
continueOnError: true
149+
- template: /eng/common/templates/steps/component-governance.yml
150+
parameters:
151+
${{ if eq(parameters.disableComponentGovernance, '') }}:
152+
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
153+
disableComponentGovernance: false
154+
${{ else }}:
155+
disableComponentGovernance: true
156+
${{ else }}:
157+
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
148158

149159
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
150160
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
151161
- task: MicroBuildCleanup@1
152-
displayName: Execute Microbuild cleanup tasks
162+
displayName: Execute Microbuild cleanup tasks
153163
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
154164
continueOnError: ${{ parameters.continueOnError }}
155165
env:
@@ -217,7 +227,7 @@ jobs:
217227
displayName: Publish XUnit Test Results
218228
inputs:
219229
testResultsFormat: 'xUnit'
220-
testResultsFiles: '*.xml'
230+
testResultsFiles: '*.xml'
221231
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
222232
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
223233
mergeTestResults: ${{ parameters.mergeTestResults }}
@@ -228,7 +238,7 @@ jobs:
228238
displayName: Publish TRX Test Results
229239
inputs:
230240
testResultsFormat: 'VSTest'
231-
testResultsFiles: '*.trx'
241+
testResultsFiles: '*.trx'
232242
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
233243
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
234244
mergeTestResults: ${{ parameters.mergeTestResults }}

‎eng/common/templates/steps/component-governance.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
parameters:
2+
disableComponentGovernance: false
3+
4+
steps:
5+
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
6+
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
7+
displayName: Set skipComponentGovernanceDetection variable
8+
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
9+
- task: ComponentGovernanceComponentDetection@0
10+
continueOnError: true

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.105",
3+
"dotnet": "7.0.107",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2",
16-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23211.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23313.4",
16+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23313.4"
1717
},
1818
"sdk": {
19-
"version": "7.0.105"
19+
"version": "7.0.107"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)