diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8449322dda..79ceb82fbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,38 +7,38 @@ - + https://github.com/dotnet/arcade - 5fb72aaffeff9c6f2ce46d3b226a84772fb72f55 + cdf9c563205c673b7df205e24564aa48dbc341c3 - + https://github.com/dotnet/arcade - 5fb72aaffeff9c6f2ce46d3b226a84772fb72f55 + cdf9c563205c673b7df205e24564aa48dbc341c3 - + https://github.com/dotnet/arcade - 5fb72aaffeff9c6f2ce46d3b226a84772fb72f55 + cdf9c563205c673b7df205e24564aa48dbc341c3 - + https://github.com/dotnet/arcade - 5fb72aaffeff9c6f2ce46d3b226a84772fb72f55 + cdf9c563205c673b7df205e24564aa48dbc341c3 - + https://github.com/dotnet/arcade - 5fb72aaffeff9c6f2ce46d3b226a84772fb72f55 + cdf9c563205c673b7df205e24564aa48dbc341c3 - + https://github.com/dotnet/arcade - 5fb72aaffeff9c6f2ce46d3b226a84772fb72f55 + cdf9c563205c673b7df205e24564aa48dbc341c3 - + https://github.com/dotnet/arcade - 5fb72aaffeff9c6f2ce46d3b226a84772fb72f55 + cdf9c563205c673b7df205e24564aa48dbc341c3 diff --git a/eng/Versions.props b/eng/Versions.props index 0ead156c83..ef581b1d00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -91,7 +91,7 @@ 9.0.0-beta.24212.4 5.0.0-preview.5.20278.1 8.0.0-beta.24525.2 - 10.0.0-beta.25225.4 + 10.0.0-beta.25253.1 8.0.2 0.0.6-test 0.0.13-test diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index a10ccfbee6..df24c948ba 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 8c88ccd7b0..c6b9ef51ac 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -121,14 +121,3 @@ steps: continueOnError: true condition: succeededOrFailed() sbomEnabled: false # we don't need SBOM for logs - -# Manually inject component detection so that we can ignore the source build upstream cache, which contains -# a nupkg cache of input packages (a local feed). -# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' -# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets -- template: /eng/common/core-templates/steps/component-governance.yml - parameters: - displayName: Component Detection (Exclude upstream cache) - is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' - disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/global.json b/global.json index c5ad302e41..849a05cec4 100644 --- a/global.json +++ b/global.json @@ -13,8 +13,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25225.4", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25225.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25253.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25253.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0" }