Skip to content

Revert "[release/9.0-staging] Update dependencies from dotnet/roslyn … #125679

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
jozkee merged 1 commit into from
Mar 18, 2026
+30 −33
Merged

Revert "[release/9.0-staging] Update dependencies from dotnet/roslyn … #125679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,5 @@
<UsagePattern IdentityGlob="System.IO.Pipelines/7.0.0" />
<UsagePattern IdentityGlob="System.IO.Pipelines/8.0.*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.0" />

<!-- Dependencies of Roslyn, replaced with live packages during full source build
https://github.com/dotnet/runtime/pull/112937#discussion_r2022951143 -->
<UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/9.0.0" />
<UsagePattern IdentityGlob="System.Collections.Immutable/9.0.0" />
<UsagePattern IdentityGlob="System.Composition/9.0.0" />
<UsagePattern IdentityGlob="System.Composition.AttributedModel/9.0.0" />
<UsagePattern IdentityGlob="System.Composition.Convention/9.0.0" />
<UsagePattern IdentityGlob="System.Composition.Hosting/9.0.0" />
<UsagePattern IdentityGlob="System.Composition.Runtime/9.0.0" />
<UsagePattern IdentityGlob="System.Composition.TypedParts/9.0.0" />
<UsagePattern IdentityGlob="System.IO.Pipelines/9.0.0" />
<UsagePattern IdentityGlob="System.Reflection.Metadata/9.0.0" />
</IgnorePatterns>
</UsageData>
22 changes: 11 additions & 11 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,30 +360,30 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.26111.11">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25569.8">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.26111.11">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25569.8">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.26111.11">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25569.8">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.26111.11">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.26057.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>5ef1abb57ce3df89eae65ecadeb1ddbab323ae05</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.26057.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>5ef1abb57ce3df89eae65ecadeb1ddbab323ae05</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.26111.11">
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25569.8">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.109">
Expand Down
12 changes: 7 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,25 @@
<FlagNetStandard1XDependencies Condition="'$(FlagNetStandard1XDependencies)' == ''">true</FlagNetStandard1XDependencies>
<!-- Runtime controls its dependency graph via Traversal projects and doesn't want or need Arcade's ExcludeFrom infrastructure. -->
<DisableArcadeExcludeFromBuildSupport>true</DisableArcadeExcludeFromBuildSupport>
<!-- Use SDK compilers in full VMR builds. -->
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildOrchestrator)' != 'true'">true</UsingToolMicrosoftNetCompilers>
</PropertyGroup>
<ItemGroup>
<WorkloadSdkBandVersions Include="$(SdkBandVersion)" SupportsMachineArch="true" />
</ItemGroup>
<PropertyGroup>
<!-- dotnet/roslyn-analyzers dependencies -->
<MicrosoftCodeAnalysisAnalyzersVersion>3.12.0-beta1.26111.11</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25615.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.26057.1</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.26057.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!-- dotnet/roslyn dependencies -->
<!--
These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
they do not break the local dev experience.
-->
<MicrosoftCodeAnalysisCSharpVersion>4.14.0-3.26111.11</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.14.0-3.26111.11</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.26111.11</MicrosoftNetCompilersToolsetVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.25569.8</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.12.0-3.25569.8</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25569.8</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<!--
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
Expand Down
1 change: 1 addition & 0 deletions ....UnitTests/CustomMarshallerAttributeFixerTests_StatefulLinearCollectionShapeValidation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,7 @@ public void FromManaged(ManagedType m, Span<byte> buffer) {}
public void Free() {}
public ReadOnlySpan<byte> GetManagedValuesSource() => default;
public Span<T> GetUnmanagedValuesDestination() => default;
public static int BufferSize
{
get
Expand Down
1 change: 1 addition & 0 deletions ...rtGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulValueShapeValidation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ public void FromManaged(ManagedType m, Span<byte> b) {}
public int ToUnmanaged() => default;

public void Free() {}

public static int BufferSize
{
get
Expand Down
1 change: 1 addition & 0 deletions ...UnitTests/CustomMarshallerAttributeFixerTests_StatelessLinearCollectionShapeValidation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,7 @@ static class MarshallerType<T>
public static ReadOnlySpan<int> GetManagedValuesSource(ManagedType m) => default;
public static Span<T> GetUnmanagedValuesDestination(nint unmanaged, int numElements) => default;
public static int BufferSize
{
get
Expand Down
1 change: 1 addition & 0 deletions ...tGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessValueShapeValidation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ class ManagedType {}
static class MarshallerType
{
public static nint ConvertToUnmanaged(ManagedType m, Span<byte> b) => default;

public static int BufferSize
{
get
Expand Down
8 changes: 6 additions & 2 deletions ...tem.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ public async Task TopLevelStatements(InvocationType invocationType)
string test = @"using System.Text.RegularExpressions;
var isMatch = [|" + ConstructRegexInvocation(invocationType, pattern: "\"\"") + @"|]" + isMatchInvocation + ";";
string fixedCode = @"using System.Text.RegularExpressions;
var isMatch = MyRegex().IsMatch(""""); partial class Program
var isMatch = MyRegex().IsMatch("""");

partial class Program
{
[GeneratedRegex("""")]
private static partial Regex MyRegex();
Expand Down Expand Up @@ -848,7 +850,9 @@ public async Task TopLevelStatements_MultipleSourceFiles()
},
FixedState =
{
Sources = { "public class C { }", @"var r = MyRegex(); partial class Program
Sources = { "public class C { }", @"var r = MyRegex();

partial class Program
{
[System.Text.RegularExpressions.GeneratedRegex("""")]
private static partial System.Text.RegularExpressions.Regex MyRegex();
Expand Down
2 changes: 1 addition & 1 deletion ...k/test/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.Generator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...llink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedCodeAccessedViaReflection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static IEnumerable<int> IteratorWithCorrectDataflow ()
}

// Using C# 14 compiler changes codegen in a way that introduces this warning
[UnexpectedWarning("IL2062", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/runtime/issues/110553", CompilerGeneratedCode = true)]
// [UnexpectedWarning("IL2062", Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/runtime/issues/110553", CompilerGeneratedCode = true)]
public static IEnumerable<int> IteratorWithIntegerDataflow ()
{
int integerLocal = 0;
Expand Down
Loading