diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index cdf6a3b27b874..61de9e3a631a2 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "7.0.0-prerelease.23253.3",
+ "version": "7.0.0-prerelease.23309.1",
"commands": [
"xharness"
]
diff --git a/NuGet.config b/NuGet.config
index c74a3f35183d7..2428270b1af85 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -9,7 +9,7 @@
-
+
@@ -53,22 +53,22 @@
7.0.100-rc.1.22402.1
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 2.5.1-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
- 7.0.0-beta.23228.7
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 2.5.1-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
+ 7.0.0-beta.23313.4
6.0.0-preview.1.102
@@ -154,9 +154,9 @@
1.1.0
17.4.0-preview-20220707-01
- 7.0.0-prerelease.23253.3
- 7.0.0-prerelease.23253.3
- 7.0.0-prerelease.23253.3
+ 7.0.0-prerelease.23309.1
+ 7.0.0-prerelease.23309.1
+ 7.0.0-prerelease.23309.1
7.0.0-alpha.0.23226.5
2.4.2
1.0.0
diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss
index 858a0b237c62c..6661fed566e49 100644
Binary files a/eng/common/loc/P22DotNetHtmlLocalization.lss and b/eng/common/loc/P22DotNetHtmlLocalization.lss differ
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 3cb5145eabf74..ef337eac55ecf 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 }}
@@ -145,15 +149,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:
@@ -221,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 }}
@@ -232,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/global.json b/global.json
index 8a868c539e960..4a33c6145d312 100644
--- a/global.json
+++ b/global.json
@@ -1,16 +1,16 @@
{
"sdk": {
- "version": "7.0.105",
+ "version": "7.0.107",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "7.0.105"
+ "dotnet": "7.0.107"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23228.7",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23228.7",
- "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23228.7",
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23313.4",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23313.4",
+ "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23313.4",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"