Skip to content

Commit 7b0bb11

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 2023061.4 (#48844)
[release/7.0] Update dependencies from dotnet/arcade
1 parent 611243f commit 7b0bb11

File tree

6 files changed

+40
-28
lines changed

6 files changed

+40
-28
lines changed

‎NuGet.config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7-
<add key="darc-int-dotnet-efcore-81a09d5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-81a09d5f/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-efcore-81a09d5-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-81a09d5f-2/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-efcore-81a09d5-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-81a09d5f-1/nuget/v3/index.json" />
107
<!-- End: Package sources from dotnet-efcore -->
118
<!-- Begin: Package sources from dotnet-runtime -->
12-
<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" />
139
<!-- End: Package sources from dotnet-runtime -->
1410
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1511
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -28,12 +24,8 @@
2824
<clear />
2925
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3026
<!-- Begin: Package sources from dotnet-efcore -->
31-
<add key="darc-int-dotnet-efcore-81a09d5-1" value="true" />
32-
<add key="darc-int-dotnet-efcore-81a09d5-2" value="true" />
33-
<add key="darc-int-dotnet-efcore-81a09d5" value="true" />
3427
<!-- End: Package sources from dotnet-efcore -->
3528
<!-- Begin: Package sources from dotnet-runtime -->
36-
<add key="darc-int-dotnet-runtime-5b20af4" value="true" />
3729
<!-- End: Package sources from dotnet-runtime -->
3830
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3931
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303303
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23211.2">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23313.4">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
307+
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23211.2">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23313.4">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
312+
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23211.2">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23313.4">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
316+
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23211.2">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23313.4">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
320+
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
<MicrosoftEntityFrameworkCoreVersion>7.0.7</MicrosoftEntityFrameworkCoreVersion>
135135
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.7</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksInstallersVersion>
138-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksTemplatingVersion>
137+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksInstallersVersion>
138+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksTemplatingVersion>
139139
<!-- Packages from dotnet/source-build-externals -->
140140
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22505.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
141141
<!-- Packages from dotnet/xdt -->

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2",
31-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23211.2"
30+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23313.4",
31+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23313.4"
3232
}
3333
}

0 commit comments

Comments
 (0)