Skip to content

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

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
dotnet-maestro merged 2 commits into from
Jan 12, 2026
Merged

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

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
1432df8
Backflow from https://github.com/dotnet/dotnet / db3b742 build 296788
dotnet-maestro[bot] Jan 11, 2026
ab5cbcd
Update dependencies
dotnet-maestro[bot] Jan 11, 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
6 changes: 3 additions & 3 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ This file should be imported by eng/Versions.props
<MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>5.3.0-2.25625.1</MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25625.1</MicrosoftNetCompilersToolsetPackageVersion>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetFileBasedProgramsPackageVersion>11.0.100-alpha.1.26057.107</MicrosoftDotNetFileBasedProgramsPackageVersion>
<RoslynDiagnosticsAnalyzersPackageVersion>5.3.0-2.26057.107</RoslynDiagnosticsAnalyzersPackageVersion>
<SystemCommandLinePackageVersion>3.0.0-alpha.1.26057.107</SystemCommandLinePackageVersion>
<MicrosoftDotNetFileBasedProgramsPackageVersion>11.0.100-alpha.1.26060.102</MicrosoftDotNetFileBasedProgramsPackageVersion>
<RoslynDiagnosticsAnalyzersPackageVersion>5.4.0-2.26060.102</RoslynDiagnosticsAnalyzersPackageVersion>
<SystemCommandLinePackageVersion>3.0.0-alpha.1.26060.102</SystemCommandLinePackageVersion>
<!-- dotnet/runtime dependencies -->
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>9.0.0</MicrosoftExtensionsConfigurationPackageVersion>
Expand Down
14 changes: 7 additions & 7 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="896160ec9eb0fdb1c019f698b39fa0923c9a316c" BarId="296315" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="db3b7424251b47d9474dbbe3b4fa7a81fe2915b7" BarId="296788" />
<ProductDependencies>
<!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
<Dependency Name="Microsoft.CodeAnalysis" Version="5.3.0-2.25625.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5dd606bb21208dfc6fd3d9b07ae963a93248483b</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="3.0.0-alpha.1.26057.107">
<Dependency Name="System.CommandLine" Version="3.0.0-alpha.1.26060.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>896160ec9eb0fdb1c019f698b39fa0923c9a316c</Sha>
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0">
Expand Down Expand Up @@ -139,9 +139,9 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>8b5a2ffee4f4097893b7fc670f7d86d84c8c841f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.FileBasedPrograms" Version="11.0.100-alpha.1.26057.107">
<Dependency Name="Microsoft.DotNet.FileBasedPrograms" Version="11.0.100-alpha.1.26060.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>896160ec9eb0fdb1c019f698b39fa0923c9a316c</Sha>
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25375.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand All @@ -161,9 +161,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5dd606bb21208dfc6fd3d9b07ae963a93248483b</Sha>
</Dependency>
<Dependency Name="Roslyn.Diagnostics.Analyzers" Version="5.3.0-2.26057.107">
<Dependency Name="Roslyn.Diagnostics.Analyzers" Version="5.4.0-2.26060.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>896160ec9eb0fdb1c019f698b39fa0923c9a316c</Sha>
<Sha>db3b7424251b47d9474dbbe3b4fa7a81fe2915b7</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 1 addition & 3 deletions eng/targets/Settings.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,9 @@
<!--
Analyzers
-->
<ItemGroup>
<PackageReference Include="Roslyn.Diagnostics.Analyzers" PrivateAssets="all" />
</ItemGroup>
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="all" />
<PackageReference Include="Roslyn.Diagnostics.Analyzers" PrivateAssets="all" />
Copy link
Member

@333fred 333fred Jan 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this break the VMR?

Copy link
Member

@333fred 333fred Jan 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dotnet/product-construction can we investigate why this attempted to revert this change? The corresponding locations in the VMR's commit have not been modified in 2 years. I'm extremely concerned that if this is getting overwritten, other fixes and changes may be overridden by the code flow.

Copy link
Member

@davidwengier davidwengier Jan 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jan moved Roslyn.Diagnostics.Analyzers out of this item group, to the unconditioned one, in #81856 but that broke the last VMR flow PR from Roslyn and so he pushed a revert commit to that PR: dotnet/dotnet#4084

Copy link
Member

@333fred 333fred Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, so this is a rare instance of git blame kinda lying to me. Thanks.

<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" PrivateAssets="all" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...eServer/Protocol/Features/EditAndContinue/EditAndContinueDiagnosticSource_OpenDocument.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

Expand Down