Skip to content

[main] Source code updates from dotnet/dotnet #14479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotnet-maestro merged 2 commits into from
Apr 17, 2026
+257 −799
Merged

[main] Source code updates from dotnet/dotnet #14479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f4d53c
Backflow from https://github.com/dotnet/dotnet / ab01524 build 310648
dotnet-maestro[bot] Apr 17, 2026
2c17c27
Update dependencies from build 310648
dotnet-maestro[bot] Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26215.114</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26215.114</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26215.114</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26215.114</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26215.114</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26215.114</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26215.114</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.4.26215.114</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.4.26215.114</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26215.114</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.4.26215.114</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.4.26215.114</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.4.26215.114</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26215.114</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26215.114</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.4.26215.114</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.4.26215.114</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>11.0.0-preview.4.26215.114</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.4.26215.114</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>11.0.0-preview.4.26215.114</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.4.26215.114</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.4.26215.114</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.4.26215.114</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.4.26215.114</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.4.26215.114</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.4.26215.114</SystemWindowsExtensionsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26215.121</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26215.121</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26215.121</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26215.121</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26215.121</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26215.121</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26215.121</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.4.26215.121</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.4.26215.121</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26215.121</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.4.26215.121</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.4.26215.121</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.4.26215.121</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26215.121</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26215.121</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.4.26215.121</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.4.26215.121</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>11.0.0-preview.4.26215.121</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.4.26215.121</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>11.0.0-preview.4.26215.121</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.4.26215.121</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.4.26215.121</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.4.26215.121</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.4.26215.121</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.4.26215.121</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.4.26215.121</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
106 changes: 53 additions & 53 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,114 +6,114 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
-->
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="b61c1c319cf700db4bd4c7bbe9b2156c5383dd18" BarId="310568" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="ab01524bbb2ef1eea0ffaef161b3ef5686e8f256" BarId="310648" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.4.26215.114">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.4.26215.114">
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.4.26215.114">
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.4.26215.114">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26215.114">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26215.114">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26215.114">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.4.26215.114">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.4.26215.114">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.4.26215.114">
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="11.0.0-preview.4.26215.114">
<Dependency Name="System.Text.Json" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.4.26215.114">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.4.26215.114">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.4.26215.114">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="11.0.0-preview.4.26215.114">
<Dependency Name="System.CodeDom" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.4.26215.114">
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="11.0.0-preview.4.26215.114">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.4.26215.114">
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.4.26215.114">
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26215.114">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26215.114">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26215.114">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26215.114">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26215.114">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26215.114">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26215.114">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b61c1c319cf700db4bd4c7bbe9b2156c5383dd18</Sha>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<PropertyGroup>
<MicrosoftTargetingPackNETFrameworkv472PackageVersion>1.0.0</MicrosoftTargetingPackNETFrameworkv472PackageVersion>
<MicrosoftWindowsDesktopAppRefv30PackageVersion>3.0.0</MicrosoftWindowsDesktopAppRefv30PackageVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<NewtonsoftJsonVersion>13.0.4</NewtonsoftJsonVersion>
<VsWherePackageVersion>2.6.7</VsWherePackageVersion>
<!-- Pin transitive dependency to avoid vulnerable 8.0.0 version. -->
<SystemFormatsAsn1PackageVersion>8.0.1</SystemFormatsAsn1PackageVersion>
Expand Down
5 changes: 1 addition & 4 deletions eng/common/core-templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ parameters:
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishing: false
enableBuildRetry: false
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
name: ''
componentGovernanceSteps: []
preSteps: []
artifactPublishSteps: []
runAsPublic: false
Expand Down Expand Up @@ -152,9 +152,6 @@ jobs:
- ${{ each step in parameters.steps }}:
- ${{ step }}

- ${{ each step in parameters.componentGovernanceSteps }}:
- ${{ step }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
parameters:
Expand Down
12 changes: 7 additions & 5 deletions eng/common/core-templates/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,18 @@ jobs:
targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
artifactName: AssetManifests
displayName: 'Publish Merged Manifest'
retryCountOnTaskFailure: 10 # for any logs being locked
sbomEnabled: false # we don't need SBOM for logs
retryCountOnTaskFailure: 10 # for any files being locked
isProduction: false # just metadata for publishing

- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
args:
displayName: Publish ReleaseConfigs Artifact
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
publishLocation: Container
targetPath: '$(Build.StagingDirectory)/ReleaseConfigs'
artifactName: ReleaseConfigs
retryCountOnTaskFailure: 10 # for any files being locked
isProduction: false # just metadata for publishing

- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
Expand Down Expand Up @@ -218,4 +219,5 @@ jobs:
- template: /eng/common/core-templates/steps/publish-logs.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
StageLabel: 'BuildAssetRegistry'
JobLabel: 'Publish_Artifacts_Logs'
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/renovate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
condition: succeededOrFailed()
targetPath: $(Build.ArtifactStagingDirectory)
artifactName: $(Agent.JobName)_Logs_Attempt$(System.JobAttempt)
sbomEnabled: false
isProduction: false # logs are non-production artifacts

steps:
- checkout: self
Expand Down
5 changes: 5 additions & 0 deletions eng/common/core-templates/jobs/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ parameters:

artifacts: {}
is1ESPipeline: ''

# Publishing version w/default.
publishingVersion: 3

repositoryAlias: self
officialBuildId: ''

Expand Down Expand Up @@ -102,6 +106,7 @@ jobs:
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
continueOnError: ${{ parameters.continueOnError }}
publishingVersion: ${{ parameters.publishingVersion }}
dependsOn:
- ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}:
- ${{ each job in parameters.publishBuildAssetsDependsOn }}:
Expand Down
2 changes: 0 additions & 2 deletions eng/common/core-templates/post-build/common-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ variables:
- name: MaestroApiVersion
value: "2020-02-20"

- name: SourceLinkCLIVersion
value: 3.0.0
- name: SymbolToolVersion
value: 1.0.1
- name: BinlogToolVersion
Expand Down
Loading
Loading