Skip to content

Commit f505b94

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/9.0-staging] Update dependencies from dotnet/roslyn (#121343)
1 parent 9f0df1c commit f505b94

File tree

10 files changed

+33
-30
lines changed

10 files changed

+33
-30
lines changed

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,18 @@
3535
<UsagePattern IdentityGlob="System.IO.Pipelines/7.0.0" />
3636
<UsagePattern IdentityGlob="System.IO.Pipelines/8.0.*" />
3737
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.0" />
38+
39+
<!-- Dependencies of Roslyn, replaced with live packages during full source build
40+
https://github.com/dotnet/runtime/pull/112937#discussion_r2022951143 -->
41+
<UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/9.0.0" />
42+
<UsagePattern IdentityGlob="System.Collections.Immutable/9.0.0" />
43+
<UsagePattern IdentityGlob="System.Composition/9.0.0" />
44+
<UsagePattern IdentityGlob="System.Composition.AttributedModel/9.0.0" />
45+
<UsagePattern IdentityGlob="System.Composition.Convention/9.0.0" />
46+
<UsagePattern IdentityGlob="System.Composition.Hosting/9.0.0" />
47+
<UsagePattern IdentityGlob="System.Composition.Runtime/9.0.0" />
48+
<UsagePattern IdentityGlob="System.Composition.TypedParts/9.0.0" />
49+
<UsagePattern IdentityGlob="System.IO.Pipelines/9.0.0" />
50+
<UsagePattern IdentityGlob="System.Reflection.Metadata/9.0.0" />
3851
</IgnorePatterns>
3952
</UsageData>

‎eng/Version.Details.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -360,30 +360,30 @@
360360
<Uri>https://github.com/dotnet/runtime-assets</Uri>
361361
<Sha>70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12</Sha>
362362
</Dependency>
363-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25569.8">
363+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.26111.11">
364364
<Uri>https://github.com/dotnet/roslyn</Uri>
365-
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
365+
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
366366
</Dependency>
367-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25569.8">
367+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.26111.11">
368368
<Uri>https://github.com/dotnet/roslyn</Uri>
369-
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
369+
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
370370
</Dependency>
371-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25569.8">
371+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.26111.11">
372372
<Uri>https://github.com/dotnet/roslyn</Uri>
373-
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
373+
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
374374
</Dependency>
375-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.26057.1">
376-
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
377-
<Sha>5ef1abb57ce3df89eae65ecadeb1ddbab323ae05</Sha>
375+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.26111.11">
376+
<Uri>https://github.com/dotnet/roslyn</Uri>
377+
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
378378
</Dependency>
379379
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.26057.1">
380380
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
381381
<Sha>5ef1abb57ce3df89eae65ecadeb1ddbab323ae05</Sha>
382382
</Dependency>
383383
<!-- Intermediate is necessary for source build. -->
384-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25569.8">
384+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.26111.11">
385385
<Uri>https://github.com/dotnet/roslyn</Uri>
386-
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
386+
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
387387
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
388388
</Dependency>
389389
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.109">

‎eng/Versions.props‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,23 @@
2727
<FlagNetStandard1XDependencies Condition="'$(FlagNetStandard1XDependencies)' == ''">true</FlagNetStandard1XDependencies>
2828
<!-- Runtime controls its dependency graph via Traversal projects and doesn't want or need Arcade's ExcludeFrom infrastructure. -->
2929
<DisableArcadeExcludeFromBuildSupport>true</DisableArcadeExcludeFromBuildSupport>
30-
<!-- Use SDK compilers in full VMR builds. -->
31-
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildOrchestrator)' != 'true'">true</UsingToolMicrosoftNetCompilers>
3230
</PropertyGroup>
3331
<ItemGroup>
3432
<WorkloadSdkBandVersions Include="$(SdkBandVersion)" SupportsMachineArch="true" />
3533
</ItemGroup>
3634
<PropertyGroup>
3735
<!-- dotnet/roslyn-analyzers dependencies -->
38-
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.26057.1</MicrosoftCodeAnalysisAnalyzersVersion>
39-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.26057.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
36+
<MicrosoftCodeAnalysisAnalyzersVersion>3.12.0-beta1.26111.11</MicrosoftCodeAnalysisAnalyzersVersion>
37+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25615.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
4038
<!-- dotnet/roslyn dependencies -->
4139
<!--
4240
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.
4341
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
4442
they do not break the local dev experience.
4543
-->
46-
<MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.25569.8</MicrosoftCodeAnalysisCSharpVersion>
47-
<MicrosoftCodeAnalysisVersion>4.12.0-3.25569.8</MicrosoftCodeAnalysisVersion>
48-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25569.8</MicrosoftNetCompilersToolsetVersion>
44+
<MicrosoftCodeAnalysisCSharpVersion>4.14.0-3.26111.11</MicrosoftCodeAnalysisCSharpVersion>
45+
<MicrosoftCodeAnalysisVersion>4.14.0-3.26111.11</MicrosoftCodeAnalysisVersion>
46+
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.26111.11</MicrosoftNetCompilersToolsetVersion>
4947
</PropertyGroup>
5048
<!--
5149
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.

‎src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulLinearCollectionShapeValidation.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,6 @@ public void FromManaged(ManagedType m, Span<byte> buffer) {}
602602
public void Free() {}
603603
public ReadOnlySpan<byte> GetManagedValuesSource() => default;
604604
public Span<T> GetUnmanagedValuesDestination() => default;
605-
606605
public static int BufferSize
607606
{
608607
get

‎src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatefulValueShapeValidation.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,6 @@ public void FromManaged(ManagedType m, Span<byte> b) {}
382382
public int ToUnmanaged() => default;
383383
384384
public void Free() {}
385-
386385
public static int BufferSize
387386
{
388387
get

‎src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessLinearCollectionShapeValidation.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,6 @@ static class MarshallerType<T>
614614
public static ReadOnlySpan<int> GetManagedValuesSource(ManagedType m) => default;
615615
616616
public static Span<T> GetUnmanagedValuesDestination(nint unmanaged, int numElements) => default;
617-
618617
public static int BufferSize
619618
{
620619
get

‎src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CustomMarshallerAttributeFixerTests_StatelessValueShapeValidation.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ class ManagedType {}
363363
static class MarshallerType
364364
{
365365
public static nint ConvertToUnmanaged(ManagedType m, Span<byte> b) => default;
366-
367366
public static int BufferSize
368367
{
369368
get

‎src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ public async Task TopLevelStatements(InvocationType invocationType)
8585
string test = @"using System.Text.RegularExpressions;
8686
var isMatch = [|" + ConstructRegexInvocation(invocationType, pattern: "\"\"") + @"|]" + isMatchInvocation + ";";
8787
string fixedCode = @"using System.Text.RegularExpressions;
88-
var isMatch = MyRegex().IsMatch("""");
89-
90-
partial class Program
88+
var isMatch = MyRegex().IsMatch(""""); partial class Program
9189
{
9290
[GeneratedRegex("""")]
9391
private static partial Regex MyRegex();
@@ -850,9 +848,7 @@ public async Task TopLevelStatements_MultipleSourceFiles()
850848
},
851849
FixedState =
852850
{
853-
Sources = { "public class C { }", @"var r = MyRegex();
854-
855-
partial class Program
851+
Sources = { "public class C { }", @"var r = MyRegex(); partial class Program
856852
{
857853
[System.Text.RegularExpressions.GeneratedRegex("""")]
858854
private static partial System.Text.RegularExpressions.Regex MyRegex();

‎src/tools/illink/test/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.Generator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
9+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" />
1010
</ItemGroup>
1111

1212
</Project>

‎src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedCodeAccessedViaReflection.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static IEnumerable<int> IteratorWithCorrectDataflow ()
6464
}
6565

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

0 commit comments

Comments
 (0)