diff --git a/eng/config/test/Core/InstallTraceListener.cs b/eng/config/test/Core/InstallTraceListener.cs new file mode 100644 index 0000000000000..968c7d0e1a09e --- /dev/null +++ b/eng/config/test/Core/InstallTraceListener.cs @@ -0,0 +1,13 @@ +// + +using System.Runtime.CompilerServices; +using Roslyn.Test.Utilities; + +internal sealed class InitializeTestModule +{ + [ModuleInitializer] + internal static void Initializer() + { + RuntimeHelpers.RunModuleConstructor(typeof(TestBase).Module.ModuleHandle); + } +} diff --git a/src/Workspaces/CSharpTest/Microsoft.CodeAnalysis.CSharp.Workspaces.UnitTests.csproj b/src/Workspaces/CSharpTest/Microsoft.CodeAnalysis.CSharp.Workspaces.UnitTests.csproj index 09ac561e3492c..4a71e48c8a974 100644 --- a/src/Workspaces/CSharpTest/Microsoft.CodeAnalysis.CSharp.Workspaces.UnitTests.csproj +++ b/src/Workspaces/CSharpTest/Microsoft.CodeAnalysis.CSharp.Workspaces.UnitTests.csproj @@ -4,7 +4,7 @@ Library Microsoft.CodeAnalysis.CSharp.UnitTests - net472 + netcoreapp3.1;net472 @@ -25,18 +25,4 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Workspaces/CoreTest/BatchFixAllProviderTests.cs b/src/Workspaces/CoreTest/BatchFixAllProviderTests.cs index 7820ad8cf5f56..df5e4e2323ce4 100644 --- a/src/Workspaces/CoreTest/BatchFixAllProviderTests.cs +++ b/src/Workspaces/CoreTest/BatchFixAllProviderTests.cs @@ -105,11 +105,7 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context) if (_nested) { -#if NETCOREAPP2_0 || NET472 fixes = new List { CodeAction.Create("Container", fixes.ToImmutableArray(), isInlinable: false) }; -#else - throw new NotSupportedException("Nested code actions are not supported on this framework."); -#endif } foreach (var fix in fixes) diff --git a/src/Workspaces/CoreTest/CodeCleanup/ReduceTokenTests.cs b/src/Workspaces/CoreTest/CodeCleanup/ReduceTokenTests.cs index d79c64f68eac0..b41574b0f2e9f 100644 --- a/src/Workspaces/CoreTest/CodeCleanup/ReduceTokenTests.cs +++ b/src/Workspaces/CoreTest/CodeCleanup/ReduceTokenTests.cs @@ -18,6 +18,12 @@ namespace Microsoft.CodeAnalysis.UnitTests.CodeCleanup [UseExportProvider] public class ReduceTokenTests { +#if NETCOREAPP + private static bool IsNetCoreApp => true; +#else + private static bool IsNetCoreApp => false; +#endif + [Fact] [WorkItem(5529, "DevDiv_Projects/Roslyn")] [Trait(Traits.Feature, Traits.Features.ReduceTokens)] @@ -225,23 +231,23 @@ End Sub End Module |]"; - var expected = @" + var expected = $@" Module Program Sub Main(args As String()) ' CATEGORY 2: 8 significant digits ' Dev11 and Roslyn behavior are identical: Always rounded off and pretty listed to <= 9 significant digits Const f_8_1 As Single = 0.14999795F ' Dev11 & Roslyn: 0.14999795F - Const f_8_2 As Single = 0.149997965F ' Dev11 & Roslyn: 0.149997965F + Const f_8_2 As Single = {(IsNetCoreApp ? "0.14999796F" : "0.149997965F")} ' Dev11 & Roslyn: 0.149997965F Const f_8_3 As Single = 0.1499797F ' Dev11 & Roslyn: Unchanged - Const f_8_4 As Single = 1.49997938F ' Dev11 & Roslyn: 1.49997938F - Const f_8_5 As Single = 1.49997973F ' Dev11 & Roslyn: 1.49997973F + Const f_8_4 As Single = {(IsNetCoreApp ? "1.4999794F" : "1.49997938F")} ' Dev11 & Roslyn: 1.49997938F + Const f_8_5 As Single = {(IsNetCoreApp ? "1.4999797F" : "1.49997973F")} ' Dev11 & Roslyn: 1.49997973F - Const f_8_6 As Single = 1499.97937F ' Dev11 & Roslyn: 1499.97937F + Const f_8_6 As Single = {(IsNetCoreApp ? "1499.9794F" : "1499.97937F")} ' Dev11 & Roslyn: 1499.97937F - Const f_8_7 As Single = 1499979.75F ' Dev11 & Roslyn: 1499979.75F + Const f_8_7 As Single = {(IsNetCoreApp ? "1499979.8F" : "1499979.75F")} ' Dev11 & Roslyn: 1499979.75F Const f_8_8 As Single = 14999797.0F ' Dev11 & Roslyn: unchanged @@ -296,23 +302,23 @@ End Sub End Module |]"; - var expected = @" + var expected = $@" Module Program Sub Main(args As String()) ' CATEGORY 2: 8 significant digits ' Dev11 and Roslyn behavior are identical: Always rounded off and pretty listed to <= 9 significant digits Const f_8_1 As Single = 0.14999795! ' Dev11 & Roslyn: 0.14999795F - Const f_8_2 As Single = 0.149997965! ' Dev11 & Roslyn: 0.149997965F + Const f_8_2 As Single = {(IsNetCoreApp ? "0.14999796!" : "0.149997965!")} ' Dev11 & Roslyn: 0.149997965F Const f_8_3 As Single = 0.1499797! ' Dev11 & Roslyn: Unchanged - Const f_8_4 As Single = 1.49997938! ' Dev11 & Roslyn: 1.49997938F - Const f_8_5 As Single = 1.49997973! ' Dev11 & Roslyn: 1.49997973F + Const f_8_4 As Single = {(IsNetCoreApp ? "1.4999794!" : "1.49997938!")} ' Dev11 & Roslyn: 1.49997938F + Const f_8_5 As Single = {(IsNetCoreApp ? "1.4999797!" : "1.49997973!")} ' Dev11 & Roslyn: 1.49997973F - Const f_8_6 As Single = 1499.97937! ' Dev11 & Roslyn: 1499.97937F + Const f_8_6 As Single = {(IsNetCoreApp ? "1499.9794!" : "1499.97937!")} ' Dev11 & Roslyn: 1499.97937F - Const f_8_7 As Single = 1499979.75! ' Dev11 & Roslyn: 1499979.75F + Const f_8_7 As Single = {(IsNetCoreApp ? "1499979.8!" : "1499979.75!")} ' Dev11 & Roslyn: 1499979.75F Const f_8_8 As Single = 14999797.0! ' Dev11 & Roslyn: unchanged @@ -379,24 +385,24 @@ End Sub End Module |]"; - var expected = @" + var expected = $@" Module Program Sub Main(args As String()) ' CATEGORY 3: > 8 significant digits ' Dev11 and Roslyn behavior are identical: Always rounded off and pretty listed to <= 9 significant digits ' (a) > 8 significant digits overall, but < 8 digits before decimal point. - Const f_9_1 As Single = 0.149997935F ' Dev11 & Roslyn: 0.149997935F - Const f_9_2 As Single = 0.149997935F ' Dev11 & Roslyn: 0.149997935F - Const f_9_3 As Single = 1.49997962F ' Dev11 & Roslyn: 1.49997962F + Const f_9_1 As Single = {(IsNetCoreApp ? "0.14999793F" : "0.149997935F")} ' Dev11 & Roslyn: 0.149997935F + Const f_9_2 As Single = {(IsNetCoreApp ? "0.14999793F" : "0.149997935F")} ' Dev11 & Roslyn: 0.149997935F + Const f_9_3 As Single = {(IsNetCoreApp ? "1.4999796F" : "1.49997962F")} ' Dev11 & Roslyn: 1.49997962F - Const f_10_1 As Single = 14999.7969F ' Dev11 & Roslyn: 14999.7969F + Const f_10_1 As Single = {(IsNetCoreApp ? "14999.797F" : "14999.7969F")} ' Dev11 & Roslyn: 14999.7969F ' (b) > 8 significant digits before decimal point. - Const f_10_2 As Single = 149997968.0F ' Dev11 & Roslyn: 149997968.0F - Const f_10_3 As Single = 1.49997965E+9F ' Dev11 & Roslyn: 1.49997965E+9F + Const f_10_2 As Single = {(IsNetCoreApp ? "149997970.0F" : "149997968.0F")} ' Dev11 & Roslyn: 149997968.0F + Const f_10_3 As Single = {(IsNetCoreApp ? "1.4999796E+9F" : "1.49997965E+9F")} ' Dev11 & Roslyn: 1.49997965E+9F - Const f_24_1 As Single = 1.11111148E+20F ' Dev11 & Roslyn: 1.11111148E+20F + Const f_24_1 As Single = {(IsNetCoreApp ? "1.1111115E+20F" : "1.11111148E+20F")} ' Dev11 & Roslyn: 1.11111148E+20F ' (c) Overflow/Underflow cases for Single: Ensure no pretty listing/round off ' Holds signed IEEE 32-bit (4-byte) single-precision floating-point numbers ranging in value from -3.4028235E+38 through -1.401298E-45 for negative values and @@ -474,24 +480,24 @@ End Sub End Module |]"; - var expected = @" + var expected = $@" Module Program Sub Main(args As String()) ' CATEGORY 3: > 8 significant digits ' Dev11 and Roslyn behavior are identical: Always rounded off and pretty listed to <= 9 significant digits ' (a) > 8 significant digits overall, but < 8 digits before decimal point. - Const f_9_1 As Single = 0.149997935! ' Dev11 & Roslyn: 0.149997935F - Const f_9_2 As Single = 0.149997935! ' Dev11 & Roslyn: 0.149997935F - Const f_9_3 As Single = 1.49997962! ' Dev11 & Roslyn: 1.49997962F + Const f_9_1 As Single = {(IsNetCoreApp ? "0.14999793!" : "0.149997935!")} ' Dev11 & Roslyn: 0.149997935F + Const f_9_2 As Single = {(IsNetCoreApp ? "0.14999793!" : "0.149997935!")} ' Dev11 & Roslyn: 0.149997935F + Const f_9_3 As Single = {(IsNetCoreApp ? "1.4999796!" : "1.49997962!")} ' Dev11 & Roslyn: 1.49997962F - Const f_10_1 As Single = 14999.7969! ' Dev11 & Roslyn: 14999.7969F + Const f_10_1 As Single = {(IsNetCoreApp ? "14999.797!" : "14999.7969!")} ' Dev11 & Roslyn: 14999.7969F ' (b) > 8 significant digits before decimal point. - Const f_10_2 As Single = 149997968.0! ' Dev11 & Roslyn: 149997968.0F - Const f_10_3 As Single = 1.49997965E+9! ' Dev11 & Roslyn: 1.49997965E+9F + Const f_10_2 As Single = {(IsNetCoreApp ? "149997970.0!" : "149997968.0!")} ' Dev11 & Roslyn: 149997968.0F + Const f_10_3 As Single = {(IsNetCoreApp ? "1.4999796E+9!" : "1.49997965E+9!")} ' Dev11 & Roslyn: 1.49997965E+9F - Const f_24_1 As Single = 1.11111148E+20! ' Dev11 & Roslyn: 1.11111148E+20F + Const f_24_1 As Single = {(IsNetCoreApp ? "1.1111115E+20!" : "1.11111148E+20!")} ' Dev11 & Roslyn: 1.11111148E+20F ' (c) Overflow/Underflow cases for Single: Ensure no pretty listing/round off ' Holds signed IEEE 32-bit (4-byte) single-precision floating-point numbers ranging in value from -3.4028235E+38 through -1.401298E-45 for negative values and @@ -731,25 +737,25 @@ End Sub End Module |]"; - var expected = @" + var expected = $@" Module Program Sub Main(args As String()) ' CATEGORY 2: 16 significant digits ' Dev11 and Roslyn behavior are identical: Always rounded off and pretty listed to <= 17 significant digits Const f_16_1 As Double = 0.1499999999799993 ' Dev11 & Roslyn: 0.1499999999799993 - Const f_16_2 As Double = 0.14999999997999969 ' Dev11 & Roslyn: 0.14999999997999969 + Const f_16_2 As Double = {(IsNetCoreApp ? "0.1499999999799997" : "0.14999999997999969")} ' Dev11 & Roslyn: 0.14999999997999969 Const f_16_3 As Double = 0.149999999799995 ' Dev11 & Roslyn: Unchanged Const f_16_4 As Double = 1.499999999799994 ' Dev11 & Roslyn: Unchanged - Const f_16_5 As Double = 1.4999999997999951 ' Dev11 & Roslyn: 1.4999999997999951 + Const f_16_5 As Double = {(IsNetCoreApp ? "1.499999999799995" : "1.4999999997999951")} ' Dev11 & Roslyn: 1.4999999997999951 Const f_16_6 As Double = 14999999.99799994 ' Dev11 & Roslyn: Unchanged - Const f_16_7 As Double = 14999999.997999949 ' Dev11 & Roslyn: 14999999.997999949 + Const f_16_7 As Double = {(IsNetCoreApp ? "14999999.99799995" : "14999999.997999949")} ' Dev11 & Roslyn: 14999999.997999949 - Const f_16_8 As Double = 149999999997999.19 ' Dev11 & Roslyn: 149999999997999.19 - Const f_16_9 As Double = 149999999997999.81 ' Dev11 & Roslyn: 149999999997999.81 + Const f_16_8 As Double = {(IsNetCoreApp ? "149999999997999.2" : "149999999997999.19")} ' Dev11 & Roslyn: 149999999997999.19 + Const f_16_9 As Double = {(IsNetCoreApp ? "149999999997999.8" : "149999999997999.81")} ' Dev11 & Roslyn: 149999999997999.81 Const f_16_10 As Double = 1499999999979995.0 ' Dev11 & Roslyn: Unchanged @@ -810,25 +816,25 @@ End Sub End Module |]"; - var expected = @" + var expected = $@" Module Program Sub Main(args As String()) ' CATEGORY 2: 16 significant digits ' Dev11 and Roslyn behavior are identical: Always rounded off and pretty listed to <= 17 significant digits Const f_16_1 As Double = 0.1499999999799993R ' Dev11 & Roslyn: 0.1499999999799993 - Const f_16_2 As Double = 0.14999999997999969R ' Dev11 & Roslyn: 0.14999999997999969 + Const f_16_2 As Double = {(IsNetCoreApp ? "0.1499999999799997R" : "0.14999999997999969R")} ' Dev11 & Roslyn: 0.14999999997999969 Const f_16_3 As Double = 0.149999999799995# ' Dev11 & Roslyn: Unchanged Const f_16_4 As Double = 1.499999999799994R ' Dev11 & Roslyn: Unchanged - Const f_16_5 As Double = 1.4999999997999951R ' Dev11 & Roslyn: 1.4999999997999951 + Const f_16_5 As Double = {(IsNetCoreApp ? "1.499999999799995R" : "1.4999999997999951R")} ' Dev11 & Roslyn: 1.4999999997999951 Const f_16_6 As Double = 14999999.99799994# ' Dev11 & Roslyn: Unchanged - Const f_16_7 As Double = 14999999.997999949R ' Dev11 & Roslyn: 14999999.997999949 + Const f_16_7 As Double = {(IsNetCoreApp ? "14999999.99799995R" : "14999999.997999949R")} ' Dev11 & Roslyn: 14999999.997999949 - Const f_16_8 As Double = 149999999997999.19R ' Dev11 & Roslyn: 149999999997999.19 - Const f_16_9 As Double = 149999999997999.81# ' Dev11 & Roslyn: 149999999997999.81 + Const f_16_8 As Double = {(IsNetCoreApp ? "149999999997999.2R" : "149999999997999.19R")} ' Dev11 & Roslyn: 149999999997999.19 + Const f_16_9 As Double = {(IsNetCoreApp ? "149999999997999.8#" : "149999999997999.81#")} ' Dev11 & Roslyn: 149999999997999.81 Const f_16_10 As Double = 1499999999979995.0R ' Dev11 & Roslyn: Unchanged @@ -915,7 +921,7 @@ End Sub End Module |]"; - var expected = @" + var expected = $@" Module Program Sub Main(args As String()) ' CATEGORY 3: > 16 significant digits @@ -927,7 +933,7 @@ Sub Main(args As String()) Const f_17_3 As Double = 0.14999999997999938 ' Dev11 & Roslyn: 0.14999999997999938 Const f_17_4 As Double = 0.1499999997999957 ' Dev11 & Roslyn: Unchanged - Const f_17_5 As Double = 0.14999999979999579 ' Dev11 & Roslyn: 0.14999999979999579 + Const f_17_5 As Double = {(IsNetCoreApp ? "0.1499999997999958" : "0.14999999979999579")} ' Dev11 & Roslyn: 0.14999999979999579 Const f_17_6 As Double = 1.4999999997999947 ' Dev11 & Roslyn: Unchanged Const f_17_7 As Double = 1.4999999997999944 ' Dev11 & Roslyn: 1.4999999997999944 @@ -938,10 +944,10 @@ Sub Main(args As String()) Const f_18_3 As Double = 14999999.997999946 ' Dev11 & Roslyn: 14999999.997999946 ' (b) > 16 significant digits before decimal point. - Const f_18_4 As Double = 1.4999999999734E+16 ' Dev11 & Roslyn: 1.4999999999734E+16 + Const f_18_4 As Double = {(IsNetCoreApp ? "14999999999734000.0" : "1.4999999999734E+16")} ' Dev11 & Roslyn: 1.4999999999734E+16 Const f_18_5 As Double = 14999999999379996.0 ' Dev11 & Roslyn: 14999999999379996.0 - Const f_24_1 As Double = 1.1111114999912469E+20 ' Dev11 & Roslyn: 1.1111114999912469E+20 + Const f_24_1 As Double = {(IsNetCoreApp ? "1.111111499991247E+20" : "1.1111114999912469E+20")} ' Dev11 & Roslyn: 1.1111114999912469E+20 ' (c) Overflow/Underflow cases for Double: Ensure no pretty listing/round off ' Holds signed IEEE 64-bit (8-byte) double-precision floating-point numbers ranging in value from -1.79769313486231570E+308 through -4.94065645841246544E-324 for negative values and @@ -1046,7 +1052,7 @@ End Sub End Module |]"; - var expected = @" + var expected = $@" Module Program Sub Main(args As String()) ' CATEGORY 3: > 16 significant digits @@ -1058,7 +1064,7 @@ Sub Main(args As String()) Const f_17_3 As Double = 0.14999999997999938# ' Dev11 & Roslyn: 0.14999999997999938 Const f_17_4 As Double = 0.1499999997999957R ' Dev11 & Roslyn: Unchanged - Const f_17_5 As Double = 0.14999999979999579R ' Dev11 & Roslyn: 0.14999999979999579 + Const f_17_5 As Double = {(IsNetCoreApp ? "0.1499999997999958R" : "0.14999999979999579R")} ' Dev11 & Roslyn: 0.14999999979999579 Const f_17_6 As Double = 1.4999999997999947# ' Dev11 & Roslyn: Unchanged Const f_17_7 As Double = 1.4999999997999944R ' Dev11 & Roslyn: 1.4999999997999944 @@ -1069,10 +1075,10 @@ Sub Main(args As String()) Const f_18_3 As Double = 14999999.997999946R ' Dev11 & Roslyn: 14999999.997999946 ' (b) > 16 significant digits before decimal point. - Const f_18_4 As Double = 1.4999999999734E+16# ' Dev11 & Roslyn: 1.4999999999734E+16 + Const f_18_4 As Double = {(IsNetCoreApp ? "14999999999734000.0#" : "1.4999999999734E+16#")} ' Dev11 & Roslyn: 1.4999999999734E+16 Const f_18_5 As Double = 14999999999379996.0R ' Dev11 & Roslyn: 14999999999379996.0 - Const f_24_1 As Double = 1.1111114999912469E+20R ' Dev11 & Roslyn: 1.1111114999912469E+20 + Const f_24_1 As Double = {(IsNetCoreApp ? "1.111111499991247E+20R" : "1.1111114999912469E+20R")} ' Dev11 & Roslyn: 1.1111114999912469E+20 ' (c) Overflow/Underflow cases for Double: Ensure no pretty listing/round off ' Holds signed IEEE 64-bit (8-byte) double-precision floating-point numbers ranging in value from -1.79769313486231570E+308 through -4.94065645841246544E-324 for negative values and @@ -1502,7 +1508,7 @@ End Sub End Module |]"; - var expected = @" + var expected = $@" Module Program Sub Main(args As String()) @@ -1530,19 +1536,19 @@ Sub Main(args As String()) Const f_4 As Single = 1.234567E-9F ' Change at -9 Const f_5 As Single = 1.234567E-10F - Const f_6 As Single = 0.00000000123456778F - Const f_7 As Single = 0.000000000123456786F - Const f_8 As Single = 1.23456783E-11F ' Change at -11 - Const f_9 As Single = 1.23456779E-12F + Const f_6 As Single = {(IsNetCoreApp ? "0.0000000012345678F" : "0.00000000123456778F")} + Const f_7 As Single = {(IsNetCoreApp ? "0.00000000012345679F" : "0.000000000123456786F")} + Const f_8 As Single = {(IsNetCoreApp ? "1.2345678E-11F" : "1.23456783E-11F")} ' Change at -11 + Const f_9 As Single = {(IsNetCoreApp ? "1.2345678E-12F" : "1.23456779E-12F")} Const d_1 As Single = 0.00000000000000123456789012345 Const d_2 As Single = 0.000000000000000123456789012345 Const d_3 As Single = 1.23456789012345E-17 ' Change at -17 Const d_4 As Single = 1.23456789012345E-18 - Const d_5 As Double = 0.000000000000000012345678901234561 + Const d_5 As Double = {(IsNetCoreApp ? "0.00000000000000001234567890123456" : "0.000000000000000012345678901234561")} Const d_6 As Double = 0.000000000000000001234567890123456 - Const d_7 As Double = 1.2345678901234561E-19 ' Change at -19 + Const d_7 As Double = {(IsNetCoreApp ? "1.234567890123456E-19" : "1.2345678901234561E-19")} ' Change at -19 Const d_8 As Double = 1.234567890123456E-20 End Sub End Module @@ -1585,7 +1591,7 @@ End Sub End Module |]"; - var expected = @" + var expected = $@" Module Program Sub Main(args As String()) Const f1 As Single = 3.011F ' Dev11 & Roslyn: 3.011F @@ -1595,9 +1601,9 @@ Sub Main(args As String()) Const f5 As Single = 3.0E+13! ' Dev11 & Roslyn: 3.0E+13! Const f6 As Single = 3.0E+13F ' Dev11 & Roslyn: 3.0E+13F Const f7 As Single = 30000.1F ' Dev11 & Roslyn: 30000.1F - Const f8 As Single = 3.00012337E+13! ' Dev11 & Roslyn: 3.00012337E+13! - Const f9 As Single = 3.00012337E+13F ' Dev11 & Roslyn: 3.00012337E+13F - Const f10 As Single = 3000.12354F ' Dev11 & Roslyn: 3000.12354F + Const f8 As Single = {(IsNetCoreApp ? "3.0001234E+13!" : "3.00012337E+13!")} ' Dev11 & Roslyn: 3.00012337E+13! + Const f9 As Single = {(IsNetCoreApp ? "3.0001234E+13F" : "3.00012337E+13F")} ' Dev11 & Roslyn: 3.00012337E+13F + Const f10 As Single = {(IsNetCoreApp ? "3000.1235F" : "3000.12354F")} ' Dev11 & Roslyn: 3000.12354F Const f11 As Single = 0.0000003! ' Dev11 & Roslyn: 0.0000003! Console.WriteLine(f1) @@ -2049,7 +2055,7 @@ private static async Task VerifyAsync(string codeWithMarker, string expectedResu var cleanDocument = await CodeCleaner.CleanupAsync(document, textSpans[0], codeCleanups); - Assert.Equal(expectedResult, (await cleanDocument.GetSyntaxRootAsync()).ToFullString()); + AssertEx.EqualOrDiff(expectedResult, (await cleanDocument.GetSyntaxRootAsync()).ToFullString()); } private static Document CreateDocument(string code, string language) diff --git a/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj b/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj index 397b41952a248..b424acfd40372 100644 --- a/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj +++ b/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj @@ -3,7 +3,7 @@ Library - net472 + netcoreapp3.1;net472 true Microsoft.CodeAnalysis.UnitTests @@ -30,7 +30,6 @@ - diff --git a/src/Workspaces/CoreTest/UtilityTest/ReferenceHolderTests.cs b/src/Workspaces/CoreTest/UtilityTest/ReferenceHolderTests.cs index ed94369ffbc11..1bd834e2c498c 100644 --- a/src/Workspaces/CoreTest/UtilityTest/ReferenceHolderTests.cs +++ b/src/Workspaces/CoreTest/UtilityTest/ReferenceHolderTests.cs @@ -60,7 +60,7 @@ public void ExpiredValueNotEqualToNull() { var strongNull = ReferenceHolder.Strong(null); var weakNull = ReferenceHolder.Weak(null); - var expired = ReferenceHolder.TestAccessor.ReleasedWeak(hashCode: EqualityComparer.Default.GetHashCode(null)); + var expired = ReferenceHolder.TestAccessor.ReleasedWeak(hashCode: EqualityComparer.Default.GetHashCode(null!)); Assert.Equal(strongNull.GetHashCode(), expired.GetHashCode()); VerifyNotEqual(strongNull, expired); diff --git a/src/Workspaces/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Workspaces.UnitTests.vbproj b/src/Workspaces/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Workspaces.UnitTests.vbproj index 6e5c21b242473..d285e182a8b8c 100644 --- a/src/Workspaces/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Workspaces.UnitTests.vbproj +++ b/src/Workspaces/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Workspaces.UnitTests.vbproj @@ -4,8 +4,7 @@ Library Off - Default - net472 + netcoreapp3.1;net472 @@ -27,20 +26,8 @@ - - - - - - - - - - - - \ No newline at end of file