8000 [main] Source code updates from dotnet/sourcelink (#338) · dotnet/dotnet@df41c67 · GitHub
[go: up one dir, main page]
Skip to content

Commit df41c67

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/sourcelink (#338)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 1a0adec commit df41c67

File tree

6 files changed

+11
-22
lines changed

6 files changed

+11
-22
lines changed

‎prereqs/git-info/sourcelink.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>fe14310ca1da9c2d63c377fe590dcf5f6a2d013e</GitCommitHash>
5-
<OfficialBuildId>20250430.1</OfficialBuildId>
6-
<OutputPackageVersion>10.0.0-beta.25230.1</OutputPackageVersion>
4+
<GitCommitHash>25716402f74dfeb1f4137601d013e158628d5196</GitCommitHash>
5+
<OfficialBuildId>20250501.2</OfficialBuildId>
6+
<OutputPackageVersion>10.0.0-beta.25251.2</OutputPackageVersion>
77
</PropertyGroup>
88
</Project>

‎src/source-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@
141141
"commitSha": "64b59155edd234b5352eead067a2b005410061c7"
142142
},
143143
{
144-
"packageVersion": "10.0.0-beta.25230.1",
145-
"barId": 266503,
144+
"packageVersion": "10.0.0-beta.25251.2",
145+
"barId": 266626,
146146
"path": "sourcelink",
147147
"remoteUri": "https://github.com/dotnet/sourcelink",
148-
"commitSha": "fe14310ca1da9c2d63c377fe590dcf5f6a2d013e"
148+
"commitSha": "25716402f74dfeb1f4137601d013e158628d5196"
149149
},
150150
{
151151
"packageVersion": "2.2.0-beta.25228.1",

‎src/sourcelink/eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="78c5fa9a48d469a19ab5a61c16c955c1f370b5be" BarId="266331" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="dab45dead83a6cf3e5fa9df1396c51e6a6b61c07" BarId="266608" />
44
<ProductDependencies>
55
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25208.1">
66
<Uri>https://github.com/dotnet/command-line-api</Uri>
77
<Sha>48bd86bdcd926a194e1581a60d820d12a64ef3c6</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25229.109">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25251.102">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
13+
<Sha>dab45dead83a6cf3e5fa9df1396c51e6a6b61c07</Sha>
1414
</Dependency>
1515
</ToolsetDependencies>
1616
</Dependencies>

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

< 8000 div class="d-flex mr-2 flex-justify-end flex-items-center flex-1">
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/sourcelink/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/sourcelink/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.3.25201.16"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25229.109",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25251.102",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

0 commit comments

Comments
 (0)
0