Skip to content

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

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

Open
dotnet-maestro wants to merge 9 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
18c25d9
Backflow from https://github.com/dotnet/dotnet / 45484d2 build 293862
dotnet-maestro[bot] Dec 9, 2025
41e0667
Merge main into darc-main-6224f5aa-e632-4669-b1f6-6ec23567b9ec
dotnet-maestro[bot] Dec 9, 2025
6a81365
Update dependencies from https://github.com/dotnet/dotnet build 293862
dotnet-maestro[bot] Dec 9, 2025
805f6d7
Update dependencies from https://github.com/dotnet/dotnet build 294068
dotnet-maestro[bot] Dec 10, 2025
daacb92
Get rid of RemoveSharedFrameworkDependencies.cs, use PrivateAssets fo…
wtgodbe Dec 11, 2025
edd60c1
Fixup
wtgodbe Dec 11, 2025
124486e
Test
wtgodbe Dec 11, 2025
23f4d6b
Make sure
wtgodbe Dec 11, 2025
c19811d
2 more
wtgodbe Dec 11, 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.

6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<Import Project="Version.Details.props" />

<PropertyGroup Label="Version settings">
<AspNetCoreMajorVersion>10</AspNetCoreMajorVersion>
<AspNetCoreMajorVersion>11</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' != 'true'">8.0.1</IdentityModelVersion>
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' == 'true'">*-*</IdentityModelVersion>
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
<DotNetFinalVersionKind></DotNetFinalVersionKind>

Expand Down
2 changes: 2 additions & 0 deletions eng/common/core-templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ jobs:
templateContext: ${{ parameters.templateContext }}

variables:
- name: AllowPtrToDetectTestRunRetryFiles
value: true
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
- name: DOTNET_CLI_TELEMETRY_PROFILE
value: '$(Build.Repository.Uri)'
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/job/source-index-stage1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ parameters:
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
binlogPath: artifacts/log/Debug/Build.binlog
condition: ''
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
dependsOn: ''
pool: ''
is1ESPipeline: ''
Expand Down Expand Up @@ -41,4 +41,4 @@ jobs:

- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
parameters:
binLogPath: ${{ parameters.binLogPath }}
binLogPath: ${{ parameters.binLogPath }}
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": "11.0.0-beta.25603.106",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25603.106",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25603.106",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25608.106",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25608.106",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25608.106",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"
Expand Down
2 changes: 1 addition & 1 deletion src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ public async Task ApiExplorer_LogsInvokedDescriptionProvidersOnStartup()
// Assert
Assert.Contains(TestSink.Writes, w => w.EventId.Name?.Equals("ApiDescriptionProviderExecuting", StringComparison.Ordinal) == true);
Assert.Contains(TestSink.Writes, w => w.LoggerName.Equals("Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollectionProvider", StringComparison.Ordinal));
Assert.Contains(TestSink.Writes, w => w.Message.Equals("Executing API description provider 'DefaultApiDescriptionProvider' from assembly Microsoft.AspNetCore.Mvc.ApiExplorer v10.0.0.0.", StringComparison.Ordinal));
Assert.Contains(TestSink.Writes, w => w.Message.Equals("Executing API description provider 'DefaultApiDescriptionProvider' from assembly Microsoft.AspNetCore.Mvc.ApiExplorer v11.0.0.0.", StringComparison.Ordinal));
Assert.Contains(TestSink.Writes, w => w.Message.Equals("Executing API description provider 'JsonPatchOperationsArrayProvider' from assembly Microsoft.AspNetCore.Mvc.NewtonsoftJson v42.42.42.42.", StringComparison.Ordinal));
}

Expand Down
1 change: 1 addition & 0 deletions src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ internal static class TemplatePackageInstaller
"Microsoft.DotNet.Web.ProjectTemplates.8.0",
"Microsoft.DotNet.Web.ProjectTemplates.9.0",
"Microsoft.DotNet.Web.ProjectTemplates.10.0",
"Microsoft.DotNet.Web.ProjectTemplates.11.0",
"Microsoft.AspNetCore.Blazor.Templates",
};

Expand Down
Loading