diff --git a/NuGet.config b/NuGet.config
index 0d4f22f6ccf379..90e21e18c5bffd 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -9,7 +9,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 44abec1071bb50..b64486cec2ab43 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -8,17 +8,17 @@
https://github.com/dotnet/msquic
7312355e44fd230b7aa26c7190f3870391751476
-
+
https://github.com/dotnet/emsdk
- 0e3ff3ea9054b5ab771db20d5a87923d97287bdb
+ 6c7f38c614304c93cd392907df7d5e770d5cf7f1
-
+
https://github.com/dotnet/emsdk
- 0e3ff3ea9054b5ab771db20d5a87923d97287bdb
+ 6c7f38c614304c93cd392907df7d5e770d5cf7f1
-
+
https://github.com/dotnet/emsdk
- 0e3ff3ea9054b5ab771db20d5a87923d97287bdb
+ 6c7f38c614304c93cd392907df7d5e770d5cf7f1
https://github.com/dotnet/wcf
@@ -26,77 +26,77 @@
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
https://github.com/microsoft/vstest
@@ -222,9 +222,9 @@
https://github.com/dotnet/xharness
233cbdd69acedc940fc3342f66b649ac0fb44333
-
+
https://github.com/dotnet/arcade
- 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
+ 91616785a1a6578c83f7e93d98c34a1eb83d6223
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index e7fbd8405e3105..851a89e62004da 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,11 +1,11 @@
- 6.0.20
+ 6.0.21
6
0
- 20
+ 21
6.0.400
servicing
@@ -42,21 +42,21 @@
1.1.0-preview.22164.17
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
- 2.5.1-beta.23221.7
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
- 6.0.0-beta.23221.7
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
+ 2.5.1-beta.23313.5
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
+ 6.0.0-beta.23313.5
6.0.0-preview.1.102
@@ -175,9 +175,9 @@
11.1.0-alpha.1.21416.1
11.1.0-alpha.1.21416.1
- 6.0.19
- 6.0.19
- 6.0.19
+ 6.0.20
+ 6.0.20
+ 6.0.20
$(MicrosoftNETWorkloadEmscriptenManifest60100Version)
1.1.87-gba258badda
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index e5784440d0bb29..0e10e7db69c77a 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -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 }}
@@ -144,15 +148,17 @@ jobs:
- 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(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
+ ${{ 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:
@@ -220,7 +226,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 }}
@@ -231,7 +237,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/global.json b/global.json
index 49180d70c9d093..51640c121ac78b 100644
--- a/global.json
+++ b/global.json
@@ -1,21 +1,21 @@
{
"sdk": {
- "version": "6.0.116",
+ "version": "6.0.118",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "6.0.116"
+ "dotnet": "6.0.118"
},
"native-tools": {
"cmake": "3.16.4",
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23221.7",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23221.7",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23221.7",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23221.7",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23313.5",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23313.5",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23313.5",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"