Skip to content

[main] Source code updates from dotnet/dotnet #63659

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

Closed
wants to merge 7 commits into from
Closed

[main] Source code updates from dotnet/dotnet #63659

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
79506cd
Backflow from https://github.com/dotnet/dotnet / 5d79341 build 282866
dotnet-maestro[bot] Sep 12, 2025
f029064
Merge main into darc-main-4b3a2e38-e115-4bb0-8603-d1c9b2f662ca
dotnet-maestro[bot] Sep 12, 2025
9e28790
Update dependencies from https://github.com/dotnet/dotnet build 282866
dotnet-maestro[bot] Sep 12, 2025
b2dcf83
Update dependencies from https://github.com/dotnet/dotnet build 283019
dotnet-maestro[bot] Sep 13, 2025
ec8eed2
Backflow from https://github.com/dotnet/dotnet / 99827af build 283082
dotnet-maestro[bot] Sep 14, 2025
8f2f8b7
Update dependencies from https://github.com/dotnet/dotnet build 283082
dotnet-maestro[bot] Sep 14, 2025
381f936
Update dependencies from https://github.com/dotnet/dotnet build 283253
dotnet-maestro[bot] Sep 16, 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
184 changes: 92 additions & 92 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

370 changes: 185 additions & 185 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion eng/common/core-templates/steps/generate-sbom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.

parameters:
PackageVersion: 10.0.0
PackageVersion: 11.0.0
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
PackageName: '.NET'
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/steps/source-index-stage1-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
sourceIndexUploadPackageVersion: 2.0.0-20250818.1
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1
sourceIndexUploadPackageVersion: 2.0.0-20250906.1
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250906.1
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
binlogPath: artifacts/log/Debug/Build.binlog

Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"jdk": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.121",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.121",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25420.121",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25461.111",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25461.111",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25461.111",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}
Expand Down
1 change: 1 addition & 0 deletions src/Components/Components/src/RouteView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public Task SetParametersAsync(ParameterView parameters)
/// Renders the component.
/// </summary>
/// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
[UnconditionalSuppressMessage("Trimming", "IL2110", Justification = "Layout components are preserved because the LayoutAttribute constructor parameter is correctly annotated.")]
[UnconditionalSuppressMessage("Trimming", "IL2111", Justification = "Layout components are preserved because the LayoutAttribute constructor parameter is correctly annotated.")]
[UnconditionalSuppressMessage("Trimming", "IL2118", Justification = "Layout components are preserved because the LayoutAttribute constructor parameter is correctly annotated.")]
protected virtual void Render(RenderTreeBuilder builder)
Expand Down
Loading