Skip to content

Commit ff0bd7c

Browse files
hoyosjshoyosjs
authored
Revert "[main] Update dependencies from dotnet/roslyn (#81164)"
This reverts commit bbbc73e.
1 parent ec2859d commit ff0bd7c

File tree

11 files changed

+13
-30
lines changed

11 files changed

+13
-30
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -324,17 +324,17 @@
324324
<Uri>https://github.com/dotnet/runtime-assets</Uri>
325325
<Sha>3a8fb28f12af0c2c0b9eace35afafd689437c39e</Sha>
326326
</Dependency>
327-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-2.23120.1">
327+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-1.23073.4">
328328
<Uri>https://github.com/dotnet/roslyn</Uri>
329-
<Sha>4190056e0126f206c64439275fbf43a54dd31067</Sha>
329+
<Sha>6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1</Sha>
330330
</Dependency>
331-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.6.0-2.23120.1">
331+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.6.0-1.23073.4">
332332
<Uri>https://github.com/dotnet/roslyn</Uri>
333-
<Sha>4190056e0126f206c64439275fbf43a54dd31067</Sha>
333+
<Sha>6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1</Sha>
334334
</Dependency>
335-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-2.23120.1">
335+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-1.23073.4">
336336
<Uri>https://github.com/dotnet/roslyn</Uri>
337-
<Sha>4190056e0126f206c64439275fbf43a54dd31067</Sha>
337+
<Sha>6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1</Sha>
338338
</Dependency>
339339
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.3.5-beta1.23117.2">
340340
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
4141
they do not break the local dev experience.
4242
-->
43-
<MicrosoftCodeAnalysisCSharpVersion>4.6.0-2.23120.1</MicrosoftCodeAnalysisCSharpVersion>
44-
<MicrosoftCodeAnalysisVersion>4.6.0-2.23120.1</MicrosoftCodeAnalysisVersion>
45-
<MicrosoftNetCompilersToolsetVersion>4.6.0-2.23120.1</MicrosoftNetCompilersToolsetVersion>
43+
<MicrosoftCodeAnalysisCSharpVersion>4.6.0-1.23073.4</MicrosoftCodeAnalysisCSharpVersion>
44+
<MicrosoftCodeAnalysisVersion>4.6.0-1.23073.4</MicrosoftCodeAnalysisVersion>
45+
<MicrosoftNetCompilersToolsetVersion>4.6.0-1.23073.4</MicrosoftNetCompilersToolsetVersion>
4646
</PropertyGroup>
4747
<!--
4848
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.Console/src/System.Console.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@
270270
<Reference Include="Microsoft.Win32.Primitives" />
271271
</ItemGroup>
272272
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'browser'">
273-
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
274273
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
275274
<Reference Include="System.Runtime.InteropServices.JavaScript" />
276275
</ItemGroup>

‎src/libraries/System.Net.Http/src/System.Net.Http.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,6 @@
468468
<Reference Include="System.Security.Cryptography" />
469469
</ItemGroup>
470470
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'browser'">
471-
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
472471
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
473472
<Reference Include="System.Runtime.InteropServices.JavaScript" />
474473
</ItemGroup>

‎src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<Reference Include="System.Memory" />
4545
</ItemGroup>
4646
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'browser'">
47-
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
4847
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
4948
<Reference Include="System.Runtime.InteropServices.JavaScript" />
5049
</ItemGroup>

‎src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181
</ItemGroup>
8282

8383
<ItemGroup>
84-
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
85-
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices.JavaScript\gen\JSImportGenerator\JSImportGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
84+
<ProjectReference Include="..\gen\JSImportGenerator\JSImportGenerator.csproj"
85+
ReferenceOutputAssembly="false"
86+
OutputItemType="Analyzer" />
8687
</ItemGroup>
8788
</Project>

‎src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
55
<Nullable>enable</Nullable>
66
<TestRunRequiresLiveRefPack>true</TestRunRequiresLiveRefPack>
7-
<!--
8-
RS1036: A project containing analyzers or source generators should specify the property '<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>'
9-
The only analyzer defined here is a mock analyzer meant to act similarly to our source generator. It is not shipping and is only used in unit tests.
10-
We don't want to enable the rest of the "good behaving analyzer" API rules on our tests as it is test code and not shipping code.
11-
-->
12-
<NoWarn>$(NoWarn);RS1036</NoWarn>
137
</PropertyGroup>
148

159
<ItemGroup>

‎src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.ParameterMatching.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,6 @@ public async Task TestClassWithDefaultCtorParams()
14311431
JsonTestHelper.AssertJsonEqual(json, await Serializer.SerializeWrapper(obj));
14321432
}
14331433

1434-
#if FIXED // https://github.com/dotnet/roslyn/issues/66900
14351434
[Fact]
14361435
public async Task TestClassWithManyConstructorParameters()
14371436
{
@@ -1442,7 +1441,7 @@ public async Task TestClassWithManyConstructorParameters()
14421441

14431442
Assert.Equal(value, result); // Type is C# record that implements structural equality.
14441443
}
1445-
#endif
1444+
14461445
public class ClassWithDefaultCtorParams
14471446
{
14481447
public Point_2D_Struct_WithAttribute Struct { get; }

‎src/libraries/System.Text.Json/tests/Common/TestClasses/TestClasses.Constructor.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,7 +2392,6 @@ public struct StructWithFourArgs
23922392
public StructWithFourArgs(int w, int x, int y, int z) => (W, X, Y, Z) = (w, x, y, z);
23932393
}
23942394

2395-
#if FIXED // https://github.com/dotnet/roslyn/issues/66900
23962395
public record ClassWithManyConstructorParameters(
23972396
int P000, int P001, int P002, int P003, int P004, int P005, int P006, int P007, int P008, int P009,
23982397
int P010, int P011, int P012, int P013, int P014, int P015, int P016, int P017, int P018, int P019,
@@ -2600,5 +2599,4 @@ public static ClassWithManyConstructorParameters Create()
26002599
P990: 990, P991: 991, P992: 992, P993: 993, P994: 994, P995: 995, P996: 996, P997: 997, P998: 998, P999: 999);
26012600
}
26022601
}
2603-
#endif
26042602
}

‎src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/Serialization/ConstructorTests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,7 @@ protected ConstructorTests_Metadata(JsonSerializerWrapper stringWrapper)
140140
[JsonSerializable(typeof(LargeType_IgnoredProp_Bind_Param))]
141141
[JsonSerializable(typeof(ClassWithIgnoredSameType))]
142142
[JsonSerializable(typeof(ClassWithDefaultCtorParams))]
143-
#if FIXED // https://github.com/dotnet/roslyn/issues/66900
144143
[JsonSerializable(typeof(ClassWithManyConstructorParameters))]
145-
#endif
146144
[JsonSerializable(typeof(ClassWithInvalidArray))]
147145
[JsonSerializable(typeof(ClassWithInvalidDictionary))]
148146
[JsonSerializable(typeof(TypeWithEnumParameters))]
@@ -282,9 +280,7 @@ public ConstructorTests_Default(JsonSerializerWrapper jsonSerializer) : base(jso
282280
[JsonSerializable(typeof(LargeType_IgnoredProp_Bind_Param))]
283281
[JsonSerializable(typeof(ClassWithIgnoredSameType))]
284282
[JsonSerializable(typeof(ClassWithDefaultCtorParams))]
285-
#if FIXED // https://github.com/dotnet/roslyn/issues/66900
286283
[JsonSerializable(typeof(ClassWithManyConstructorParameters))]
287-
#endif
288284
[JsonSerializable(typeof(ClassWithInvalidArray))]
289285
[JsonSerializable(typeof(ClassWithInvalidDictionary))]
290286
[JsonSerializable(typeof(TypeWithEnumParameters))]

‎src/tools/illink/src/ILLink.CodeFix/UnconditionalSuppressMessageCodeFixProvider.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ protected override SyntaxNode[] GetAttributeArguments (ISymbol? attributableSymb
4444
syntaxGenerator.LiteralExpression (diagnostic.Descriptor.Category));
4545

4646
// Identifier of the analysis rule the attribute applies to
47-
#pragma warning disable RS1035 // Do not use APIs banned for analyzers - https://github.com/dotnet/linker/issues/3197
4847
var ruleTitle = diagnostic.Descriptor.Title.ToString (CultureInfo.CurrentUICulture);
49-
#pragma warning restore RS1035 // Do not use APIs banned for analyzers
5048
var ruleId = syntaxGenerator.AttributeArgument (
5149
syntaxGenerator.LiteralExpression (
5250
string.IsNullOrWhiteSpace (ruleTitle) ? diagnostic.Id : $"{diagnostic.Id}:{ruleTitle}"));

0 commit comments

Comments
 (0)