8000 [main] Source code updates from dotnet/source-build-reference-packages by dotnet-maestro[bot] · Pull Request #335 · dotnet/dotnet · GitHub
[go: up one dir, main page]
Skip to content

[main] Source code updates from dotnet/source-build-reference-packages #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 2, 2025
Merged

[main] Source code updates from dotnet/source-build-reference-packages #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baa26f0
[source-build-reference-packages] Source update 4b825dc → d1ab3b4
dotnet-maestro[bot] May 2, 2025
e367b54
Delete src/source-build-reference-packages/eng/DotNetBuild.props
ViktorHofer May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions prereqs/git-info/source-build-reference-packages.props
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>64b59155edd234b5352eead067a2b005410061c7</GitCommitHash>
<OfficialBuildId>20250428.1</OfficialBuildId>
<OutputPackageVersion>10.0.622801</OutputPackageVersion>
<GitCommitHash>d1ab3b44c05f314be6885d1933d7e48fffa0cfc2</GitCommitHash>
<OfficialBuildId>20250501.1</OfficialBuildId>
<OutputPackageVersion></OutputPackageVersion>
</PropertyGroup>
</Project>
10 changes: 5 additions & 5 deletions src/source-build-reference-packages/eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="efbfb137a317fb339a6b7be36af7188cc508dc95" BarId="266095" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="35ccf19f39389d127ab037709b8e9c5a1b111a20" BarId="266496" />
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25228.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25230.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>efbfb137a317fb339a6b7be36af7188cc508dc95</Sha>
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.5.25228.104">
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.5.25230.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>efbfb137a317fb339a6b7be36af7188cc508dc95</Sha>
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.4.20202.18">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
2 changes: 1 addition & 1 deletion src/source-build-reference-packages/eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILDAsmVersion>
<!-- SDK dependencies -->
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.5.25228.104</MicrosoftDotNetGenAPITaskPackageVersion>
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.5.25230.108</MicrosoftDotNetGenAPITaskPackageVersion>
<!-- xUnit dependencies -->
<XunitSkippableFactVersion>1.4.13</XunitSkippableFactVersion>
</PropertyGroup>
Expand Down
11 changes: 0 additions & 11 deletions src/source-build-reference-packages/eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
2 changes: 1 addition & 1 deletion src/source-build-reference-packages/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dotnet": "10.0.100-preview.3.25201.16"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25228.104",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25230.108",
"Microsoft.Build.NoTargets": "3.7.0"
}
}
2 changes: 1 addition & 1 deletion ...soft.codeanalysis.workspaces.common/4.0.1/microsoft.codeanalysis.workspaces.common.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<!-- Humanizer version overridden to the version provided by source-build-externals -->
<dependency id="Humanizer.Core" version="2.14.1" include="Runtime,Build,Native,ContentFiles,Analyzers,BuildTransitive" />
<dependency id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" exclude="Build,Analyzers" />
<dependency id="System.Composition" version="1.1.0" exclude="Build,Analyzers" />
<dependency id="System.Composition" version="9.0.0" exclude="Build,Analyzers" />
<dependency id="System.IO.Pipelines" version="5.0.1" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/source-build-reference-packages/tests/SbrpTests/GenerateScriptTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public enum PackageType
new object[] { "Microsoft.Build.NoTargets", "3.7.0", PackageType.Text },
new object[] { "Microsoft.Extensions.Logging.Abstractions", "6.0.4", PackageType.Reference },
new object[] { "NuGet.Packaging", "6.13.1", PackageType.Reference },
new object[] { "System.Buffers", "4.6.0", PackageType.Reference },
new object[] { "System.Buffers", "4.6.1", PackageType.Reference },
new object[] { "System.Security.Cryptography.ProtectedData", "8.0.0", PackageType.Reference },
};

Expand Down
6 changes: 3 additions & 3 deletions src/source-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@
"commitSha": "37a16c719922cb4203d0506484502fd62ac91aa7"
},
{
"packageVersion": "10.0.622801",
"barId": 266122,
"packageVersion": "",
"barId": 266545,
"path": "source-build-reference-packages",
"remoteUri": "https://github.com/dotnet/source-build-reference-packages",
"commitSha": "64b59155edd234b5352eead067a2b005410061c7"
"commitSha": "d1ab3b44c05f314be6885d1933d7e48fffa0cfc2"
},
{
"packageVersion": "10.0.0-beta.25230.1",
Expand Down
0