8000 [main] Source code updates from dotnet/source-build-reference-package… · dotnet/dotnet@db04b45 · GitHub
[go: up one dir, main page]
Skip to content

Commit db04b45

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Source code updates from dotnet/source-build-reference-packages (#335)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent d4cd773 commit db04b45

File tree

8 files changed

+15
-26
lines changed

8 files changed

+15
-26
lines changed

‎prereqs/git-info/source-build-reference-packages.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>64b59155edd234b5352eead067a2b005410061c7</GitCommitHash>
5-
<OfficialBuildId>20250428.1</OfficialBuildId>
6-
<OutputPackageVersion>10.0.622801</OutputPackageVersion>
4+
<GitCommitHash>d1ab3b44c05f314be6885d1933d7e48fffa0cfc2</GitCommitHash>
5+
<OfficialBuildId>20250501.1</OfficialBuildId>
6+
<OutputPackageVersion></OutputPackageVersion>
77
</PropertyGroup>
88
</Project>

‎src/source-build-reference-packages/eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="efbfb137a317fb339a6b7be36af7188cc508dc95" BarId="266095" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="35ccf19f39389d127ab037709b8e9c5a1b111a20" BarId="266496" />
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25228.104">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25230.108">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>efbfb137a317fb339a6b7be36af7188cc508dc95</Sha>
7+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.5.25228.104">
9+
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.5.25230.108">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>efbfb137a317fb339a6b7be36af7188cc508dc95</Sha>
11+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.4.20202.18">
1414
<Uri>https://github.com/dotnet/runtime</Uri>

‎src/source-build-reference-packages/eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILAsmVersion>
1818
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILDAsmVersion>
1919
<!-- SDK dependencies -->
20-
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.5.25228.104</MicrosoftDotNetGenAPITaskPackageVersion>
20+
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.5.25230.108</MicrosoftDotNetGenAPITaskPackageVersion>
2121
<!-- xUnit dependencies -->
2222
<XunitSkippableFactVersion>1.4.13</XunitSkippableFactVersion>
2323
</PropertyGroup>

‎src/source-build-reference-packages/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/source-build-reference-packages/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.25228.104",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25230.108",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

‎src/source-build-reference-packages/src/referencePackages/src/microsoft.codeanalysis.workspaces.common/4.0.1/microsoft.codeanalysis.workspaces.common.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<!-- Humanizer version overridden to the version provided by source-build-externals -->
2424
<dependency id="Humanizer.Core" version="2.14.1" include="Runtime,Build,Native,ContentFiles,Analyzers,BuildTransitive" />
2525
<dependency id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" exclude="Build,Analyzers" />
26-
<dependency id="System.Composition" version="1.1.0" exclude="Build,Analyzers" />
26+
<dependency id="System.Composition" version="9.0.0" exclude="Build,Analyzers" />
2727
<dependency id="System.IO.Pipelines" version="5.0.1" exclude="Build,Analyzers" />
2828
</group>
2929
</dependencies>

‎src/source-build-reference-packages/tests/SbrpTests/GenerateScriptTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public enum PackageType
2424
new object[] { "Microsoft.Build.NoTargets", "3.7.0", PackageType.Text },
2525
new object[] { "Microsoft.Extensions.Logging.Abstractions", "6.0.4", PackageType.Reference },
2626
new object[] { "NuGet.Packaging", "6.13.1", PackageType.Reference },
27-
new object[] { "System.Buffers", "4.6.0", PackageType.Reference },
27+
new object[] { "System.Buffers", "4.6.1", PackageType.Reference },
2828
new object[] { "System.Security.Cryptography.ProtectedData", "8.0.0", PackageType.Reference },
2929
};
3030

‎src/source-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@
134134
"commitSha": "37a16c719922cb4203d0506484502fd62ac91aa7"
135135
},
136136
{
137-
"packageVersion": "10.0.622801",
138-
"barId": 266122,
137+
"packageVersion": "",
138+
"barId": 266545,
139139
"path": "source-build-reference-packages",
140140
"remoteUri": "https://github.com/dotnet/source-build-reference-packages",
141-
"commitSha": "64b59155edd234b5352eead067a2b005410061c7"
141+
"commitSha": "d1ab3b44c05f314be6885d1933d7e48fffa0cfc2"
142142
},
143143
{
144144
"packageVersion": "10.0.0-beta.25251.2",

0 commit comments

Comments
 (0)
0