Skip to content

Commit 81f7087

Browse files
authored
[Rollout] Production rollout 2025-11-21 (#5545)
2 parents a630905 + 09ed022 commit 81f7087

Some content is hidden

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

43 files changed

+551
-423
lines changed

.editorconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,12 @@ csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:si
175175
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
176176
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
177177

178+
# CA1727: Use PascalCase for named placeholders
179+
dotnet_diagnostic.CA1727.severity = none
180+
181+
# CA1848: Use the LoggerMessage delegates
182+
dotnet_diagnostic.CA1848.severity = none
183+
178184
# C++ Files
179185
[*.{cpp,h,in}]
180186
curly_bracket_next_line = true
@@ -224,4 +230,4 @@ dotnet_style_prefer_inferred_tuple_names = true:silent
224230
dotnet_style_prefer_inferred_anonymous_type_member_names = false:suggestion
225231
dotnet_style_prefer_compound_assignment = true:suggestion
226232
dotnet_style_prefer_simplified_interpolation = true:suggestion
227-
dotnet_style_namespace_match_folder = true:suggestion
233+
dotnet_style_namespace_match_folder = true:suggestion

Directory.Packages.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
4545
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
4646
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
47-
<!-- Pinned to higher version because it brings non-compliant dependencies which break CG -->
48-
<PackageVersion Include="Microsoft.CodeCoverage" Version="18.0.1" />
4947
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.3" />
5048
<PackageVersion Include="Microsoft.DncEng.Configuration.Extensions" Version="$(MicrosoftDncEngConfigurationExtensionsVersion)" />
5149
<PackageVersion Include="Microsoft.DotNet.GitHub.Authentication" Version="$(MicrosoftDotNetGitHubAuthenticationVersion)" />
@@ -80,7 +78,7 @@
8078
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.13.1" />
8179
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.13.1" />
8280
<PackageVersion Include="Microsoft.Identity.Web" Version="4.0.1" />
83-
<PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.232.0-preview" />
81+
<PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="20.262.0-preview" />
8482
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
8583
<PackageVersion Include="Moq" Version="4.18.4" />
8684
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />

eng/Version.Details.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ This file should be imported by eng/Versions.props
2020
<MicrosoftDotNetKustoPackageVersion>1.1.0-beta.25564.1</MicrosoftDotNetKustoPackageVersion>
2121
<MicrosoftDotNetServicesUtilityPackageVersion>1.1.0-beta.25564.1</MicrosoftDotNetServicesUtilityPackageVersion>
2222
<!-- dotnet/arcade dependencies -->
23-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25562.6</MicrosoftDotNetArcadeSdkPackageVersion>
24-
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25562.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
25-
<MicrosoftDotNetSignToolPackageVersion>11.0.0-beta.25562.6</MicrosoftDotNetSignToolPackageVersion>
26-
<MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>11.0.0-beta.25562.6</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
23+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25568.4</MicrosoftDotNetArcadeSdkPackageVersion>
24+
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25568.4</MicrosoftDotNetBuildTasksFeedPackageVersion>
25+
<MicrosoftDotNetSignToolPackageVersion>11.0.0-beta.25568.4</MicrosoftDotNetSignToolPackageVersion>
26+
<MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>11.0.0-beta.25568.4</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
2727
<MicrosoftDotNetVersionToolsPackageVersion>8.0.0-beta.25555.2</MicrosoftDotNetVersionToolsPackageVersion>
2828
<!-- dotnet/dnceng dependencies -->
2929
<MicrosoftDncEngConfigurationBootstrapPackageVersion>1.1.0-beta.25564.1</MicrosoftDncEngConfigurationBootstrapPackageVersion>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,21 @@
5555
</Dependency>
5656
</ProductDependencies>
5757
<ToolsetDependencies>
58-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25562.6">
58+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25568.4">
5959
<Uri>https://github.com/dotnet/arcade</Uri>
60-
<Sha>4bb60deca10193c27f5bdf0a6afc5878ef558455</Sha>
60+
<Sha>4644199e9362b60be8f0d3cf632113bfa64ba208</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.DotNet.SignTool" Version="11.0.0-beta.25562.6">
62+
<Dependency Name="Microsoft.DotNet.SignTool" Version="11.0.0-beta.25568.4">
6363
<Uri>https://github.com/dotnet/arcade</Uri>
64-
<Sha>4bb60deca10193c27f5bdf0a6afc5878ef558455</Sha>
64+
<Sha>4644199e9362b60be8f0d3cf632113bfa64ba208</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25562.6">
66+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25568.4">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>4bb60deca10193c27f5bdf0a6afc5878ef558455</Sha>
68+
<Sha>4644199e9362b60be8f0d3cf632113bfa64ba208</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="11.0.0-beta.25562.6">
70+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="11.0.0-beta.25568.4">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>4bb60deca10193c27f5bdf0a6afc5878ef558455</Sha>
72+
<Sha>4644199e9362b60be8f0d3cf632113bfa64ba208</Sha>
7373
</Dependency>
7474
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.25555.2">
7575
<Uri>https://github.com/dotnet/arcade</Uri>

eng/common/core-templates/job/job.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ parameters:
3131
testRunTitle: ''
3232
testResultsFormat: ''
3333
name: ''
34-
componentGovernanceSteps: []
3534
preSteps: []
3635
artifactPublishSteps: []
3736
runAsPublic: false
@@ -150,9 +149,6 @@ jobs:
150149
- ${{ each step in parameters.steps }}:
151150
- ${{ step }}
152151

153-
- ${{ each step in parameters.componentGovernanceSteps }}:
154-
- ${{ step }}
155-
156152
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
157153
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
158154
parameters:

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
artifactName: AssetManifests
173173
displayName: 'Publish Merged Manifest'
174174
retryCountOnTaskFailure: 10 # for any logs being locked
175-
sbomEnabled: false # we don't need SBOM for logs
175+
isProduction: false
176176

177177
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
178178
parameters:

eng/common/core-templates/steps/component-governance.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 10 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,14 @@
1-
# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
2-
# PackageName - The name of the package this SBOM represents.
3-
# PackageVersion - The version of the package this SBOM represents.
4-
# ManifestDirPath - The path of the directory where the generated manifest files will be placed
5-
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.
6-
71
parameters:
8-
PackageVersion: 11.0.0
9-
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
10-
PackageName: '.NET'
11-
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
12-
IgnoreDirectories: ''
13-
sbomContinueOnError: true
14-
is1ESPipeline: false
15-
# disable publishArtifacts if some other step is publishing the artifacts (like job.yml).
16-
publishArtifacts: true
2+
PackageVersion: unused
3+
BuildDropPath: unused
4+
PackageName: unused
5+
ManifestDirPath: unused
6+
IgnoreDirectories: unused
7+
sbomContinueOnError: unused
8+
is1ESPipeline: unused
9+
publishArtifacts: unused
1710

1811
steps:
19-
- task: PowerShell@2
20-
displayName: Prep for SBOM generation in (Non-linux)
21-
condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
22-
inputs:
23-
filePath: ./eng/common/generate-sbom-prep.ps1
24-
arguments: ${{parameters.manifestDirPath}}
25-
26-
# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461
2712
- script: |
28-
chmod +x ./eng/common/generate-sbom-prep.sh
29-
./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
30-
displayName: Prep for SBOM generation in (Linux)
31-
condition: eq(variables['Agent.Os'], 'Linux')
32-
continueOnError: ${{ parameters.sbomContinueOnError }}
33-
34-
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
35-
displayName: 'Generate SBOM manifest'
36-
continueOnError: ${{ parameters.sbomContinueOnError }}
37-
inputs:
38-
PackageName: ${{ parameters.packageName }}
39-
BuildDropPath: ${{ parameters.buildDropPath }}
40-
PackageVersion: ${{ parameters.packageVersion }}
41-
ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
42-
${{ if ne(parameters.IgnoreDirectories, '') }}:
43-
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
44-
45-
- ${{ if eq(parameters.publishArtifacts, 'true')}}:
46-
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
47-
parameters:
48-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
49-
args:
50-
displayName: Publish SBOM manifest
51-
continueOnError: ${{parameters.sbomContinueOnError}}
52-
targetPath: '${{ parameters.manifestDirPath }}'
53-
artifactName: $(ARTIFACT_NAME)
54-
13+
echo "##vso[task.logissue type=warning]Including generate-sbom.yml is deprecated, SBOM generation is handled 1ES PT now. Remove this include."
14+
displayName: Issue generate-sbom.yml deprecation warning

eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ steps:
6262
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
6363
continueOnError: true
6464
condition: succeededOrFailed()
65-
sbomEnabled: false # we don't need SBOM for logs
65+
isProduction: false

eng/common/generate-sbom-prep.ps1

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)