8000 [main] Source code updates from dotnet/deployment-tools (#360) · dotnet/dotnet@97cba82 · GitHub
[go: up one dir, main page]
Skip to content

Commit 97cba82

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/deployment-tools (#360)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 22a67a1 commit 97cba82

File tree

6 files changed

+11
-22
lines changed

6 files changed

+11
-22
lines changed

‎prereqs/git-info/deployment-tools.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<GitCommitHash>0d838d1284cb95c963ac49987dfc2fa5d93a11e7</GitCommitHash>
5-
<OfficialBuildId>20250428.1</OfficialBuildId>
6-
<OutputPackageVersion>9.0.0-preview.1.25228.1</OutputPackageVersion>
4+
<GitCommitHash>150d38efe20041a832482eb69e0d61b5d795e167</GitCommitHash>
5+
<OfficialBuildId>20250501.1</OfficialBuildId>
6+
<OutputPackageVersion>9.0.0-preview.1.25251.1</OutputPackageVersion>
77
</PropertyGroup>
88
</Project>

‎src/deployment-tools/eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Dependencies>
2-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="deployment-tools" Sha="efbfb137a317fb339a6b7be36af7188cc508dc95" BarId="266095" />
2+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="deployment-tools" Sha="dab45dead83a6cf3e5fa9df1396c51e6a6b61c07" BarId="266608" />
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25228.104">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25251.102">
77
<Uri>https://github.com/dotnet/dotnet</Uri>
8-
<Sha>efbfb137a317fb339a6b7be36af7188cc508dc95</Sha>
8+
<Sha>dab45dead83a6cf3e5fa9df1396c51e6a6b61c07</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎src/deployment-tools/eng/common/core-templates/jobs/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

‎src/deployment-tools/eng/common/core-templates/steps/source-build.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,3 @@ steps:
121121
continueOnError: true
122122
condition: succeededOrFailed()
123123
sbomEnabled: false # we don't need SBOM for logs
124-
125-
# Manually inject component detection so that we can ignore the source build upstream cache, which contains
126-
# a nupkg cache of input packages (a local feed).
127-
# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir'
128-
# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets
129-
- template: /eng/common/core-templates/steps/component-governance.yml
130-
parameters:
131-
displayName: Component Detection (Exclude upstream cache)
132-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
133-
componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
134-
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}

‎src/deployment-tools/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dotnet": "10.0.100-preview.3.25201.16"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25228.104",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25251.102",
1212
"Microsoft.Build.NoTargets": "3.7.0",
1313
"Microsoft.Build.Traversal": "3.4.0"
1414
}

‎src/source-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
"commitSha": "e5a8d8400751a0fe40f766f2130ef00c59ee9c56"
3737
},
3838
{
39-
"packageVersion": "9.0.0-preview.1.25228.1",
40-
"barId": 266125,
39+
"packageVersion": "9.0.0-preview.1.25251.1",
40+
"barId": 266637,
4141
"path": "deployment-tools",
4242
"remoteUri": "https://github.com/dotnet/deployment-tools",
43-
"commitSha": "0d838d1284cb95c963ac49987dfc2fa5d93a11e7"
43+
"commitSha": "150d38efe20041a832482eb69e0d61b5d795e167"
4444
},
4545
{
4646
"packageVersion": "9.0.623003",

0 commit comments

Comments
 (0)
0