Skip to content

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

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 4 commits into from
+286 −285
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4599f9
Backflow from https://github.com/dotnet/dotnet / 408e199 build 282562
dotnet-maestro[bot] Sep 10, 2025
6196a9e
Merge main into darc-main-7924384d-1816-4f3d-ab8f-b5efb2baae3f
dotnet-maestro[bot] Sep 10, 2025
a3bd919
Update dependencies from https://github.com/dotnet/dotnet build 282562
dotnet-maestro[bot] Sep 10, 2025
b75b4fe
Try mac arm64 queue
wtgodbe Sep 10, 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
4 changes: 2 additions & 2 deletions eng/targets/Helix.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- aspnetcore-quarantined-pr (quarantined-pr.yml) -->
<ItemGroup>
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
<HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
<HelixAvailableTargetQueue Include="OSX.15.Arm64.Open" Platform="OSX" />
<HelixAvailableTargetQueue Include="Windows.Amd64.VS2022.Pre.Open" Platform="Windows" />
</ItemGroup>
</When>
Expand All @@ -50,7 +50,7 @@
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian)" Platform="Linux" />

<!-- Mac -->
<HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
<HelixAvailableTargetQueue Include="OSX.15.Arm64.Open" Platform="OSX" />

<!-- Windows -->
<HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />
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.25459.108",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25459.108",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25459.108",
"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