Skip to content

[release/11.0.1xx] Source code updates from dotnet/dotnet #56113

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
akoeplinger merged 6 commits into from
Sep 9, 2026
Merged

[release/11.0.1xx] Source code updates from dotnet/dotnet #56113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1cb9fab
Update dependencies from build 330198
dotnet-maestro[bot] Sep 3, 2026
d93ec36
Merge release/11.0.1xx into darc-release/11.0.1xx-03fca775-f9bd-4435-…
dotnet-maestro[bot] Sep 3, 2026
e8d93eb
Update dependencies from build 330331
dotnet-maestro[bot] Sep 3, 2026
0523499
Update dependencies from build 330381
dotnet-maestro[bot] Sep 3, 2026
c881424
Disable affected Razor compatibility tests
mthalman Sep 4, 2026
ca3770c
Regenerate file-based app compiler arguments
nagilson Sep 8, 2026
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dotnet.helix.jobmonitor": {
"version": "11.0.0-beta.26451.112",
"version": "11.0.0-beta.26453.107",
"commands": [
"dotnet-helix-job-monitor"
]
Expand Down
250 changes: 125 additions & 125 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"runner": "Microsoft.Testing.Platform"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26451.112",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26451.112",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26453.107",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26453.107",
"Microsoft.Build.NoTargets": "3.7.134",
"Microsoft.Build.Traversal": "4.1.82",
"Microsoft.WixToolset.Sdk": "6.0.3-dotnet.6",
Expand Down
1 change: 0 additions & 1 deletion src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ .. GetFrameworkReferenceArguments(),
"/deterministic+",
"/langversion:15.0",
"/features:FileBasedProgram",
$"/analyzerconfig:{SdkPath}/Sdks/Microsoft.NET.Sdk/codestyle/cs/build/config/analysislevelstyle_default.globalconfig",
$"/analyzerconfig:{objDir}/{FileName}.GeneratedMSBuildEditorConfig.editorconfig",
$"/analyzerconfig:{SdkPath}/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_11_default.globalconfig",
$"/analyzer:{SdkPath}/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll",
Expand Down
1 change: 1 addition & 0 deletions test/Microsoft.NET.Sdk.Razor.Tests/MvcBuildIntegrationTest50.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ void VerifyError(TestAsset projectDirectory)
}

[TestMethod]
[Ignore("https://github.com/dotnet/roslyn/issues/85132")]
public void IncrementalBuild_WithP2P_WorksWhenBuildProjectReferencesIsDisabled()
{
// Simulates building the same way VS does by setting BuildProjectReferences=false.
Expand Down
2 changes: 2 additions & 0 deletions test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,7 @@ public class ScopedCssCompatibilityIntegrationTest : IsolatedNuGetPackageFolderA
{
protected override string RestoreNugetPackagePath => Path.Combine(nameof(ScopedCssCompatibilityIntegrationTest), ".nuget");
[TestMethod]
[Ignore("https://github.com/dotnet/roslyn/issues/85132")]
public void ScopedCss_IsBackwardsCompatible_WithPreviousVersions()
{
var testAsset = "RazorAppWithPackageAndP2PReference";
Expand Down Expand Up @@ -597,6 +598,7 @@ public void ScopedCss_IsBackwardsCompatible_WithPreviousVersions()
}

[TestMethod]
[Ignore("https://github.com/dotnet/roslyn/issues/85132")]
public void ScopedCss_PublishIsBackwardsCompatible_WithPreviousVersions()
{
var testAsset = "RazorAppWithPackageAndP2PReference";
Expand Down
Loading