From 39731a247463cf4cfd36a9077954a1e0b3643ed8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Nov 2025 02:07:38 +0000 Subject: [PATCH 01/15] Update dependencies from https://github.com/dotnet/dotnet build 289373 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25522.2 -> 11.0.0-beta.25553.108) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25524.13 -> 5.3.0-1.25553.108) NuGet.Build.Tasks (Version 7.0.0-rc.288 -> 7.0.0-preview.1.5408) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 9.0.9 -> 10.0.0-rc.1.25553.108) --- eng/Version.Details.props | 60 ++- eng/Version.Details.xml | 145 +++--- eng/common/SetupNugetSources.sh | 0 eng/common/build.sh | 2 +- eng/common/core-templates/job/job.yml | 6 + .../job/publish-build-assets.yml | 24 +- .../core-templates/post-build/post-build.yml | 450 +++++++++--------- .../core-templates/steps/generate-sbom.yml | 2 +- .../steps/install-microbuild-impl.yml | 34 ++ .../steps/install-microbuild.yml | 62 +-- .../core-templates/steps/publish-logs.yml | 2 + .../steps/source-index-stage1-publish.yml | 4 +- eng/common/cross/install-debs.py | 0 eng/common/cross/tizen-build-rootfs.sh | 0 eng/common/cross/tizen-fetch.sh | 0 eng/common/darc-init.sh | 2 +- eng/common/dotnet-install.sh | 2 +- eng/common/dotnet.sh | 2 +- eng/common/generate-sbom-prep.sh | 0 eng/common/internal-feed-operations.sh | 2 +- eng/common/native/install-dependencies.sh | 2 + eng/common/post-build/publish-using-darc.ps1 | 4 +- eng/common/post-build/redact-logs.ps1 | 4 +- eng/common/sdk-task.ps1 | 4 +- eng/common/sdk-task.sh | 0 eng/common/tools.ps1 | 4 +- eng/common/vmr-sync.ps1 | 0 eng/common/vmr-sync.sh | 0 global.json | 4 +- 29 files changed, 438 insertions(+), 383 deletions(-) mode change 100644 => 100755 eng/common/SetupNugetSources.sh create mode 100644 eng/common/core-templates/steps/install-microbuild-impl.yml mode change 100644 => 100755 eng/common/cross/install-debs.py mode change 100644 => 100755 eng/common/cross/tizen-build-rootfs.sh mode change 100644 => 100755 eng/common/cross/tizen-fetch.sh mode change 100644 => 100755 eng/common/dotnet.sh mode change 100644 => 100755 eng/common/generate-sbom-prep.sh mode change 100644 => 100755 eng/common/native/install-dependencies.sh mode change 100644 => 100755 eng/common/sdk-task.sh mode change 100644 => 100755 eng/common/vmr-sync.ps1 mode change 100644 => 100755 eng/common/vmr-sync.sh diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d3233c43a53..8b5aa106b03 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -5,35 +5,36 @@ This file should be imported by eng/Versions.props --> - - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - - 10.0.0-beta.25522.2 - 10.0.0-beta.25522.2 - - 7.0.0-rc.288 - - 5.3.0-1.25524.13 + + 11.0.0-beta.25553.108 + 11.0.0-beta.25553.108 + 5.3.0-1.25553.108 + 7.0.0-preview.1.5408 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 + 10.0.0-rc.1.25553.108 - + + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) + $(NuGetBuildTasksPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCollectionsImmutablePackageVersion) $(SystemConfigurationConfigurationManagerPackageVersion) @@ -51,12 +52,5 @@ This file should be imported by eng/Versions.props $(SystemTextJsonPackageVersion) $(SystemThreadingChannelsPackageVersion) $(SystemThreadingTasksDataflowPackageVersion) - - $(MicrosoftDotNetArcadeSdkPackageVersion) - $(MicrosoftDotNetXUnitExtensionsPackageVersion) - - $(NuGetBuildTasksPackageVersion) - - $(MicrosoftNetCompilersToolsetPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ab8ae271ef..7df21ebf1fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,126 +1,109 @@ - + - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/runtime - - + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/arcade - 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/nuget/nuget.client - 5514d935e3e77d90d931758cf9e2589735b905a3 + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/roslyn - e7d28d80af8c576206dacf05e09cde03a105fb38 + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 - - https://github.com/dotnet/arcade - 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 + + https://github.com/dotnet/dotnet + d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh old mode 100644 new mode 100755 diff --git a/eng/common/build.sh b/eng/common/build.sh index 9767bb411a4..ec3e80d189e 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -92,7 +92,7 @@ runtime_source_feed='' runtime_source_feed_key='' properties=() -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" case "$opt" in -help|-h) diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 5ce51840619..cb4ccc023a3 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,8 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + enablePreviewMicrobuild: false + microbuildPluginVersion: 'latest' enableMicrobuildForMacAndLinux: false microbuildUseESRP: true enablePublishBuildArtifacts: false @@ -128,6 +130,8 @@ jobs: - template: /eng/common/core-templates/steps/install-microbuild.yml parameters: enableMicrobuild: ${{ parameters.enableMicrobuild }} + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }} enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} microbuildUseESRP: ${{ parameters.microbuildUseESRP }} continueOnError: ${{ parameters.continueOnError }} @@ -153,6 +157,8 @@ jobs: - template: /eng/common/core-templates/steps/cleanup-microbuild.yml parameters: enableMicrobuild: ${{ parameters.enableMicrobuild }} + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }} enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 37dff559fc1..721a5566699 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -91,8 +91,8 @@ jobs: fetchDepth: 3 clean: true - - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: - - ${{ if eq(parameters.publishingVersion, 3) }}: + - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: + - ${{ if eq(parameters.publishingVersion, 3) }}: - task: DownloadPipelineArtifact@2 displayName: Download Asset Manifests inputs: @@ -117,9 +117,16 @@ jobs: flattenFolders: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: NuGetAuthenticate@1 + # Populate internal runtime variables. + - template: /eng/common/templates/steps/enable-internal-sources.yml + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + - task: AzureCLI@2 displayName: Publish Build Assets inputs: @@ -132,9 +139,12 @@ jobs: /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} /p:MaestroApiEndpoint=https://maestro.dot.net /p:OfficialBuildId=$(OfficialBuildId) + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -162,7 +172,7 @@ jobs: artifactName: AssetManifests displayName: 'Publish Merged Manifest' retryCountOnTaskFailure: 10 # for any logs being locked - sbomEnabled: false # we don't need SBOM for logs + sbomEnabled: false # we don't need SBOM for logs - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: @@ -195,9 +205,11 @@ jobs: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/core-templates/steps/publish-logs.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index f6f87fe5c67..0cea81c74f2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -1,106 +1,106 @@ parameters: - # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. - # Publishing V1 is no longer supported - # Publishing V2 is no longer supported - # Publishing V3 is the default - - name: publishingInfraVersion - displayName: Which version of publishing should be used to promote the build definition? - type: number - default: 3 - values: - - 3 - - - name: BARBuildId - displayName: BAR Build Id - type: number - default: 0 - - - name: PromoteToChannelIds - displayName: Channel to promote BARBuildId to - type: string - default: '' - - - name: enableSourceLinkValidation - displayName: Enable SourceLink validation - type: boolean - default: false - - - name: enableSigningValidation - displayName: Enable signing validation - type: boolean - default: true - - - name: enableSymbolValidation - displayName: Enable symbol validation - type: boolean - default: false - - - name: enableNugetValidation - displayName: Enable NuGet validation - type: boolean - default: true - - - name: publishInstallersAndChecksums - displayName: Publish installers and checksums - type: boolean - default: true - - - name: requireDefaultChannels - displayName: Fail the build if there are no default channel(s) registrations for the current build - type: boolean - default: false - - - name: SDLValidationParameters - type: object - default: - enable: false - publishGdn: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: true - - - name: isAssetlessBuild - type: boolean - displayName: Is Assetless Build - default: false - - # These parameters let the user customize the call to sdk-task.ps1 for publishing - # symbols & general artifacts as well as for signing validation - - name: symbolPublishingAdditionalParameters - displayName: Symbol publishing additional parameters - type: string - default: '' - - - name: artifactsPublishingAdditionalParameters - displayName: Artifact publishing additional parameters - type: string - default: '' - - - name: signingValidationAdditionalParameters - displayName: Signing validation additional parameters - type: string - default: '' - - # Which stages should finish execution before post-build stages start - - name: validateDependsOn - type: object - default: - - build - - - name: publishDependsOn - type: object - default: - - Validate - - # Optional: Call asset publishing rather than running in a separate stage - - name: publishAssetsImmediately - type: boolean - default: false - - - name: is1ESPipeline - type: boolean - default: false +# Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. +# Publishing V1 is no longer supported +# Publishing V2 is no longer supported +# Publishing V3 is the default +- name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + +- name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + +- name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + +- name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + +- name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + +- name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + +- name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + +- name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + +- name: requireDefaultChannels + displayName: Fail the build if there are no default channel(s) registrations for the current build + type: boolean + default: false + +- name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + +- name: isAssetlessBuild + type: boolean + displayName: Is Assetless Build + default: false + +# These parameters let the user customize the call to sdk-task.ps1 for publishing +# symbols & general artifacts as well as for signing validation +- name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + +- name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + +- name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + +# Which stages should finish execution before post-build stages start +- name: validateDependsOn + type: object + default: + - build + +- name: publishDependsOn + type: object + default: + - Validate + +# Optional: Call asset publishing rather than running in a separate stage +- name: publishAssetsImmediately + type: boolean + default: false + +- name: is1ESPipeline + type: boolean + default: false stages: - ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: @@ -108,10 +108,10 @@ stages: dependsOn: ${{ parameters.validateDependsOn }} displayName: Validate Build Assets variables: - - template: /eng/common/core-templates/post-build/common-variables.yml - - template: /eng/common/core-templates/variables/pool-providers.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} jobs: - job: displayName: NuGet Validation @@ -134,28 +134,28 @@ stages: demands: ImageOverride -equals windows.vs2022.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: displayName: Signing Validation @@ -169,54 +169,54 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: /eng/common/core-templates/steps/publish-logs.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - StageLabel: 'Validation' - JobLabel: 'Signing' - BinlogToolVersion: $(BinlogToolVersion) + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@1 + displayName: 'Authenticate to AzDO Feeds' + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + StageLabel: 'Validation' + JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) - job: displayName: SourceLink Validation @@ -230,41 +230,41 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true - ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - stage: publish_using_darc @@ -274,10 +274,10 @@ stages: dependsOn: ${{ parameters.validateDependsOn }} displayName: Publish using Darc variables: - - template: /eng/common/core-templates/post-build/common-variables.yml - - template: /eng/common/core-templates/variables/pool-providers.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} jobs: - job: displayName: Publish Using Darc @@ -291,30 +291,36 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: > + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: NuGetAuthenticate@1 # Populate internal runtime variables. + + - template: /eng/common/templates/steps/enable-internal-sources.yml + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + + - task: AzureCLI@2 + displayName: Publish Using Darc + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' @@ -323,3 +329,5 @@ stages: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index c05f6502797..003f7eae0fa 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -5,7 +5,7 @@ # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: - PackageVersion: 10.0.0 + PackageVersion: 11.0.0 BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml new file mode 100644 index 00000000000..9fdf3a11677 --- /dev/null +++ b/eng/common/core-templates/steps/install-microbuild-impl.yml @@ -0,0 +1,34 @@ +parameters: + - name: microbuildTaskInputs + type: object + default: {} + + - name: microbuildEnv + type: object + default: {} + + - name: enablePreviewMicrobuild + type: boolean + default: false + + - name: condition + type: string + + - name: continueOnError + type: boolean + +steps: +- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}: + - task: MicroBuildSigningPluginPreview@4 + displayName: Install Preview MicroBuild plugin (Windows) + inputs: ${{ parameters.microbuildTaskInputs }} + env: ${{ parameters.microbuildEnv }} + continueOnError: ${{ parameters.continueOnError }} + condition: ${{ parameters.condition }} +- ${{ else }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin (Windows) + inputs: ${{ parameters.microbuildTaskInputs }} + env: ${{ parameters.microbuildEnv }} + continueOnError: ${{ parameters.continueOnError }} + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index f2248ebfd73..3d42d9a5661 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -4,6 +4,8 @@ parameters: # Enable install tasks for MicroBuild on Mac and Linux # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' enableMicrobuildForMacAndLinux: false + # Enable preview version of MB signing plugin + enablePreviewMicrobuild: false # Determines whether the ESRP service connection information should be passed to the signing plugin. # This overlaps with _SignType to some degree. We only need the service connection for real signing. # It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place. @@ -11,6 +13,8 @@ parameters: # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true + # Microbuild version + microbuildPluginVersion: 'latest' continueOnError: false @@ -50,41 +54,45 @@ steps: # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However, # we can avoid including the MB install step if not enabled at all. This avoids a bunch of # extra pipeline authorizations, since most pipelines do not sign on non-Windows. - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (Windows) - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(parameters.microbuildUseESRP, true) }}: - ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca - env: - TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) - - - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (non-Windows) - inputs: + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self + parameters: + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildTaskInputs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + version: ${{ parameters.microbuildPluginVersion }} ${{ if eq(parameters.microbuildUseESRP, true) }}: ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea ${{ else }}: - ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc - env: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + microbuildEnv: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) + + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self + parameters: + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildTaskInputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + version: ${{ parameters.microbuildPluginVersion }} + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ${{ else }}: + ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc + microbuildEnv: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 10f825e270a..0664c343b2a 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -28,6 +28,8 @@ steps: arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index e9a694afa58..eff4573c6e5 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -1,6 +1,6 @@ parameters: - sourceIndexUploadPackageVersion: 2.0.0-20250818.1 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1 + sourceIndexUploadPackageVersion: 2.0.0-20250906.1 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250906.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json binlogPath: artifacts/log/Debug/Build.binlog diff --git a/eng/common/cross/install-debs.py b/eng/common/cross/install-debs.py old mode 100644 new mode 100755 diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh old mode 100644 new mode 100755 diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index e889f439b8d..9f5ad6b763b 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -5,7 +5,7 @@ darcVersion='' versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20' verbosity='minimal' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in --darcversion) diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 7b9d97e3bd4..61f302bb677 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -18,7 +18,7 @@ architecture='' runtime='dotnet' runtimeSourceFeed='' runtimeSourceFeedKey='' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in -version|-v) diff --git a/eng/common/dotnet.sh b/eng/common/dotnet.sh old mode 100644 new mode 100755 index 2ef68235675..f6d24871c1d --- a/eng/common/dotnet.sh +++ b/eng/common/dotnet.sh @@ -19,7 +19,7 @@ source $scriptroot/tools.sh InitializeDotNetCli true # install # Invoke acquired SDK with args if they are provided -if [[ $# > 0 ]]; then +if [[ $# -gt 0 ]]; then __dotnetDir=${_InitializeDotNetCli} dotnetPath=${__dotnetDir}/dotnet ${dotnetPath} "$@" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh old mode 100644 new mode 100755 diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh index 9378223ba09..6299e7effd4 100755 --- a/eng/common/internal-feed-operations.sh +++ b/eng/common/internal-feed-operations.sh @@ -100,7 +100,7 @@ operation='' authToken='' repoName='' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in --operation) diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh old mode 100644 new mode 100755 index 477a44f335b..f7bd4af0c8d --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -30,6 +30,8 @@ case "$os" in elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio + elif [ "$ID" = "amzn" ]; then + dnf install -y cmake llvm lld lldb clang python libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio elif [ "$ID" = "alpine" ]; then apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio else diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1eda208a3bb..48e55598bdd 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -7,7 +7,9 @@ param( [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $RequireDefaultChannels, - [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing + [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 index b7fc1959150..fc0218a013d 100644 --- a/eng/common/post-build/redact-logs.ps1 +++ b/eng/common/post-build/redact-logs.ps1 @@ -7,7 +7,9 @@ param( # File with strings to redact - separated by newlines. # For comments start the line with '# ' - such lines are ignored [Parameter(Mandatory=$false)][string] $TokensFilePath, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact + [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b62e132d32a..9ae443f1c36 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -9,6 +9,8 @@ Param( [switch][Alias('nobl')]$excludeCIBinaryLog, [switch]$noWarnAsError, [switch] $help, + [string] $runtimeSourceFeed = '', + [string] $runtimeSourceFeedKey = '', [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -68,7 +70,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh old mode 100644 new mode 100755 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 06b44de7870..4bc50bd568c 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0 - $defaultXCopyMSBuildVersion = '17.13.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16 + $defaultXCopyMSBuildVersion = '17.14.16' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/eng/common/vmr-sync.ps1 b/eng/common/vmr-sync.ps1 old mode 100644 new mode 100755 diff --git a/eng/common/vmr-sync.sh b/eng/common/vmr-sync.sh old mode 100644 new mode 100755 diff --git a/global.json b/global.json index 5bdb8559696..1db4e5c2c5d 100644 --- a/global.json +++ b/global.json @@ -8,13 +8,13 @@ "errorMessage": "The .NET SDK could not be found, please run a command-line build with ./build.cmd." }, "tools": { - "dotnet": "10.0.100-rc.1.25451.107", + "dotnet": "10.0.100-rc.2.25502.107", "vs": { "version": "17.13.0" }, "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25522.2" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25553.108" } } From 5671f57c4d1887ec712b72789f1e94ae2588425d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Nov 2025 02:11:46 +0000 Subject: [PATCH 02/15] Update dependencies from https://github.com/dotnet/dotnet build 289425 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25553.108 -> 11.0.0-beta.25553.112) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25553.108 -> 5.3.0-1.25553.112) NuGet.Build.Tasks (Version 7.0.0-preview.1.5408 -> 7.0.0-preview.1.5412) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 10.0.0-rc.1.25553.108 -> 10.0.0-rc.1.25553.112) --- eng/Version.Details.props | 42 ++++++++-------- eng/Version.Details.xml | 86 ++++++++++++++++---------------- eng/common/SetupNugetSources.ps1 | 17 +------ eng/common/SetupNugetSources.sh | 17 +------ global.json | 2 +- 5 files changed, 69 insertions(+), 95 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 8b5aa106b03..9a5c5a8a95f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25553.108 - 11.0.0-beta.25553.108 - 5.3.0-1.25553.108 - 7.0.0-preview.1.5408 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 - 10.0.0-rc.1.25553.108 + 11.0.0-beta.25553.112 + 11.0.0-beta.25553.112 + 5.3.0-1.25553.112 + 7.0.0-preview.1.5412 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 + 10.0.0-rc.1.25553.112 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7df21ebf1fb..4781550796a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 - + https://github.com/dotnet/dotnet - d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2 + 7afcc5ec7a7148c6d04096396acceaafe98f4415 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 65ed3a8adef..fc8d618014e 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -1,7 +1,6 @@ # This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly, -# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present. -# In addition, this script also enables disabled internal Maestro (darc-int*) feeds. +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables +# disabled internal Maestro (darc-int*) feeds. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -174,16 +173,4 @@ foreach ($dotnetVersion in $dotnetVersions) { } } -# Check for dotnet-eng and add dotnet-eng-internal if present -$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']") -if ($dotnetEngSource -ne $null) { - AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password -} - -# Check for dotnet-tools and add dotnet-tools-internal if present -$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']") -if ($dotnetToolsSource -ne $null) { - AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password -} - $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index b2163abbe71..b97cc536379 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -1,9 +1,8 @@ #!/usr/bin/env bash # This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly, -# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present. -# In addition, this script also enables disabled internal Maestro (darc-int*) feeds. +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables +# disabled internal Maestro (darc-int*) feeds. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -174,18 +173,6 @@ for DotNetVersion in ${DotNetVersions[@]} ; do fi done -# Check for dotnet-eng and add dotnet-eng-internal if present -grep -i " /dev/null -if [ "$?" == "0" ]; then - AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix" -fi - -# Check for dotnet-tools and add dotnet-tools-internal if present -grep -i " /dev/null -if [ "$?" == "0" ]; then - AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix" -fi - # I want things split line by line PrevIFS=$IFS IFS=$'\n' diff --git a/global.json b/global.json index 1db4e5c2c5d..45cfda0fc91 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25553.108" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25553.112" } } From a96f2c3e6350a7265ebf979959105126a398423e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Nov 2025 02:09:17 +0000 Subject: [PATCH 03/15] Update dependencies from https://github.com/dotnet/dotnet build 289655 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25553.112 -> 11.0.0-beta.25555.103) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25553.112 -> 5.3.0-1.25555.103) NuGet.Build.Tasks (Version 7.0.0-preview.1.5412 -> 7.0.0-preview.1.5603) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 10.0.0-rc.1.25553.112 -> 10.0.0-rc.1.25555.103) --- eng/Version.Details.props | 42 +++++++++---------- eng/Version.Details.xml | 86 +++++++++++++++++++-------------------- global.json | 2 +- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 9a5c5a8a95f..f06914fc669 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25553.112 - 11.0.0-beta.25553.112 - 5.3.0-1.25553.112 - 7.0.0-preview.1.5412 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 - 10.0.0-rc.1.25553.112 + 11.0.0-beta.25555.103 + 11.0.0-beta.25555.103 + 5.3.0-1.25555.103 + 7.0.0-preview.1.5603 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 + 10.0.0-rc.1.25555.103 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4781550796a..8000c5f120b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e - + https://github.com/dotnet/dotnet - 7afcc5ec7a7148c6d04096396acceaafe98f4415 + 54c879632fdf0197d517d80e4b90861e2bd5d03e diff --git a/global.json b/global.json index 45cfda0fc91..1fdae0e4fb9 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25553.112" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.103" } } From 341bf82a4071eb23b45ca474f0b6fa787eb5c72c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Nov 2025 02:06:11 +0000 Subject: [PATCH 04/15] Backflow from https://github.com/dotnet/dotnet / 77ee357 build 289869 [[ commit created by automation ]] --- Directory.Build.props | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index df1552290a1..0742dc9970c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -61,6 +61,12 @@ $(NoWarn);SYSLIB0057; + + + $(NoWarn);NU5104; - 11.0.0-beta.25555.103 - 11.0.0-beta.25555.103 - 5.3.0-1.25555.103 - 7.0.0-preview.1.5603 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 + 11.0.0-beta.25556.111 + 11.0.0-beta.25556.111 + 5.3.0-1.25556.111 + 7.0.0-preview.1.5711 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8000c5f120b..4cdd0d93b82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 721a5566699..4d282377c18 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -189,6 +189,11 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} + + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x - task: AzureCLI@2 displayName: Publish Using Darc diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 0cea81c74f2..0af41fe5f9f 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -313,6 +313,10 @@ stages: - template: /eng/common/templates/steps/enable-internal-runtimes.yml + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml index 9fdf3a11677..b9e0143ee92 100644 --- a/eng/common/core-templates/steps/install-microbuild-impl.yml +++ b/eng/common/core-templates/steps/install-microbuild-impl.yml @@ -20,15 +20,15 @@ parameters: steps: - ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}: - task: MicroBuildSigningPluginPreview@4 - displayName: Install Preview MicroBuild plugin (Windows) + displayName: Install Preview MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} env: ${{ parameters.microbuildEnv }} continueOnError: ${{ parameters.continueOnError }} condition: ${{ parameters.condition }} - ${{ else }}: - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (Windows) + displayName: Install MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} env: ${{ parameters.microbuildEnv }} continueOnError: ${{ parameters.continueOnError }} - condition: ${{ parameters.condition }} \ No newline at end of file + condition: ${{ parameters.condition }} diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 3d42d9a5661..bdebec0eaa9 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -13,6 +13,9 @@ parameters: # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true + # Location of the MicroBuild output folder + # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly. + microBuildOutputFolder: '$(Build.SourcesDirectory)' # Microbuild version microbuildPluginVersion: 'latest' @@ -21,16 +24,14 @@ parameters: steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms + # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable - task: UseDotNet@2 displayName: Install .NET 8.0 SDK for MicroBuild Plugin inputs: packageType: sdk version: 8.0.x - # Installing the SDK in a '.dotnet-microbuild' directory is required for signing. - # See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj - # Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic. - installationPath: $(Agent.TempDirectory)/.dotnet-microbuild + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet + workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -70,7 +71,7 @@ steps: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) @@ -92,7 +93,7 @@ steps: ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/global.json b/global.json index 1fdae0e4fb9..3302e6ca3c5 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.103" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.111" } } From 3ad018c8eee55a08254981feb9c81043753230ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Nov 2025 02:09:19 +0000 Subject: [PATCH 06/15] Update dependencies from https://github.com/dotnet/dotnet build 290335 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25556.111 -> 11.0.0-beta.25560.108) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25556.111 -> 5.3.0-1.25560.108) NuGet.Build.Tasks (Version 7.0.0-preview.1.5711 -> 7.0.0-preview.1.6108) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 10.0.0-rc.3.25556.111 -> 10.0.0-rc.3.25560.108) --- eng/Version.Details.props | 42 ++++----- eng/Version.Details.xml | 86 +++++++++---------- .../job/publish-build-assets.yml | 6 +- .../core-templates/post-build/post-build.yml | 2 +- .../core-templates/steps/publish-logs.yml | 4 +- .../steps/source-index-stage1-publish.yml | 4 +- eng/common/native/install-dependencies.sh | 2 +- global.json | 2 +- 8 files changed, 74 insertions(+), 74 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b36264574fe..ad120e57918 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25556.111 - 11.0.0-beta.25556.111 - 5.3.0-1.25556.111 - 7.0.0-preview.1.5711 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 + 11.0.0-beta.25560.108 + 11.0.0-beta.25560.108 + 5.3.0-1.25560.108 + 7.0.0-preview.1.6108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cdd0d93b82..c05ff4cc651 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 4d282377c18..4a417e003c7 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -140,7 +140,7 @@ jobs: /p:MaestroApiEndpoint=https://maestro.dot.net /p:OfficialBuildId=$(OfficialBuildId) -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -210,8 +210,8 @@ jobs: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' - -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/core-templates/steps/publish-logs.yml diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 0af41fe5f9f..27763a825b9 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -334,4 +334,4 @@ stages: -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 0664c343b2a..5a927b4c7bc 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -26,10 +26,10 @@ steps: # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' - -BinlogToolVersion ${{parameters.BinlogToolVersion}} + -BinlogToolVersion '${{parameters.BinlogToolVersion}}' -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index eff4573c6e5..ac019e2d033 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -14,8 +14,8 @@ steps: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: "Source Index: Download netsourceindex Tools" # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index f7bd4af0c8d..64b87d0bcc3 100755 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -27,7 +27,7 @@ case "$os" in libssl-dev libkrb5-dev pigz cpio localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 - elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then + elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio elif [ "$ID" = "amzn" ]; then diff --git a/global.json b/global.json index 3302e6ca3c5..fae26856d0f 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.111" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25560.108" } } From 089831f121cedc1b97240eb872c8799aa6b8c500 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Nov 2025 02:11:58 +0000 Subject: [PATCH 07/15] Update dependencies from https://github.com/dotnet/dotnet build 290484 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25560.108 -> 11.0.0-beta.25562.102) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25560.108 -> 5.3.0-1.25562.102) NuGet.Build.Tasks (Version 7.0.0-preview.1.6108 -> 7.0.0-preview.1.6302) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 10.0.0-rc.3.25560.108 -> 10.0.0-rc.3.25562.102) --- eng/Version.Details.props | 42 +++++++++---------- eng/Version.Details.xml | 86 +++++++++++++++++++-------------------- global.json | 2 +- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ad120e57918..c16bc40c082 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25560.108 - 11.0.0-beta.25560.108 - 5.3.0-1.25560.108 - 7.0.0-preview.1.6108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 - 10.0.0-rc.3.25560.108 + 11.0.0-beta.25562.102 + 11.0.0-beta.25562.102 + 5.3.0-1.25562.102 + 7.0.0-preview.1.6302 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 + 10.0.0-rc.3.25562.102 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c05ff4cc651..00947bf4666 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 - + https://github.com/dotnet/dotnet - 02022b2fe7037ef7a4af4b899c6d2c2353f94196 + c78244f2dd40d11772abaae1b13939557de2e136 diff --git a/global.json b/global.json index fae26856d0f..a4107db4b37 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25560.108" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25562.102" } } From 6e95e0667be4e8f5f80352a1a009fc8d3f091cdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Nov 2025 02:06:53 +0000 Subject: [PATCH 08/15] Update dependencies from https://github.com/dotnet/dotnet build 290644 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25562.102 -> 11.0.0-beta.25562.109) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25562.102 -> 5.3.0-1.25562.109) NuGet.Build.Tasks (Version 7.0.0-preview.1.6302 -> 7.0.0-preview.1.6309) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 10.0.0-rc.3.25562.102 -> 10.0.0-rc.3.25562.109) --- eng/Version.Details.props | 42 +++++++++---------- eng/Version.Details.xml | 86 +++++++++++++++++++-------------------- global.json | 2 +- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c16bc40c082..b110f7b24ea 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25562.102 - 11.0.0-beta.25562.102 - 5.3.0-1.25562.102 - 7.0.0-preview.1.6302 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 - 10.0.0-rc.3.25562.102 + 11.0.0-beta.25562.109 + 11.0.0-beta.25562.109 + 5.3.0-1.25562.109 + 7.0.0-preview.1.6309 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 + 10.0.0-rc.3.25562.109 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00947bf4666..06cf1d99d46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c - + https://github.com/dotnet/dotnet - c78244f2dd40d11772abaae1b13939557de2e136 + f54307a7b9f0a745520863d2b8cdd6f468fd787c diff --git a/global.json b/global.json index a4107db4b37..71f90081c3e 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25562.102" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25562.109" } } From 0a0fe1148d029a8aa3a83ef43daff0dd417dae36 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Nov 2025 02:09:12 +0000 Subject: [PATCH 09/15] Update dependencies from https://github.com/dotnet/dotnet build 290847 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25562.109 -> 11.0.0-beta.25563.103) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25562.109 -> 5.3.0-1.25563.103) NuGet.Build.Tasks (Version 7.0.0-preview.1.6309 -> 7.0.0-preview.1.6403) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 10.0.0-rc.3.25562.109 -> 10.0.0-rc.3.25563.103) --- eng/Version.Details.props | 42 +++++++++---------- eng/Version.Details.xml | 86 +++++++++++++++++++-------------------- global.json | 2 +- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b110f7b24ea..0b31a292e21 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25562.109 - 11.0.0-beta.25562.109 - 5.3.0-1.25562.109 - 7.0.0-preview.1.6309 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 - 10.0.0-rc.3.25562.109 + 11.0.0-beta.25563.103 + 11.0.0-beta.25563.103 + 5.3.0-1.25563.103 + 7.0.0-preview.1.6403 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 + 10.0.0-rc.3.25563.103 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06cf1d99d46..f031d3a7a08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc - + https://github.com/dotnet/dotnet - f54307a7b9f0a745520863d2b8cdd6f468fd787c + 679ec822750ef4a645af43de164852f3c7ed9fdc diff --git a/global.json b/global.json index 71f90081c3e..c1b61e3abd0 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25562.109" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25563.103" } } From 9c9c5608be1a4cbd43811b3708d970707b71169f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Nov 2025 02:05:25 +0000 Subject: [PATCH 10/15] Update dependencies from https://github.com/dotnet/dotnet build 291022 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25563.103 -> 11.0.0-beta.25565.104) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25563.103 -> 5.3.0-1.25565.104) NuGet.Build.Tasks (Version 7.0.0-preview.1.6403 -> 7.0.0-preview.1.6604) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 10.0.0-rc.3.25563.103 -> 10.0.0-rc.3.25565.104) --- eng/Version.Details.props | 42 +++++++++---------- eng/Version.Details.xml | 86 +++++++++++++++++++-------------------- global.json | 2 +- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0b31a292e21..2ea30e7bec0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25563.103 - 11.0.0-beta.25563.103 - 5.3.0-1.25563.103 - 7.0.0-preview.1.6403 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 - 10.0.0-rc.3.25563.103 + 11.0.0-beta.25565.104 + 11.0.0-beta.25565.104 + 5.3.0-1.25565.104 + 7.0.0-preview.1.6604 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 + 10.0.0-rc.3.25565.104 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f031d3a7a08..515c00c39ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd - + https://github.com/dotnet/dotnet - 679ec822750ef4a645af43de164852f3c7ed9fdc + 88c87899e74aebbd27371d84597630ba3c25d4fd diff --git a/global.json b/global.json index c1b61e3abd0..ef22a8980c6 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25563.103" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25565.104" } } From d88e46ebfe7ce4bbb2c4ac6cfb9557872a117c18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Nov 2025 02:05:41 +0000 Subject: [PATCH 11/15] Update dependencies from https://github.com/dotnet/dotnet build 291132 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25565.104 -> 11.0.0-beta.25567.106) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25565.104 -> 5.3.0-1.25567.106) NuGet.Build.Tasks (Version 7.0.0-preview.1.6604 -> 7.0.0-preview.1.6806) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 10.0.0-rc.3.25565.104 -> 10.0.0-rc.3.25567.106) --- eng/Version.Details.props | 42 +++++++++---------- eng/Version.Details.xml | 86 +++++++++++++++++++-------------------- global.json | 2 +- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 2ea30e7bec0..804fd76f12f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25565.104 - 11.0.0-beta.25565.104 - 5.3.0-1.25565.104 - 7.0.0-preview.1.6604 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 - 10.0.0-rc.3.25565.104 + 11.0.0-beta.25567.106 + 11.0.0-beta.25567.106 + 5.3.0-1.25567.106 + 7.0.0-preview.1.6806 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 + 10.0.0-rc.3.25567.106 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 515c00c39ce..4af3649490e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f - + https://github.com/dotnet/dotnet - 88c87899e74aebbd27371d84597630ba3c25d4fd + feff871cec763e9a9f8e9ace212f0fd6041d479f diff --git a/global.json b/global.json index ef22a8980c6..36c9b7e154e 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25565.104" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25567.106" } } From ee812b05590a83ee108460f1bf4cef42a8e9a404 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Nov 2025 02:07:23 +0000 Subject: [PATCH 12/15] Update dependencies from https://github.com/dotnet/dotnet build 291345 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25567.106 -> 11.0.0-beta.25568.110) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25567.106 -> 5.3.0-1.25568.110) NuGet.Build.Tasks (Version 7.0.0-preview.1.6806 -> 7.0.0-preview.1.6910) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 10.0.0-rc.3.25567.106 -> 10.0.0-rc.3.25568.110) --- eng/Version.Details.props | 42 +++++++++---------- eng/Version.Details.xml | 86 +++++++++++++++++++-------------------- global.json | 2 +- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 804fd76f12f..79c1caff2de 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25567.106 - 11.0.0-beta.25567.106 - 5.3.0-1.25567.106 - 7.0.0-preview.1.6806 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 - 10.0.0-rc.3.25567.106 + 11.0.0-beta.25568.110 + 11.0.0-beta.25568.110 + 5.3.0-1.25568.110 + 7.0.0-preview.1.6910 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 + 10.0.0-rc.3.25568.110 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4af3649490e..34433e4a8ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb - + https://github.com/dotnet/dotnet - feff871cec763e9a9f8e9ace212f0fd6041d479f + 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb diff --git a/global.json b/global.json index 36c9b7e154e..8317fba7b63 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25567.106" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25568.110" } } From b91d3e32bab199ae8602765af46d7b925c8bd7ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Nov 2025 02:10:22 +0000 Subject: [PATCH 13/15] Backflow from https://github.com/dotnet/dotnet / ea77dd1 build 291548 [[ commit created by automation ]] --- eng/dependabot/Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props index ce467ed0723..1d888c580e0 100644 --- a/eng/dependabot/Packages.props +++ b/eng/dependabot/Packages.props @@ -19,7 +19,7 @@ - + From 0ddc34d3c8fa99022c3760b00704007eb2bef303 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Nov 2025 02:10:23 +0000 Subject: [PATCH 14/15] Update dependencies from https://github.com/dotnet/dotnet build 291548 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25568.110 -> 11.0.0-beta.25569.110) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25568.110 -> 5.3.0-1.25569.110) NuGet.Build.Tasks (Version 7.0.0-preview.1.6910 -> 7.0.0-preview.1.7010) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 10.0.0-rc.3.25568.110 -> 10.0.0-rc.3.25569.110) --- eng/Version.Details.props | 42 ++++----- eng/Version.Details.xml | 86 +++++++++---------- eng/common/core-templates/job/job.yml | 4 - .../job/publish-build-assets.yml | 2 +- .../steps/component-governance.yml | 16 ---- .../core-templates/steps/generate-sbom.yml | 60 +++---------- .../core-templates/steps/source-build.yml | 2 +- eng/common/generate-sbom-prep.ps1 | 29 ------- eng/common/generate-sbom-prep.sh | 39 --------- eng/common/template-guidance.md | 2 - eng/common/templates-official/job/job.yml | 30 ++----- .../steps/component-governance.yml | 7 -- .../steps/publish-pipeline-artifacts.yml | 2 + eng/common/templates/job/job.yml | 31 +++---- .../templates/steps/component-governance.yml | 7 -- global.json | 2 +- 16 files changed, 98 insertions(+), 263 deletions(-) delete mode 100644 eng/common/core-templates/steps/component-governance.yml delete mode 100644 eng/common/generate-sbom-prep.ps1 delete mode 100755 eng/common/generate-sbom-prep.sh delete mode 100644 eng/common/templates-official/steps/component-governance.yml delete mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 79c1caff2de..58c91d52d55 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25568.110 - 11.0.0-beta.25568.110 - 5.3.0-1.25568.110 - 7.0.0-preview.1.6910 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 - 10.0.0-rc.3.25568.110 + 11.0.0-beta.25569.110 + 11.0.0-beta.25569.110 + 5.3.0-1.25569.110 + 7.0.0-preview.1.7010 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 + 10.0.0-rc.3.25569.110 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34433e4a8ab..1f6901881dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 - + https://github.com/dotnet/dotnet - 9447c7095aa247775e2a4b1cf6bd29c3dd7a32fb + ea77dd1498eeaae360c4309d07ccd68c8936fe48 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index cb4ccc023a3..3921b407bc9 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -31,7 +31,6 @@ parameters: testRunTitle: '' testResultsFormat: '' name: '' - componentGovernanceSteps: [] preSteps: [] artifactPublishSteps: [] runAsPublic: false @@ -150,9 +149,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: diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 4a417e003c7..a23657cd716 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -172,7 +172,7 @@ jobs: artifactName: AssetManifests displayName: 'Publish Merged Manifest' retryCountOnTaskFailure: 10 # for any logs being locked - sbomEnabled: false # we don't need SBOM for logs + isProduction: false - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: diff --git a/eng/common/core-templates/steps/component-governance.yml b/eng/common/core-templates/steps/component-governance.yml deleted file mode 100644 index cf0649aa956..00000000000 --- a/eng/common/core-templates/steps/component-governance.yml +++ /dev/null @@ -1,16 +0,0 @@ -parameters: - disableComponentGovernance: false - componentGovernanceIgnoreDirectories: '' - is1ESPipeline: false - displayName: 'Component Detection' - -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 - displayName: ${{ parameters.displayName }} - inputs: - ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 003f7eae0fa..aad0a8aeda3 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -1,54 +1,14 @@ -# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. -# PackageName - The name of the package this SBOM represents. -# PackageVersion - The version of the package this SBOM represents. -# ManifestDirPath - The path of the directory where the generated manifest files will be placed -# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. - parameters: - PackageVersion: 11.0.0 - BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' - PackageName: '.NET' - ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom - IgnoreDirectories: '' - sbomContinueOnError: true - is1ESPipeline: false - # disable publishArtifacts if some other step is publishing the artifacts (like job.yml). - publishArtifacts: true + PackageVersion: unused + BuildDropPath: unused + PackageName: unused + ManifestDirPath: unused + IgnoreDirectories: unused + sbomContinueOnError: unused + is1ESPipeline: unused + publishArtifacts: unused steps: -- task: PowerShell@2 - displayName: Prep for SBOM generation in (Non-linux) - condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) - inputs: - filePath: ./eng/common/generate-sbom-prep.ps1 - arguments: ${{parameters.manifestDirPath}} - -# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 - script: | - chmod +x ./eng/common/generate-sbom-prep.sh - ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} - displayName: Prep for SBOM generation in (Linux) - condition: eq(variables['Agent.Os'], 'Linux') - continueOnError: ${{ parameters.sbomContinueOnError }} - -- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: 'Generate SBOM manifest' - continueOnError: ${{ parameters.sbomContinueOnError }} - inputs: - PackageName: ${{ parameters.packageName }} - BuildDropPath: ${{ parameters.buildDropPath }} - PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) - ${{ if ne(parameters.IgnoreDirectories, '') }}: - AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' - -- ${{ if eq(parameters.publishArtifacts, 'true')}}: - - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - args: - displayName: Publish SBOM manifest - continueOnError: ${{parameters.sbomContinueOnError}} - targetPath: '${{ parameters.manifestDirPath }}' - artifactName: $(ARTIFACT_NAME) - + echo "##vso[task.logissue type=warning]Including generate-sbom.yml is deprecated, SBOM generation is handled 1ES PT now. Remove this include." + displayName: Issue generate-sbom.yml deprecation warning diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index acf16ed3496..40b6c4c320f 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -62,4 +62,4 @@ steps: artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() - sbomEnabled: false # we don't need SBOM for logs + isProduction: false diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 deleted file mode 100644 index a0c7d792a76..00000000000 --- a/eng/common/generate-sbom-prep.ps1 +++ /dev/null @@ -1,29 +0,0 @@ -Param( - [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed -) - -. $PSScriptRoot\pipeline-logging-functions.ps1 - -# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly -# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. -$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' -$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName - -Write-Host "Artifact name before : $ArtifactName" -Write-Host "Artifact name after : $SafeArtifactName" - -Write-Host "Creating dir $ManifestDirPath" - -# create directory for sbom manifest to be placed -if (!(Test-Path -path $SbomGenerationDir)) -{ - New-Item -ItemType Directory -path $SbomGenerationDir - Write-Host "Successfully created directory $SbomGenerationDir" -} -else{ - Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." -} - -Write-Host "Updating artifact name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh deleted file mode 100755 index b8ecca72bbf..00000000000 --- a/eng/common/generate-sbom-prep.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" - -# resolve $SOURCE until the file is no longer a symlink -while [[ -h $source ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -. $scriptroot/pipeline-logging-functions.sh - - -# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. -artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" -safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" -manifest_dir=$1 - -# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly -# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. -sbom_generation_dir="$manifest_dir/$safe_artifact_name" - -if [ ! -d "$sbom_generation_dir" ] ; then - mkdir -p "$sbom_generation_dir" - echo "Sbom directory created." $sbom_generation_dir -else - Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." -fi - -echo "Artifact name before : "$artifact_name -echo "Artifact name after : "$safe_artifact_name -export ARTIFACT_NAME=$safe_artifact_name -echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" - -exit 0 diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 4bf4cf41bd7..e2b07a865f1 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -82,7 +82,6 @@ eng\common\ publish-build-artifacts.yml (logic) publish-pipeline-artifacts.yml (logic) component-governance.yml (shim) - generate-sbom.yml (shim) publish-logs.yml (shim) retain-build.yml (shim) send-to-helix.yml (shim) @@ -107,7 +106,6 @@ eng\common\ setup-maestro-vars.yml (logic) steps\ component-governance.yml (logic) - generate-sbom.yml (logic) publish-build-artifacts.yml (redirect) publish-logs.yml (logic) publish-pipeline-artifacts.yml (redirect) diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 92a0664f564..fed3caaea70 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,24 +1,15 @@ parameters: -# Sbom related params - enableSbom: true runAsPublic: false - PackageVersion: 9.0.0 - BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' +# Sbom related params, unused now and can eventually be removed + enableSbom: unused + PackageVersion: unused + BuildDropPath: unused jobs: - template: /eng/common/core-templates/job/job.yml parameters: is1ESPipeline: true - componentGovernanceSteps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - - template: /eng/common/templates/steps/generate-sbom.yml - parameters: - PackageVersion: ${{ parameters.packageVersion }} - BuildDropPath: ${{ parameters.buildDropPath }} - ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom - publishArtifacts: false - # publish artifacts # for 1ES managed templates, use the templateContext.output to handle multiple outputs. templateContext: @@ -41,7 +32,7 @@ jobs: continueOnError: true condition: always() retryCountOnTaskFailure: 10 # for any logs being locked - sbomEnabled: false # we don't need SBOM for logs + isProduction: false - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}: - output: buildArtifacts @@ -51,7 +42,7 @@ jobs: ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }} continueOnError: true condition: always() - sbomEnabled: false # we don't need SBOM for logs + #isProduction: false - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - output: pipelineArtifact @@ -59,14 +50,7 @@ jobs: artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true - sbomEnabled: false # we don't need SBOM for BuildConfiguration - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - - output: pipelineArtifact - displayName: Publish SBOM manifest - continueOnError: true - targetPath: $(Build.ArtifactStagingDirectory)/sbom - artifactName: $(ARTIFACT_NAME) + isProduction: false # add any outputs provided via root yaml - ${{ if ne(parameters.templateContext.outputs, '') }}: diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml deleted file mode 100644 index 30bb3985ca2..00000000000 --- a/eng/common/templates-official/steps/component-governance.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/component-governance.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml index 172f9f0fdc9..6a652ae1cfe 100644 --- a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml +++ b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml @@ -26,3 +26,5 @@ steps: properties: ${{ parameters.args.properties }} ${{ if parameters.args.sbomEnabled }}: sbomEnabled: ${{ parameters.args.sbomEnabled }} + ${{ if parameters.args.isProduction }}: + isProduction: ${{ parameters.args.isProduction }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 238fa0818f7..d1b2352798f 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -1,12 +1,12 @@ parameters: enablePublishBuildArtifacts: false - disableComponentGovernance: '' - componentGovernanceIgnoreDirectories: '' -# Sbom related params - enableSbom: true runAsPublic: false - PackageVersion: 9.0.0 - BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' +# CG related params, unused now and can eventually be removed + disableComponentGovernance: unused +# Sbom related params, unused now and can eventually be removed + enableSbom: unused + PackageVersion: unused + BuildDropPath: unused jobs: - template: /eng/common/core-templates/job/job.yml @@ -21,17 +21,10 @@ jobs: - ${{ each step in parameters.steps }}: - ${{ step }} - componentGovernanceSteps: - - 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(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: - disableComponentGovernance: false - ${{ else }}: - disableComponentGovernance: true - ${{ else }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + # we don't run CG in public + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable artifactPublishSteps: - ${{ if ne(parameters.artifacts.publish, '') }}: @@ -58,7 +51,7 @@ jobs: continueOnError: true condition: always() retryCountOnTaskFailure: 10 # for any logs being locked - sbomEnabled: false # we don't need SBOM for logs + isProduction: false - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: - template: /eng/common/core-templates/steps/publish-build-artifacts.yml @@ -81,4 +74,4 @@ jobs: artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true - sbomEnabled: false # we don't need SBOM for BuildConfiguration + isProduction: false diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml deleted file mode 100644 index c12a5f8d21d..00000000000 --- a/eng/common/templates/steps/component-governance.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/component-governance.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/global.json b/global.json index 8317fba7b63..4b588c8d9fc 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25568.110" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25569.110" } } From 09c94ef53b74687cfe5b4e43bf3cf02ad6ad5b76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Nov 2025 02:08:18 +0000 Subject: [PATCH 15/15] Update dependencies from https://github.com/dotnet/dotnet build 291616 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25569.110 -> 11.0.0-beta.25570.101) Microsoft.Net.Compilers.Toolset (Version 5.3.0-1.25569.110 -> 5.3.0-1.25570.101) NuGet.Build.Tasks (Version 7.0.0-preview.1.7010 -> 7.0.0-preview.1.7101) System.CodeDom, System.Collections.Immutable, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Formats.Asn1, System.Formats.Nrbf, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Text.Encoding.CodePages, System.Text.Json, System.Threading.Channels, System.Threading.Tasks.Dataflow (Version 10.0.0-rc.3.25569.110 -> 10.0.0-rc.3.25570.101) --- eng/Version.Details.props | 42 ++++----- eng/Version.Details.xml | 86 +++++++++---------- eng/common/core-templates/job/job.yml | 4 + .../job/publish-build-assets.yml | 7 +- .../core-templates/job/source-build.yml | 2 +- .../core-templates/post-build/post-build.yml | 3 +- .../steps/component-governance.yml | 16 ++++ .../core-templates/steps/generate-sbom.yml | 60 ++++++++++--- .../core-templates/steps/source-build.yml | 2 +- eng/common/generate-sbom-prep.ps1 | 29 +++++++ eng/common/generate-sbom-prep.sh | 39 +++++++++ eng/common/template-guidance.md | 2 + eng/common/templates-official/job/job.yml | 30 +++++-- .../steps/component-governance.yml | 7 ++ .../steps/publish-pipeline-artifacts.yml | 2 - eng/common/templates/job/job.yml | 31 ++++--- .../templates/steps/component-governance.yml | 7 ++ global.json | 2 +- 18 files changed, 269 insertions(+), 102 deletions(-) create mode 100644 eng/common/core-templates/steps/component-governance.yml create mode 100644 eng/common/generate-sbom-prep.ps1 create mode 100644 eng/common/generate-sbom-prep.sh create mode 100644 eng/common/templates-official/steps/component-governance.yml create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 58c91d52d55..94d41984089 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25569.110 - 11.0.0-beta.25569.110 - 5.3.0-1.25569.110 - 7.0.0-preview.1.7010 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 - 10.0.0-rc.3.25569.110 + 11.0.0-beta.25570.101 + 11.0.0-beta.25570.101 + 5.3.0-1.25570.101 + 7.0.0-preview.1.7101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 + 10.0.0-rc.3.25570.101 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f6901881dd..6f15d521c19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,109 +1,109 @@ - + - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a - + https://github.com/dotnet/dotnet - ea77dd1498eeaae360c4309d07ccd68c8936fe48 + e9a2ab63ad60de1afff34ddc3f09257093ea034a diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 3921b407bc9..cb4ccc023a3 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -31,6 +31,7 @@ parameters: testRunTitle: '' testResultsFormat: '' name: '' + componentGovernanceSteps: [] preSteps: [] artifactPublishSteps: [] runAsPublic: false @@ -149,6 +150,9 @@ 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: diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index a23657cd716..8b5c635fe80 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -122,8 +122,9 @@ jobs: # Populate internal runtime variables. - template: /eng/common/templates/steps/enable-internal-sources.yml - parameters: - legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) - template: /eng/common/templates/steps/enable-internal-runtimes.yml @@ -172,7 +173,7 @@ jobs: artifactName: AssetManifests displayName: 'Publish Merged Manifest' retryCountOnTaskFailure: 10 # for any logs being locked - isProduction: false + sbomEnabled: false # we don't need SBOM for logs - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d805d5faeb9..9f6b3ee9e46 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,7 +60,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.2004.amd64 + demands: ImageOverride -equals build.ubuntu.2204.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] image: 1es-mariner-2 diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 27763a825b9..6f0929c039b 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -305,8 +305,9 @@ stages: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} - - task: NuGetAuthenticate@1 # Populate internal runtime variables. + - task: NuGetAuthenticate@1 + # Populate internal runtime variables. - template: /eng/common/templates/steps/enable-internal-sources.yml parameters: legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) diff --git a/eng/common/core-templates/steps/component-governance.yml b/eng/common/core-templates/steps/component-governance.yml new file mode 100644 index 00000000000..cf0649aa956 --- /dev/null +++ b/eng/common/core-templates/steps/component-governance.yml @@ -0,0 +1,16 @@ +parameters: + disableComponentGovernance: false + componentGovernanceIgnoreDirectories: '' + is1ESPipeline: false + displayName: 'Component Detection' + +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 + displayName: ${{ parameters.displayName }} + inputs: + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index aad0a8aeda3..003f7eae0fa 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -1,14 +1,54 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed +# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. + parameters: - PackageVersion: unused - BuildDropPath: unused - PackageName: unused - ManifestDirPath: unused - IgnoreDirectories: unused - sbomContinueOnError: unused - is1ESPipeline: unused - publishArtifacts: unused + PackageVersion: 11.0.0 + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + IgnoreDirectories: '' + sbomContinueOnError: true + is1ESPipeline: false + # disable publishArtifacts if some other step is publishing the artifacts (like job.yml). + publishArtifacts: true steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 - script: | - echo "##vso[task.logissue type=warning]Including generate-sbom.yml is deprecated, SBOM generation is handled 1ES PT now. Remove this include." - displayName: Issue generate-sbom.yml deprecation warning + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) + ${{ if ne(parameters.IgnoreDirectories, '') }}: + AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' + +- ${{ if eq(parameters.publishArtifacts, 'true')}}: + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + targetPath: '${{ parameters.manifestDirPath }}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 40b6c4c320f..acf16ed3496 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -62,4 +62,4 @@ steps: artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() - isProduction: false + sbomEnabled: false # we don't need SBOM for logs diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 new file mode 100644 index 00000000000..a0c7d792a76 --- /dev/null +++ b/eng/common/generate-sbom-prep.ps1 @@ -0,0 +1,29 @@ +Param( + [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed +) + +. $PSScriptRoot\pipeline-logging-functions.ps1 + +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" +$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' +$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName + +Write-Host "Artifact name before : $ArtifactName" +Write-Host "Artifact name after : $SafeArtifactName" + +Write-Host "Creating dir $ManifestDirPath" + +# create directory for sbom manifest to be placed +if (!(Test-Path -path $SbomGenerationDir)) +{ + New-Item -ItemType Directory -path $SbomGenerationDir + Write-Host "Successfully created directory $SbomGenerationDir" +} +else{ + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +} + +Write-Host "Updating artifact name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh new file mode 100644 index 00000000000..b8ecca72bbf --- /dev/null +++ b/eng/common/generate-sbom-prep.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +. $scriptroot/pipeline-logging-functions.sh + + +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" +manifest_dir=$1 + +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +sbom_generation_dir="$manifest_dir/$safe_artifact_name" + +if [ ! -d "$sbom_generation_dir" ] ; then + mkdir -p "$sbom_generation_dir" + echo "Sbom directory created." $sbom_generation_dir +else + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +fi + +echo "Artifact name before : "$artifact_name +echo "Artifact name after : "$safe_artifact_name +export ARTIFACT_NAME=$safe_artifact_name +echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" + +exit 0 diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index e2b07a865f1..4bf4cf41bd7 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -82,6 +82,7 @@ eng\common\ publish-build-artifacts.yml (logic) publish-pipeline-artifacts.yml (logic) component-governance.yml (shim) + generate-sbom.yml (shim) publish-logs.yml (shim) retain-build.yml (shim) send-to-helix.yml (shim) @@ -106,6 +107,7 @@ eng\common\ setup-maestro-vars.yml (logic) steps\ component-governance.yml (logic) + generate-sbom.yml (logic) publish-build-artifacts.yml (redirect) publish-logs.yml (logic) publish-pipeline-artifacts.yml (redirect) diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index fed3caaea70..92a0664f564 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,15 +1,24 @@ parameters: +# Sbom related params + enableSbom: true runAsPublic: false -# Sbom related params, unused now and can eventually be removed - enableSbom: unused - PackageVersion: unused - BuildDropPath: unused + PackageVersion: 9.0.0 + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml parameters: is1ESPipeline: true + componentGovernanceSteps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion }} + BuildDropPath: ${{ parameters.buildDropPath }} + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + publishArtifacts: false + # publish artifacts # for 1ES managed templates, use the templateContext.output to handle multiple outputs. templateContext: @@ -32,7 +41,7 @@ jobs: continueOnError: true condition: always() retryCountOnTaskFailure: 10 # for any logs being locked - isProduction: false + sbomEnabled: false # we don't need SBOM for logs - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}: - output: buildArtifacts @@ -42,7 +51,7 @@ jobs: ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }} continueOnError: true condition: always() - #isProduction: false + sbomEnabled: false # we don't need SBOM for logs - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - output: pipelineArtifact @@ -50,7 +59,14 @@ jobs: artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true - isProduction: false + sbomEnabled: false # we don't need SBOM for BuildConfiguration + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - output: pipelineArtifact + displayName: Publish SBOM manifest + continueOnError: true + targetPath: $(Build.ArtifactStagingDirectory)/sbom + artifactName: $(ARTIFACT_NAME) # add any outputs provided via root yaml - ${{ if ne(parameters.templateContext.outputs, '') }}: diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 00000000000..30bb3985ca2 --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/component-governance.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml index 6a652ae1cfe..172f9f0fdc9 100644 --- a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml +++ b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml @@ -26,5 +26,3 @@ steps: properties: ${{ parameters.args.properties }} ${{ if parameters.args.sbomEnabled }}: sbomEnabled: ${{ parameters.args.sbomEnabled }} - ${{ if parameters.args.isProduction }}: - isProduction: ${{ parameters.args.isProduction }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index d1b2352798f..238fa0818f7 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -1,12 +1,12 @@ parameters: enablePublishBuildArtifacts: false + disableComponentGovernance: '' + componentGovernanceIgnoreDirectories: '' +# Sbom related params + enableSbom: true runAsPublic: false -# CG related params, unused now and can eventually be removed - disableComponentGovernance: unused -# Sbom related params, unused now and can eventually be removed - enableSbom: unused - PackageVersion: unused - BuildDropPath: unused + PackageVersion: 9.0.0 + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -21,10 +21,17 @@ jobs: - ${{ each step in parameters.steps }}: - ${{ step }} - # we don't run CG in public - - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" - displayName: Set skipComponentGovernanceDetection variable + componentGovernanceSteps: + - 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(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} artifactPublishSteps: - ${{ if ne(parameters.artifacts.publish, '') }}: @@ -51,7 +58,7 @@ jobs: continueOnError: true condition: always() retryCountOnTaskFailure: 10 # for any logs being locked - isProduction: false + sbomEnabled: false # we don't need SBOM for logs - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: - template: /eng/common/core-templates/steps/publish-build-artifacts.yml @@ -74,4 +81,4 @@ jobs: artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true - isProduction: false + sbomEnabled: false # we don't need SBOM for BuildConfiguration diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 00000000000..c12a5f8d21d --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/component-governance.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/global.json b/global.json index 4b588c8d9fc..e009fecce27 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ "xcopy-msbuild": "17.13.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25569.110" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25570.101" } }