Skip to content

Commit 7c002df

Browse files
carlossanlopcarlossanlop
authored
Merge pull request #86296 from carlossanlop/release/7.0-staging
[manual] Merge release/7.0-staging into release/7.0
2 parents d1506cd + 751fa8b commit 7c002df

File tree

81 files changed

+2056
-2056
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2056
-2056
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "1.0.0-prerelease.22411.1",
18+
"version": "7.0.0-prerelease.23253.3",
1919
"commands": [
2020
"xharness"
2121
]

‎.github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,4 @@ main PR <!-- Link to PR if any that fixed this in the main branch. -->
2424

2525
# Package authoring signed off?
2626

27-
28-
IMPORTANT: If this change touches code that ships in a NuGet package, please make certain that you have added any necessary [package authoring](https://github.com/dotnet/runtime/blob/main/docs/project/library-servicing.md) and gotten it explicitly reviewed.
27+
IMPORTANT: If this change touches code that ships in a NuGet package, please make certain that you have added any necessary [package authoring](../../docs/project/library-servicing.md) and gotten it explicitly reviewed.

‎.github/workflows/check-service-labels.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ jobs:
1313
check-labels:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- name: Check servicing labels
16+
- name: Check 'Servicing-approved' label
1717
run: |
18+
echo "Merging permission is enabled for servicing PRs when the `Servicing-approved` label is applied."
1819
if [ "${{ contains(github.event.pull_request.labels.*.name, 'Servicing-approved') }}" = "true" ]; then
1920
exit 0
2021
else
22+
echo "::error:: 'Servicing-approved' label not applied to the PR yet. More information: https://github.com/dotnet/runtime/blob/main/docs/project/library-servicing.md#approval-process"
2123
exit 1
2224
fi

‎docs/project/library-servicing.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# How to service a library
22

3-
This document provides the steps necessary after modifying a library in a servicing branch.
3+
This document provides the steps that need to be followed after modifying a library in a servicing branch.
44

55
Servicing branches represent shipped versions of .NET, and their name is in the format `release/X.0-staging`. Examples:
66

@@ -41,5 +41,15 @@ All the servicing change must go through an approval process. You have two ways
4141
For both cases, you must:
4242

4343
- Fill out the template of the PR description.
44-
- Add the `servicing-consider` label.
45-
- Bring it to the attention of the engineering lead responsible for the area, so they consider the fix for servicing.
44+
- Bring it to the attention of the [engineering lead responsible for the area](~/docs/area-owners.md).
45+
- If the fix is a product change, the area owner will:
46+
- Add the `Servicing-consider` label.
47+
- Ask the area owner to champion your PR in the .NET Tactics meeting to request merge approval.
48+
- If the change is approved, they will replace the `Servicing-consider` label by `Servicing-approved` and sign-off the PR.
49+
- If the fix is a test-only or infra-only change, the area owner will:
50+
- Review the PR and sign-off if they approve it.
51+
- Add the `Servicing-approved` label.
52+
53+
The area owner can then merge the PR once the CI looks good (it's either green or the failures are investigated and determined to be unrelated to the PR).
54+
55+
**Note**: Applying the `Servicing-approved` label ensures the `check-service-labels` CI job passes, which is a mandatory requirement for merging a PR in a servicing branch.

‎eng/Version.Details.xml

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -58,77 +58,77 @@
5858
</Dependency>
5959
</ProductDependencies>
6060
<ToolsetDependencies>
61-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23211.2">
61+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
63+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23211.2">
65+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
67+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23211.2">
69+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23228.7">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
71+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23211.2">
73+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23228.7">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
75+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23211.2">
77+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23228.7">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
79+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23211.2">
81+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
83+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23211.2">
85+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23228.7">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
87+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23211.2">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23228.7">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
91+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23211.2">
93+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23228.7">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
95+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23211.2">
97+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23228.7">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
99+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23211.2">
101+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23228.7">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
103+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23211.2">
105+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23228.7">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
107+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23211.2">
109+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23228.7">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
111+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23211.2">
113+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23228.7">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
115+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23211.2">
117+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23228.7">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
119+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23211.2">
121+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
123+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23211.2">
125+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23228.7">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
127+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23211.2">
129+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23228.7">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
131+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
132132
</Dependency>
133133
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23179.6">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -242,25 +242,25 @@
242242
<Uri>https://github.com/dotnet/runtime</Uri>
243243
<Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
244244
</Dependency>
245-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.23207.1">
245+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.23211.1">
246246
<Uri>https://github.com/dotnet/linker</Uri>
247-
<Sha>08a09f27f664fb84368aa4b9eb862b13bf808579</Sha>
247+
<Sha>9d4b3f3e0c100fe5ac4dc7f40d14d792178dbd0c</Sha>
248248
</Dependency>
249-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22411.1">
249+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="7.0.0-prerelease.23253.3">
250250
<Uri>https://github.com/dotnet/xharness</Uri>
251-
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
251+
<Sha>2105520c1f824406b7738d715ad132bbd42a6d6b</Sha>
252252
</Dependency>
253-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22411.1">
253+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="7.0.0-prerelease.23253.3">
254254
<Uri>https://github.com/dotnet/xharness</Uri>
255-
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
255+
<Sha>2105520c1f824406b7738d715ad132bbd42a6d6b</Sha>
256256
</Dependency>
257-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22411.1">
257+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="7.0.0-prerelease.23253.3">
258258
<Uri>https://github.com/dotnet/xharness</Uri>
259-
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
259+
<Sha>2105520c1f824406b7738d715ad132bbd42a6d6b</Sha>
260260
</Dependency>
261-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23211.2">
261+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23228.7">
262262
<Uri>https://github.com/dotnet/arcade</Uri>
263-
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
263+
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
264264
</Dependency>
265265
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
266266
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -278,9 +278,9 @@
278278
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
279279
<Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
280280
</Dependency>
281-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.1.0-alpha.0.22470.1">
281+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="7.0.0-alpha.0.23226.5">
282282
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
283-
<Sha>14a4f4c6e6478b84cac9037935f823b40ddad01d</Sha>
283+
<Sha>d4a9c1673071b9ef797eefc18a7586c92fcd34a1</Sha>
284284
</Dependency>
285285
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.23179.6">
286286
<Uri>https://github.com/dotnet/runtime-assets</Uri>

‎eng/Versions.props

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,22 @@
5353
<!-- SDK dependencies -->
5454
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
5555
<!-- Arcade dependencies -->
56-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23211.2</MicrosoftDotNetApiCompatVersion>
57-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksFeedVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23211.2</MicrosoftDotNetCodeAnalysisVersion>
59-
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23211.2</MicrosoftDotNetGenAPIVersion>
60-
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23211.2</MicrosoftDotNetGenFacadesVersion>
61-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23211.2</MicrosoftDotNetXUnitExtensionsVersion>
62-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23211.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
63-
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksArchivesVersion>
64-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksInstallersVersion>
65-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksPackagingVersion>
66-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
67-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksTemplatingVersion>
68-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69-
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23211.2</MicrosoftDotNetRemoteExecutorVersion>
70-
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23211.2</MicrosoftDotNetVersionToolsTasksVersion>
71-
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23211.2</MicrosoftDotNetPackageTestingVersion>
56+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23228.7</MicrosoftDotNetApiCompatVersion>
57+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksFeedVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23228.7</MicrosoftDotNetCodeAnalysisVersion>
59+
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23228.7</MicrosoftDotNetGenAPIVersion>
60+
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23228.7</MicrosoftDotNetGenFacadesVersion>
61+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion>
62+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23228.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
63+
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksArchivesVersion>
64+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksInstallersVersion>
65+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksPackagingVersion>
66+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
67+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksTemplatingVersion>
68+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69+
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23228.7</MicrosoftDotNetRemoteExecutorVersion>
70+
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23228.7</MicrosoftDotNetVersionToolsTasksVersion>
71+
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23228.7</MicrosoftDotNetPackageTestingVersion>
7272
<!-- NuGet dependencies -->
7373
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7474
<!-- Installer dependencies -->
@@ -154,10 +154,10 @@
154154
<!-- Testing -->
155155
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
156156
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
157-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
158-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
159-
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessCLIVersion>
160-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.1.0-alpha.0.22470.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
157+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.23253.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
158+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.23253.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
159+
<MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.23253.3</MicrosoftDotNetXHarnessCLIVersion>
160+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.23226.5</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
161161
<XUnitVersion>2.4.2</XUnitVersion>
162162
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
163163
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -174,7 +174,7 @@
174174
<!-- Docs -->
175175
<MicrosoftPrivateIntellisenseVersion>7.0.0-preview-20221010.1</MicrosoftPrivateIntellisenseVersion>
176176
<!-- ILLink -->
177-
<MicrosoftNETILLinkTasksVersion>7.0.100-1.23207.1</MicrosoftNETILLinkTasksVersion>
177+
<MicrosoftNETILLinkTasksVersion>7.0.100-1.23211.1</MicrosoftNETILLinkTasksVersion>
178178
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
179179
<!-- ICU -->
180180
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.23218.4</MicrosoftNETCoreRuntimeICUTransportVersion>

‎eng/common/loc/P22DotNetHtmlLocalization.lss

32 Bytes
Binary file not shown.

‎eng/common/templates/job/job.yml

Lines changed: 8 additions & 4 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: ''
@@ -142,9 +142,13 @@ jobs:
142142
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
143143
continueOnError: true
144144

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
145+
- template: /eng/common/templates/steps/component-governance.yml
146+
parameters:
147+
${{ if eq(parameters.disableComponentGovernance, '') }}:
148+
${{ 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'))) }}:
149+
disableComponentGovernance: false
150+
${{ else }}:
151+
disableComponentGovernance: true
148152

149153
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
150154
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

0 commit comments

Comments
 (0)