Skip to content

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

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
davidwengier merged 2 commits into from
Jan 16, 2026
Merged

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

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
9f4d363
Backflow from https://github.com/dotnet/dotnet / bac6980 build 297491
dotnet-maestro[bot] Jan 16, 2026
f332dda
Update dependencies
dotnet-maestro[bot] Jan 16, 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
30 changes: 5 additions & 25 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,31 +72,11 @@
There are effectively three modes that are needed for our source build TFMs and this is where
we calculate them
-->
<Choose>
<!--
1. CI source build leg: this needs to build the current and previous source build TFM. Both are
necessary as the output of this leg is used in other CI source build legs. Those could be
targeting NetCurrent or NetPrevious hence we must produce both.
-->
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildFromVMR)' != 'true'">
<PropertyGroup>
<NetVS>$(NetCurrent)</NetVS>
<NetVSCode>$(NetCurrent)</NetVSCode>
<NetVSAndVSCode>$(NetVS);$(NetVSCode);$(NetPrevious)</NetVSAndVSCode>
</PropertyGroup>
</When>

<!--
2. Source build the product: this is the all up build of the product which needs only NetCurrent
-->
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildFromVMR)' == 'true'">
<PropertyGroup>
<NetVS>$(NetCurrent)</NetVS>
<NetVSCode>$(NetCurrent)</NetVSCode>
<NetVSAndVSCode>$(NetVS);$(NetVSCode)</NetVSAndVSCode>
</PropertyGroup>
</When>
</Choose>
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
<NetVS>$(NetCurrent)</NetVS>
<NetVSCode>$(NetCurrent)</NetVSCode>
<NetVSAndVSCode>$(NetVS);$(NetVSCode)</NetVSAndVSCode>
</PropertyGroup>

<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)eng\BannedSymbols.txt" />
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ This file should be imported by eng/Versions.props
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.3.0-2.25630.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.3.0-2.25630.5</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25630.5</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion>5.3.0-2.25630.5</MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion>
<MicrosoftVisualStudioExtensibilityTestingSourceGeneratorPackageVersion>5.3.0-2.25630.5</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorPackageVersion>
<MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion>5.3.0-2.25630.5</MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.3.0-2.25630.5</MicrosoftVisualStudioLanguageServicesPackageVersion>
<RoslynDiagnosticsAnalyzersPackageVersion>5.3.0-2.25630.5</RoslynDiagnosticsAnalyzersPackageVersion>
<!-- dotnet/arcade dependencies -->
Expand Down Expand Up @@ -61,8 +61,8 @@ This file should be imported by eng/Versions.props
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkVersion>$(MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion)</MicrosoftCommonLanguageServerProtocolFrameworkVersion>
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
<MicrosoftVisualStudioExtensibilityTestingXunitVersion>$(MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion)</MicrosoftVisualStudioExtensibilityTestingXunitVersion>
<MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>$(MicrosoftVisualStudioExtensibilityTestingSourceGeneratorPackageVersion)</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>
<MicrosoftVisualStudioExtensibilityTestingXunitVersion>$(MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion)</MicrosoftVisualStudioExtensibilityTestingXunitVersion>
<MicrosoftVisualStudioLanguageServicesVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</MicrosoftVisualStudioLanguageServicesVersion>
<RoslynDiagnosticsAnalyzersVersion>$(RoslynDiagnosticsAnalyzersPackageVersion)</RoslynDiagnosticsAnalyzersVersion>
<!-- dotnet/arcade dependencies -->
Expand Down
10 changes: 5 additions & 5 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="5a69737e6f6447fe397d552503a3909ea49f6f34" BarId="293565" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="bac69806be267e5c3fbd02ea60d69f6bdc0356ae" BarId="297491" />
<ProductDependencies>
<Dependency Name="Roslyn.Diagnostics.Analyzers" Version="5.3.0-2.25630.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down Expand Up @@ -63,12 +63,12 @@
<Sha>635d2b812121ef9fafe0de223b09be64e5a4a291</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.Extensibility.Testing.Xunit" Version="5.3.0-2.25630.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>635d2b812121ef9fafe0de223b09be64e5a4a291</Sha>
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>635d2b812121ef9fafe0de223b09be64e5a4a291</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator" Version="5.3.0-2.25630.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>635d2b812121ef9fafe0de223b09be64e5a4a291</Sha>
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>635d2b812121ef9fafe0de223b09be64e5a4a291</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.3.0-2.25630.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
1 change: 0 additions & 1 deletion ...zor/src/Microsoft.VisualStudioCode.RazorExtension/Services/IncompatibleProjectNotifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;
using System.Linq;
Expand Down
Loading