From ff0bd7c844e05e39e47b7668a1564a030b69318d Mon Sep 17 00:00:00 2001
From: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Date: Tue, 21 Feb 2023 22:08:56 -0800
Subject: [PATCH] Revert "[main] Update dependencies from dotnet/roslyn
(#81164)"
This reverts commit bbbc73e0d2db3b8652546ed3f52fc9f07d0ca462.
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 6 +++---
.../System.Console/src/System.Console.csproj | 1 -
.../System.Net.Http/src/System.Net.Http.csproj | 1 -
.../src/System.Net.WebSockets.Client.csproj | 1 -
.../System.Runtime.InteropServices.JavaScript.csproj | 5 +++--
.../LibraryImportGenerator.Unit.Tests.csproj | 6 ------
.../ConstructorTests.ParameterMatching.cs | 3 +--
.../Common/TestClasses/TestClasses.Constructor.cs | 2 --
.../Serialization/ConstructorTests.cs | 4 ----
.../UnconditionalSuppressMessageCodeFixProvider.cs | 2 --
11 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d5f460beb12d4..d57cc4f1cd652 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -324,17 +324,17 @@
https://github.com/dotnet/runtime-assets
3a8fb28f12af0c2c0b9eace35afafd689437c39e
-
+
https://github.com/dotnet/roslyn
- 4190056e0126f206c64439275fbf43a54dd31067
+ 6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1
-
+
https://github.com/dotnet/roslyn
- 4190056e0126f206c64439275fbf43a54dd31067
+ 6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1
-
+
https://github.com/dotnet/roslyn
- 4190056e0126f206c64439275fbf43a54dd31067
+ 6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1
https://github.com/dotnet/roslyn-analyzers
diff --git a/eng/Versions.props b/eng/Versions.props
index e34969a56d9cb..f3141975c8824 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,9 +40,9 @@
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.
-->
- 4.6.0-2.23120.1
- 4.6.0-2.23120.1
- 4.6.0-2.23120.1
+ 4.6.0-1.23073.4
+ 4.6.0-1.23073.4
+ 4.6.0-1.23073.4
- $(NoWarn);RS1036
diff --git a/src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.ParameterMatching.cs b/src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.ParameterMatching.cs
index 7770389075b6e..1199c7acebe0a 100644
--- a/src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.ParameterMatching.cs
+++ b/src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.ParameterMatching.cs
@@ -1431,7 +1431,6 @@ public async Task TestClassWithDefaultCtorParams()
JsonTestHelper.AssertJsonEqual(json, await Serializer.SerializeWrapper(obj));
}
-#if FIXED // https://github.com/dotnet/roslyn/issues/66900
[Fact]
public async Task TestClassWithManyConstructorParameters()
{
@@ -1442,7 +1441,7 @@ public async Task TestClassWithManyConstructorParameters()
Assert.Equal(value, result); // Type is C# record that implements structural equality.
}
-#endif
+
public class ClassWithDefaultCtorParams
{
public Point_2D_Struct_WithAttribute Struct { get; }
diff --git a/src/libraries/System.Text.Json/tests/Common/TestClasses/TestClasses.Constructor.cs b/src/libraries/System.Text.Json/tests/Common/TestClasses/TestClasses.Constructor.cs
index 8f6df2d166749..f4bf80ddef556 100644
--- a/src/libraries/System.Text.Json/tests/Common/TestClasses/TestClasses.Constructor.cs
+++ b/src/libraries/System.Text.Json/tests/Common/TestClasses/TestClasses.Constructor.cs
@@ -2392,7 +2392,6 @@ public struct StructWithFourArgs
public StructWithFourArgs(int w, int x, int y, int z) => (W, X, Y, Z) = (w, x, y, z);
}
-#if FIXED // https://github.com/dotnet/roslyn/issues/66900
public record ClassWithManyConstructorParameters(
int P000, int P001, int P002, int P003, int P004, int P005, int P006, int P007, int P008, int P009,
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()
P990: 990, P991: 991, P992: 992, P993: 993, P994: 994, P995: 995, P996: 996, P997: 997, P998: 998, P999: 999);
}
}
-#endif
}
diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/Serialization/ConstructorTests.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/Serialization/ConstructorTests.cs
index 99c2b0ecf4bcb..b41c9ed4aa12d 100644
--- a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/Serialization/ConstructorTests.cs
+++ b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/Serialization/ConstructorTests.cs
@@ -140,9 +140,7 @@ protected ConstructorTests_Metadata(JsonSerializerWrapper stringWrapper)
[JsonSerializable(typeof(LargeType_IgnoredProp_Bind_Param))]
[JsonSerializable(typeof(ClassWithIgnoredSameType))]
[JsonSerializable(typeof(ClassWithDefaultCtorParams))]
-#if FIXED // https://github.com/dotnet/roslyn/issues/66900
[JsonSerializable(typeof(ClassWithManyConstructorParameters))]
-#endif
[JsonSerializable(typeof(ClassWithInvalidArray))]
[JsonSerializable(typeof(ClassWithInvalidDictionary))]
[JsonSerializable(typeof(TypeWithEnumParameters))]
@@ -282,9 +280,7 @@ public ConstructorTests_Default(JsonSerializerWrapper jsonSerializer) : base(jso
[JsonSerializable(typeof(LargeType_IgnoredProp_Bind_Param))]
[JsonSerializable(typeof(ClassWithIgnoredSameType))]
[JsonSerializable(typeof(ClassWithDefaultCtorParams))]
-#if FIXED // https://github.com/dotnet/roslyn/issues/66900
[JsonSerializable(typeof(ClassWithManyConstructorParameters))]
-#endif
[JsonSerializable(typeof(ClassWithInvalidArray))]
[JsonSerializable(typeof(ClassWithInvalidDictionary))]
[JsonSerializable(typeof(TypeWithEnumParameters))]
diff --git a/src/tools/illink/src/ILLink.CodeFix/UnconditionalSuppressMessageCodeFixProvider.cs b/src/tools/illink/src/ILLink.CodeFix/UnconditionalSuppressMessageCodeFixProvider.cs
index 2fd1b81a604c4..c40aeba0f8a67 100644
--- a/src/tools/illink/src/ILLink.CodeFix/UnconditionalSuppressMessageCodeFixProvider.cs
+++ b/src/tools/illink/src/ILLink.CodeFix/UnconditionalSuppressMessageCodeFixProvider.cs
@@ -44,9 +44,7 @@ protected override SyntaxNode[] GetAttributeArguments (ISymbol? attributableSymb
syntaxGenerator.LiteralExpression (diagnostic.Descriptor.Category));
// Identifier of the analysis rule the attribute applies to
-#pragma warning disable RS1035 // Do not use APIs banned for analyzers - https://github.com/dotnet/linker/issues/3197
var ruleTitle = diagnostic.Descriptor.Title.ToString (CultureInfo.CurrentUICulture);
-#pragma warning restore RS1035 // Do not use APIs banned for analyzers
var ruleId = syntaxGenerator.AttributeArgument (
syntaxGenerator.LiteralExpression (
string.IsNullOrWhiteSpace (ruleTitle) ? diagnostic.Id : $"{diagnostic.Id}:{ruleTitle}"));