diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index e39fc127a1123..ef2073ccd06da 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.21404.1",
+ "version": "6.0.0-prerelease.23253.6",
"commands": [
"xharness"
]
diff --git a/NuGet.config b/NuGet.config
index 0ebeca39c37f9..717b6efefc900 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,6 +10,7 @@
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 382c3b8df38e0..c84adc92c9a40 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -26,77 +26,77 @@
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
https://github.com/microsoft/vstest
@@ -214,17 +214,17 @@
https://github.com/mono/linker
c8499798a2a09639174e2f5c694d6652794cc73d
-
+
https://github.com/dotnet/xharness
- e9669dc84ecd668d3bbb748758103e23b394ffef
+ bc2e9e39a7b424f6e96af8d677d12ac58606753a
-
+
https://github.com/dotnet/xharness
- e9669dc84ecd668d3bbb748758103e23b394ffef
+ bc2e9e39a7b424f6e96af8d677d12ac58606753a
-
+
https://github.com/dotnet/arcade
- 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26
+ 3d9c9a4d3d893e903bb3295fd5b55b8e40699888
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index aecc88f8a60a0..7bcb8b1213e54 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -42,21 +42,21 @@
1.1.0-preview.22164.17
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.7
- 2.5.1-beta.23211.7
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.7
- 6.0.0-beta.23211.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
+ 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-preview.1.102
@@ -143,8 +143,8 @@
1.0.1-prerelease-00006
17.4.0-preview-20220707-01
- 1.0.0-prerelease.21404.1
- 1.0.0-prerelease.21404.1
+ 6.0.0-prerelease.23253.6
+ 6.0.0-prerelease.23253.6
6.0.0-alpha.0.23226.4
2.4.2-pre.9
2.4.2
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 547d878da073a..e5784440d0bb2 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: ''
@@ -141,9 +141,13 @@ 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(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
+ disableComponentGovernance: false
+ ${{ else }}:
+ disableComponentGovernance: true
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml
new file mode 100644
index 0000000000000..babc2757d8d12
--- /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 85b8bcde770d4..49180d70c9d09 100644
--- a/global.json
+++ b/global.json
@@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23211.7",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23211.7",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23211.7",
+ "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.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"