Skip to content

Commit 1e89865

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#11267)
* Update dependencies from https://github.com/dotnet/dotnet build 291345 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25567.106 -> 11.0.0-beta.25568.110) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.3.25567.106 -> 10.0.0-rc.3.25568.110) * Update dependencies from https://github.com/dotnet/dotnet build 291548 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25568.110 -> 11.0.0-beta.25569.110) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.3.25568.110 -> 10.0.0-rc.3.25569.110) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 2283633 commit 1e89865

16 files changed

+102
-267
lines changed

‎eng/Version.Details.props‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props
88
<!-- dotnet/dotnet dependencies -->
99
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
1010
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25567.106</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25567.106</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25567.106</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25567.106</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.3.25567.106</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25567.106</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25567.106</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.3.25567.106</MicrosoftPrivateWinformsPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25569.110</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25569.110</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25569.110</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25569.110</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.3.25569.110</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25569.110</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25569.110</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.3.25569.110</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
21-
<SystemCodeDomPackageVersion>10.0.0-rc.3.25567.106</SystemCodeDomPackageVersion>
22-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25567.106</SystemConfigurationConfigurationManagerPackageVersion>
23-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.3.25567.106</SystemDiagnosticsEventLogPackageVersion>
24-
<SystemDirectoryServicesPackageVersion>10.0.0-rc.3.25567.106</SystemDirectoryServicesPackageVersion>
25-
<SystemDrawingCommonPackageVersion>10.0.0-rc.3.25567.106</SystemDrawingCommonPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25567.106</SystemFormatsNrbfPackageVersion>
27-
<SystemIOPackagingPackageVersion>10.0.0-rc.3.25567.106</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.3.25567.106</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25567.106</SystemReflectionMetadataLoadContextPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25567.106</SystemResourcesExtensionsPackageVersion>
31-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25567.106</SystemRuntimeSerializationFormattersPackageVersion>
32-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.3.25567.106</SystemSecurityCryptographyXmlPackageVersion>
33-
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.3.25567.106</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25567.106</SystemWindowsExtensionsPackageVersion>
21+
<SystemCodeDomPackageVersion>10.0.0-rc.3.25569.110</SystemCodeDomPackageVersion>
22+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25569.110</SystemConfigurationConfigurationManagerPackageVersion>
23+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.3.25569.110</SystemDiagnosticsEventLogPackageVersion>
24+
<SystemDirectoryServicesPackageVersion>10.0.0-rc.3.25569.110</SystemDirectoryServicesPackageVersion>
25+
<SystemDrawingCommonPackageVersion>10.0.0-rc.3.25569.110</SystemDrawingCommonPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25569.110</SystemFormatsNrbfPackageVersion>
27+
<SystemIOPackagingPackageVersion>10.0.0-rc.3.25569.110</SystemIOPackagingPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.3.25569.110</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25569.110</SystemReflectionMetadataLoadContextPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25569.110</SystemResourcesExtensionsPackageVersion>
31+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25569.110</SystemRuntimeSerializationFormattersPackageVersion>
32+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.3.25569.110</SystemSecurityCryptographyXmlPackageVersion>
33+
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.3.25569.110</SystemSecurityPermissionsPackageVersion>
34+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25569.110</SystemWindowsExtensionsPackageVersion>
3535
<!-- _git/dotnet-wpf-int dependencies -->
3636
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25564.1</MicrosoftDotNetWpfDncEngPackageVersion>
3737
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="feff871cec763e9a9f8e9ace212f0fd6041d479f" BarId="291132" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="ea77dd1498eeaae360c4309d07ccd68c8936fe48" BarId="291548" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.3.25567.106">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.3.25569.110">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
7+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.3.25567.106">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.3.25569.110">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
11+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25567.106">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25569.110">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
15+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25567.106">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25569.110">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
19+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25567.106">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25569.110">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
23+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25564.1">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>19f30a08e6068715270bb020d584cfd88b4907ec</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25567.106">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25569.110">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
31+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25567.106">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25569.110">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
35+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25567.106">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25569.110">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
39+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25567.106">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25569.110">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
43+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25567.106">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25569.110">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
47+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.3.25567.106">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.3.25569.110">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
51+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.3.25567.106">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.3.25569.110">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
55+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25567.106">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25569.110">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
59+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.3.25567.106">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.3.25569.110">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
63+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.3.25567.106">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.3.25569.110">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
67+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.3.25567.106">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.3.25569.110">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
71+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.3.25567.106">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.3.25569.110">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
75+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -84,21 +84,21 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25567.106">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25569.110">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
89+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25567.106">
91+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25569.110">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
93+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25567.106">
95+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25569.110">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
97+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25567.106">
99+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25569.110">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
101+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
102102
</Dependency>
103103
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
104104
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
@@ -109,9 +109,9 @@
109109
<Uri>https://github.com/dotnet/dotnet</Uri>
110110
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
111111
</Dependency>
112-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.3.25567.106">
112+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.3.25569.110">
113113
<Uri>https://github.com/dotnet/dotnet</Uri>
114-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
114+
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
115115
</Dependency>
116116
</ToolsetDependencies>
117117
</Dependencies>

‎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.

‎eng/common/core-templates/steps/generate-sbom.yml‎

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

0 commit comments

Comments
 (0)