From 7b0bb114cbeb320799fdcfb94a06af05b41a35f6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 15 Jun 2023 22:44:09 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20230613.4 (#48844)
[release/7.0] Update dependencies from dotnet/arcade
---
NuGet.config | 8 ------
eng/Version.Details.xml | 16 ++++++------
eng/Versions.props | 4 +--
eng/common/templates/job/job.yml | 26 +++++++++++++------
.../templates/steps/component-governance.yml | 10 +++++++
global.json | 4 +--
6 files changed, 40 insertions(+), 28 deletions(-)
create mode 100644 eng/common/templates/steps/component-governance.yml
diff --git a/NuGet.config b/NuGet.config
index 653bce8caccf..ecf11c3e4032 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,12 +4,8 @@
-
-
-
-
@@ -28,12 +24,8 @@
-
-
-
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fe08af6e15bd..e3ae8e557bea 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -302,22 +302,22 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
5b20af47d99620150c53eaf5db8636fdf730b126
-
+
https://github.com/dotnet/arcade
- 7c5e5a782c67460b123c8e41d484ebcca8002c93
+ 59ac824080b9807fd91dbc8a6d2b4447e74874ab
-
+
https://github.com/dotnet/arcade
- 7c5e5a782c67460b123c8e41d484ebcca8002c93
+ 59ac824080b9807fd91dbc8a6d2b4447e74874ab
-
+
https://github.com/dotnet/arcade
- 7c5e5a782c67460b123c8e41d484ebcca8002c93
+ 59ac824080b9807fd91dbc8a6d2b4447e74874ab
-
+
https://github.com/dotnet/arcade
- 7c5e5a782c67460b123c8e41d484ebcca8002c93
+ 59ac824080b9807fd91dbc8a6d2b4447e74874ab
diff --git a/eng/Versions.props b/eng/Versions.props
index 8d07fe07f69e..153848b7035b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -134,8 +134,8 @@
7.0.7
7.0.7
- 7.0.0-beta.23211.2
- 7.0.0-beta.23211.2
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
7.0.0-alpha.1.22505.1
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index e3ba9398016b..ef337eac55ec 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -24,7 +24,7 @@ parameters:
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishUsingPipelines: false
- disableComponentGovernance: false
+ disableComponentGovernance: ''
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
@@ -73,6 +73,10 @@ jobs:
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
- name: EnableRichCodeNavigation
value: 'true'
+ # Retry signature validation up to three times, waiting 2 seconds between attempts.
+ # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
+ - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
+ value: 3,2000
- ${{ each variable in parameters.variables }}:
# handle name-value variable syntax
# example:
@@ -81,7 +85,7 @@ jobs:
- ${{ if ne(variable.name, '') }}:
- name: ${{ variable.name }}
value: ${{ variable.value }}
-
+
# handle variable groups
- ${{ if ne(variable.group, '') }}:
- group: ${{ variable.group }}
@@ -142,14 +146,20 @@ jobs:
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
continueOnError: true
- - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
- - task: ComponentGovernanceComponentDetection@0
- continueOnError: true
+ - template: /eng/common/templates/steps/component-governance.yml
+ parameters:
+ ${{ if eq(parameters.disableComponentGovernance, '') }}:
+ ${{ 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'))) }}:
+ disableComponentGovernance: false
+ ${{ else }}:
+ disableComponentGovernance: true
+ ${{ else }}:
+ disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: MicroBuildCleanup@1
- displayName: Execute Microbuild cleanup tasks
+ displayName: Execute Microbuild cleanup tasks
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
continueOnError: ${{ parameters.continueOnError }}
env:
@@ -217,7 +227,7 @@ jobs:
displayName: Publish XUnit Test Results
inputs:
testResultsFormat: 'xUnit'
- testResultsFiles: '*.xml'
+ testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
mergeTestResults: ${{ parameters.mergeTestResults }}
@@ -228,7 +238,7 @@ jobs:
displayName: Publish TRX Test Results
inputs:
testResultsFormat: 'VSTest'
- testResultsFiles: '*.trx'
+ testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
mergeTestResults: ${{ parameters.mergeTestResults }}
diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml
new file mode 100644
index 000000000000..babc2757d8d1
--- /dev/null
+++ b/eng/common/templates/steps/component-governance.yml
@@ -0,0 +1,10 @@
+parameters:
+ disableComponentGovernance: false
+
+steps:
+- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
+ - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
+ displayName: Set skipComponentGovernanceDetection variable
+- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
+ - task: ComponentGovernanceComponentDetection@0
+ continueOnError: true
\ No newline at end of file
diff --git a/global.json b/global.json
index c5c5e7788d47..afc8fc984bd9 100644
--- a/global.json
+++ b/global.json
@@ -27,7 +27,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.22.10",
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23211.2"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23313.4",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23313.4"
}
}