diff --git a/Roslyn.sln b/Roslyn.sln index b90c9e295369f..475b330043b1c 100644 --- a/Roslyn.sln +++ b/Roslyn.sln @@ -220,20 +220,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Tasks.CodeA EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BasicResultProvider", "src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.shproj", "{3140FE61-0856-4367-9AA3-8081B9A80E35}" EndProject -Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "BasicResultProvider.NetFX20", "src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\NetFX20\BasicResultProvider.NetFX20.vbproj", "{76242A2D-2600-49DD-8C15-FEA07ECB1842}" -EndProject Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Microsoft.CodeAnalysis.VisualBasic.ResultProvider", "src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\Portable\Microsoft.CodeAnalysis.VisualBasic.ResultProvider.vbproj", "{76242A2D-2600-49DD-8C15-FEA07ECB1843}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CSharpResultProvider", "src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.shproj", "{3140FE61-0856-4367-9AA3-8081B9A80E36}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpResultProvider.NetFX20", "src\ExpressionEvaluator\CSharp\Source\ResultProvider\NetFX20\CSharpResultProvider.NetFX20.csproj", "{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.CSharp.ResultProvider", "src\ExpressionEvaluator\CSharp\Source\ResultProvider\Portable\Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj", "{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ResultProvider", "src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.shproj", "{BB3CA047-5D00-48D4-B7D3-233C1265C065}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResultProvider.NetFX20", "src\ExpressionEvaluator\Core\Source\ResultProvider\NetFX20\ResultProvider.NetFX20.csproj", "{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ResultProvider", "src\ExpressionEvaluator\Core\Source\ResultProvider\Portable\Microsoft.CodeAnalysis.ResultProvider.csproj", "{FA0E905D-EC46-466D-B7B2-3B5557F9428C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vbc", "src\Compilers\VisualBasic\vbc\vbc.csproj", "{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}" @@ -540,7 +534,6 @@ Global src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5ff1e493-69cc-4d0b-83f2-039f469a04e1}*SharedItemsImports = 5 src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{60db272a-21c9-4e8d-9803-ff4e132392c8}*SharedItemsImports = 5 src\Workspaces\SharedUtilitiesAndExtensions\Compiler\CSharp\CSharpCompilerExtensions.projitems*{699fea05-aea7-403d-827e-53cf4e826955}*SharedItemsImports = 13 - src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{76242a2d-2600-49dd-8c15-fea07ecb1842}*SharedItemsImports = 5 src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{76242a2d-2600-49dd-8c15-fea07ecb1843}*SharedItemsImports = 5 src\Analyzers\Core\Analyzers\Analyzers.projitems*{76e96966-4780-4040-8197-bde2879516f4}*SharedItemsImports = 13 src\Compilers\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 5 @@ -562,8 +555,6 @@ Global src\Compilers\Core\CommandLine\CommandLine.projitems*{ad6f474e-e6d4-4217-91f3-b7af1be31ccc}*SharedItemsImports = 13 src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 5 src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{bb3ca047-5d00-48d4-b7d3-233c1265c065}*SharedItemsImports = 13 - src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{bedc5a4a-809e-4017-9cfd-6c8d4e1847f0}*SharedItemsImports = 5 - src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d3}*SharedItemsImports = 5 src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d4}*SharedItemsImports = 5 src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13 src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{cec0dce7-8d52-45c3-9295-fc7b16bd2451}*SharedItemsImports = 13 @@ -912,26 +903,14 @@ Global {1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Release|Any CPU.ActiveCfg = Release|Any CPU {1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Release|Any CPU.Build.0 = Release|Any CPU - {76242A2D-2600-49DD-8C15-FEA07ECB1842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76242A2D-2600-49DD-8C15-FEA07ECB1842}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76242A2D-2600-49DD-8C15-FEA07ECB1842}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76242A2D-2600-49DD-8C15-FEA07ECB1842}.Release|Any CPU.Build.0 = Release|Any CPU {76242A2D-2600-49DD-8C15-FEA07ECB1843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76242A2D-2600-49DD-8C15-FEA07ECB1843}.Debug|Any CPU.Build.0 = Debug|Any CPU {76242A2D-2600-49DD-8C15-FEA07ECB1843}.Release|Any CPU.ActiveCfg = Release|Any CPU {76242A2D-2600-49DD-8C15-FEA07ECB1843}.Release|Any CPU.Build.0 = Release|Any CPU - {BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}.Release|Any CPU.Build.0 = Release|Any CPU {BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Debug|Any CPU.Build.0 = Debug|Any CPU {BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}.Release|Any CPU.Build.0 = Release|Any CPU - {BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}.Release|Any CPU.Build.0 = Release|Any CPU {FA0E905D-EC46-466D-B7B2-3B5557F9428C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FA0E905D-EC46-466D-B7B2-3B5557F9428C}.Debug|Any CPU.Build.0 = Debug|Any CPU {FA0E905D-EC46-466D-B7B2-3B5557F9428C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1400,13 +1379,10 @@ Global {FCFA8808-A1B6-48CC-A1EA-0B8CA8AEDA8E} = {32A48625-F0AD-419D-828B-A50BDABA38EA} {1DFEA9C5-973C-4179-9B1B-0F32288E1EF2} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} {3140FE61-0856-4367-9AA3-8081B9A80E35} = {151F6994-AEB3-4B12-B746-2ACFF26C7BBB} - {76242A2D-2600-49DD-8C15-FEA07ECB1842} = {151F6994-AEB3-4B12-B746-2ACFF26C7BBB} {76242A2D-2600-49DD-8C15-FEA07ECB1843} = {151F6994-AEB3-4B12-B746-2ACFF26C7BBB} {3140FE61-0856-4367-9AA3-8081B9A80E36} = {913A4C08-898E-49C7-9692-0EF9DC56CF6E} - {BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3} = {913A4C08-898E-49C7-9692-0EF9DC56CF6E} {BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4} = {913A4C08-898E-49C7-9692-0EF9DC56CF6E} {BB3CA047-5D00-48D4-B7D3-233C1265C065} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6} - {BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6} {FA0E905D-EC46-466D-B7B2-3B5557F9428C} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6} {E58EE9D7-1239-4961-A0C1-F9EC3952C4C1} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37} {6FD1CC3E-6A99-4736-9B8D-757992DDE75D} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05} diff --git a/eng/Versions.props b/eng/Versions.props index 06c66a342b9d4..935eaa1113fd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,6 @@ 1.0.0 1.0.1 1.1.0 - 1.0.3 1.0.0 2.0.0-alpha-20170405-2 0.1.0 diff --git a/eng/targets/Imports.targets b/eng/targets/Imports.targets index 8be4ad28b3138..9645e7e596491 100644 --- a/eng/targets/Imports.targets +++ b/eng/targets/Imports.targets @@ -64,25 +64,6 @@ $(NoWarn);Nullable - - <_ExplicitReference Include="$(FrameworkPathOverride)\mscorlib.dll" /> - - - - - false - true - false - CurrentRuntime - - - true - - diff --git a/eng/targets/Settings.props b/eng/targets/Settings.props index b422825f395e9..043251f4afb09 100644 --- a/eng/targets/Settings.props +++ b/eng/targets/Settings.props @@ -183,8 +183,6 @@ - - diff --git a/src/Compilers/Core/Portable/CaseInsensitiveComparison.cs b/src/Compilers/Core/Portable/CaseInsensitiveComparison.cs index 865c51408aaf7..406fd8b909efc 100644 --- a/src/Compilers/Core/Portable/CaseInsensitiveComparison.cs +++ b/src/Compilers/Core/Portable/CaseInsensitiveComparison.cs @@ -117,7 +117,6 @@ public override int Compare(string? str1, string? str2) return str1.Length - str2.Length; } -#if !NET20 public int Compare(ReadOnlySpan str1, ReadOnlySpan str2) { int len = Math.Min(str1.Length, str2.Length); @@ -133,7 +132,6 @@ public int Compare(ReadOnlySpan str1, ReadOnlySpan str2) // return the smaller string, or 0 if they are equal in length return str1.Length - str2.Length; } -#endif private static bool AreEqualLowerUnicode(char c1, char c2) { @@ -168,7 +166,6 @@ public override bool Equals(string? str1, string? str2) return true; } -#if !NET20 public bool Equals(ReadOnlySpan str1, ReadOnlySpan str2) { if (str1.Length != str2.Length) @@ -186,7 +183,6 @@ public bool Equals(ReadOnlySpan str1, ReadOnlySpan str2) return true; } -#endif public static bool EndsWith(string value, string possibleEnd) { @@ -293,7 +289,6 @@ public override int GetHashCode(string str) /// public static bool Equals(string left, string right) => s_comparer.Equals(left, right); -#if !NET20 /// /// Determines if two strings are equal according to Unicode rules for case-insensitive /// identifier comparison (lower-case mapping). @@ -305,7 +300,6 @@ public override int GetHashCode(string str) /// These are also the rules used for VB identifier comparison. /// public static bool Equals(ReadOnlySpan left, ReadOnlySpan right) => s_comparer.Equals(left, right); -#endif /// /// Determines if the string 'value' end with string 'possibleEnd'. @@ -335,7 +329,6 @@ public override int GetHashCode(string str) /// public static int Compare(string left, string right) => s_comparer.Compare(left, right); -#if !NET20 /// /// Compares two strings according to the Unicode rules for case-insensitive /// identifier comparison (lower-case mapping). @@ -347,7 +340,6 @@ public override int GetHashCode(string str) /// These are also the rules used for VB identifier comparison. /// public static int Compare(ReadOnlySpan left, ReadOnlySpan right) => s_comparer.Compare(left, right); -#endif /// /// Gets a case-insensitive hash code for Unicode identifiers. diff --git a/src/Compilers/Core/Portable/DiaSymReader/SymUnmanagedFactory.cs b/src/Compilers/Core/Portable/DiaSymReader/SymUnmanagedFactory.cs index 583a06894dbc4..8e5e428a6cac2 100644 --- a/src/Compilers/Core/Portable/DiaSymReader/SymUnmanagedFactory.cs +++ b/src/Compilers/Core/Portable/DiaSymReader/SymUnmanagedFactory.cs @@ -60,7 +60,6 @@ internal static string DiaSymReaderModuleName private delegate void NativeFactory(ref Guid id, [MarshalAs(UnmanagedType.IUnknown)] out object instance); -#if !NET20 private static readonly Lazy> s_lazyGetEnvironmentVariable = new Lazy>(() => { try @@ -80,18 +79,13 @@ internal static string DiaSymReaderModuleName return null; }); -#endif // internal for testing internal static string GetEnvironmentVariable(string name) { try { -#if NET20 - return Environment.GetEnvironmentVariable(name); -#else return s_lazyGetEnvironmentVariable.Value?.Invoke(name); -#endif } catch { @@ -122,7 +116,7 @@ private static object TryLoadFromAlternativePath(Guid clsid, string factoryName) Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error()); } -#if NET20 || NETSTANDARD1_1 +#if NETSTANDARD1_1 var creator = (NativeFactory)Marshal.GetDelegateForFunctionPointer(createAddress, typeof(NativeFactory)); #else var creator = Marshal.GetDelegateForFunctionPointer(createAddress); @@ -144,11 +138,7 @@ private static Type GetComTypeType(ref Type lazyType, Guid clsid) { if (lazyType == null) { -#if NET20 - lazyType = Type.GetTypeFromCLSID(clsid); -#else lazyType = Marshal.GetTypeFromCLSID(clsid); -#endif } return lazyType; diff --git a/src/Compilers/Core/Portable/InternalUtilities/Debug.cs b/src/Compilers/Core/Portable/InternalUtilities/Debug.cs index d56abfaf0631b..d2833310c6f51 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/Debug.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/Debug.cs @@ -38,7 +38,7 @@ public static void AssertNotNull([NotNull] T value) [Conditional("DEBUG")] internal static void AssertOrFailFast([DoesNotReturnIf(false)] bool condition, string? message = null) { -#if NET20 || NETSTANDARD1_3 +#if NETSTANDARD1_3 Debug.Assert(condition); #else if (!condition) diff --git a/src/Compilers/Core/Portable/InternalUtilities/FailFast.cs b/src/Compilers/Core/Portable/InternalUtilities/FailFast.cs index b53cf5cea8948..5947d753111a6 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/FailFast.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/FailFast.cs @@ -31,14 +31,12 @@ internal static void OnFatalException(Exception exception) Debugger.Break(); } -#if !NET20 // don't fail fast with an aggregate exception that is masking true exception if (exception is AggregateException aggregate && aggregate.InnerExceptions.Count == 1) { exception = aggregate.InnerExceptions[0]; } -#endif DumpStackTrace(exception: exception); Environment.FailFast(exception.ToString(), exception); @@ -78,11 +76,9 @@ internal static void DumpStackTrace(Exception? exception = null, string? message } } -#if !NET20 Console.WriteLine("Stack trace of handler"); var stackTrace = new StackTrace(); Console.WriteLine(stackTrace.ToString()); -#endif Console.Out.Flush(); } diff --git a/src/Compilers/Core/Portable/InternalUtilities/FatalError.cs b/src/Compilers/Core/Portable/InternalUtilities/FatalError.cs index af766990930ed..2f3390cc0cd62 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/FatalError.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/FatalError.cs @@ -9,11 +9,6 @@ using System.Threading; using Roslyn.Utilities; -#if NET20 -// Some APIs referenced by documentation comments are not available on .NET Framework 2.0. -#pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved -#endif - namespace Microsoft.CodeAnalysis.ErrorReporting { internal static class FatalError @@ -57,11 +52,6 @@ public static void OverwriteHandler(ErrorReporterHandler? value) s_handler = value; } - // In the result provider, we aren't copying our handler to somewhere else, so we don't - // need this method. It's too much of a challenge to shared code to work in - // old versions of the runtime since APIs changed over time. -#if !NET20 - /// /// Copies the handler in this instance to the linked copy of this type in this other assembly. /// @@ -85,8 +75,6 @@ public static void CopyHandlerTo(Assembly assembly) } } -#endif - /// /// Use in an exception filter to report an error without catching the exception. /// The error is reported by calling . @@ -241,12 +229,10 @@ private static void Report(Exception exception, ErrorSeverity severity = ErrorSe return; } -#if !NET20 if (exception is AggregateException aggregate && aggregate.InnerExceptions.Count == 1 && aggregate.InnerExceptions[0].Data[s_reportedMarker] != null) { return; } -#endif if (!exception.Data.IsReadOnly) { diff --git a/src/Compilers/Core/Portable/InternalUtilities/RoslynString.cs b/src/Compilers/Core/Portable/InternalUtilities/RoslynString.cs index e0a485898b521..f722791434fc2 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/RoslynString.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/RoslynString.cs @@ -12,10 +12,8 @@ internal static class RoslynString public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] string? value) => string.IsNullOrEmpty(value); -#if !NET20 /// public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] string? value) => string.IsNullOrWhiteSpace(value); -#endif } } diff --git a/src/Dependencies/PooledObjects/ObjectPool`1.cs b/src/Dependencies/PooledObjects/ObjectPool`1.cs index 8e99345c053ea..d9dca9dfb14f8 100644 --- a/src/Dependencies/PooledObjects/ObjectPool`1.cs +++ b/src/Dependencies/PooledObjects/ObjectPool`1.cs @@ -22,10 +22,6 @@ namespace Microsoft.CodeAnalysis.PooledObjects { -#if NET20 - internal delegate TReturn Func(TArg arg); -#endif - /// /// Generic implementation of object pooling pattern with predefined pool size limit. The main /// purpose is that limited number of frequently used objects can be kept in the pool for diff --git a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/AssemblyInfo.cs b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/AssemblyInfo.cs deleted file mode 100644 index 8aa94524789fc..0000000000000 --- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/AssemblyInfo.cs +++ /dev/null @@ -1,7 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -#nullable disable - -[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v2.0")] diff --git a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/CSharpResultProvider.NetFX20.csproj b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/CSharpResultProvider.NetFX20.csproj deleted file mode 100644 index 86a726ea33c7a..0000000000000 --- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/CSharpResultProvider.NetFX20.csproj +++ /dev/null @@ -1,42 +0,0 @@ - - - - - Library - Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator - Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider - net20 - true - full - - - - Compiler\Parser\RoslynString.cs - - - Compiler\Parser\UnicodeCharacterUtilities.cs - - - Compiler\Parser\CharacterInfo.cs - - - Compiler\Syntax\SyntaxKind.cs - - - Compiler\Syntax\SyntaxKindFacts.cs - - - Compiler\SymbolDisplay\ObjectDisplay.cs - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.csproj b/src/ExpressionEvaluator/Core/Source/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.csproj index e1f9cf121dabc..8b9e968f1b1bd 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.csproj +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.csproj @@ -6,7 +6,7 @@ Microsoft.CodeAnalysis.ExpressionEvaluator Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver true - net45;netstandard2.0 + netstandard2.0 diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/Helpers/Placeholders.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/Helpers/Placeholders.cs deleted file mode 100644 index 296e4ef118261..0000000000000 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/Helpers/Placeholders.cs +++ /dev/null @@ -1,113 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -#nullable disable - -using System; -using System.Reflection; -using System.Runtime.Versioning; - -[assembly: TargetFramework(".NETFramework,Version=v2.0")] - -namespace Microsoft.CodeAnalysis -{ - internal static class ReflectionTypeExtensions - { - // Replaces a missing 4.5 method. - internal static Type GetTypeInfo(this Type type) - { - return type; - } - - // Replaces a missing 4.5 method. - public static FieldInfo GetDeclaredField(this Type type, string name) - { - return type.GetField(name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static | BindingFlags.DeclaredOnly); - } - - // Replaces a missing 4.5 method. - public static MethodInfo GetDeclaredMethod(this Type type, string name, Type[] parameterTypes) - { - return type.GetMethod(name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static | BindingFlags.DeclaredOnly, null, parameterTypes, null); - } - } - - /// - /// Required by . - /// - internal static class IErrorTypeSymbol - { - } - - /// - /// Required by - /// - internal static class Environment - { - public static void FailFast(string message) => System.Environment.FailFast(message); - public static void FailFast(string message, Exception exception) => System.Environment.FailFast(exception.ToString()); - public static string NewLine => System.Environment.NewLine; - public static int ProcessorCount => System.Environment.ProcessorCount; - } -} - -namespace System.Runtime.CompilerServices -{ - [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = false)] - // To allow this dll to use extension methods even though we are targeting CLR v2, re-define ExtensionAttribute - internal class ExtensionAttribute : Attribute - { - } - - /// - /// This satisfies a cref on . - /// - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.ReturnValue)] - internal class DynamicAttribute : Attribute - { - } - - /// - /// This satisfies a cref on . - /// - internal interface INotifyCompletion - { - void OnCompleted(); - } -} - -namespace System.Text -{ - internal static class StringBuilderExtensions - { - public static void Clear(this StringBuilder builder) - { - builder.Length = 0; // Matches the real definition. - } - } -} - -namespace System.Runtime.Versioning -{ - [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)] - internal sealed class TargetFrameworkAttribute : Attribute - { - public string FrameworkName { get; } - public string FrameworkDisplayName { get; set; } - - public TargetFrameworkAttribute(string frameworkName) - => FrameworkName = frameworkName; - } -} - -namespace System.Threading -{ - public readonly struct CancellationToken - { - /// - /// .NET Framework 2.0 does not support cancellation via . - /// - public bool IsCancellationRequested => false; - } -} diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/ResultProvider.NetFX20.csproj b/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/ResultProvider.NetFX20.csproj deleted file mode 100644 index 921c8bf93f3f7..0000000000000 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/ResultProvider.NetFX20.csproj +++ /dev/null @@ -1,86 +0,0 @@ - - - - - Library - Microsoft.CodeAnalysis.ExpressionEvaluator - Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider - $(DefineConstants);NET20 - true - net20 - true - full - - - - Compiler\CaseInsensitiveComparison.cs - - - Compiler\Collections\PooledStringBuilder.cs - - - Compiler\InternalUtilities\Debug.cs - - - Compiler\InternalUtilities\FailFast.cs - - - Compiler\InternalUtilities\FatalError.cs - - - Compiler\InternalUtilities\EnumField.cs - - - Compiler\InternalUtilities\ExceptionUtilities.cs - - - Compiler\InternalUtilities\NullableAttributes.cs - - - Compiler\InternalUtilities\ObjectPool`1.cs - - - Compiler\SymbolDisplay\ObjectDisplayExtensions.cs - - - Compiler\SymbolDisplay\ObjectDisplayOptions.cs - - - Compiler\SymbolDisplay\SymbolDisplayPartKind.cs - - - Compiler\Symbols\WellKnownMemberNames.cs - - - Compiler\Xml\XmlCharType.cs - - - Helpers\DateTimeUtilities.cs - - - ExpressionCompiler\CustomTypeInfo.cs - - - ExpressionCompiler\DynamicFlagsCustomTypeInfo.cs - - - ExpressionCompiler\ExpressionEvaluatorFatalError.cs - - - Helpers\SystemHelpers.cs - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/AssemblyInfo.vb b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/AssemblyInfo.vb deleted file mode 100644 index e4ce048da21db..0000000000000 --- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/AssemblyInfo.vb +++ /dev/null @@ -1,5 +0,0 @@ -' Licensed to the .NET Foundation under one or more agreements. -' The .NET Foundation licenses this file to you under the MIT license. -' See the LICENSE file in the project root for more information. - - diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj deleted file mode 100644 index bb240cea6c5e2..0000000000000 --- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - Library - Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider - net20 - true - - - - - - - - Compiler\Scanner\CharacterInfo.vb - - - Compiler\Scanner\KeywordTable.vb - - - Compiler\SymbolDisplay\ObjectDisplay.vb - - - Compiler\Syntax\SyntaxKind.vb - - - Compiler\Syntax\SyntaxKindFacts.vb - - - Generated\Syntax.xml.GetText.Generated.vb - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj index a37588aae1c42..6667c0e5259b3 100644 --- a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj +++ b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj @@ -58,11 +58,8 @@ - - - @@ -108,11 +105,6 @@ <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp.ExpressionCompiler\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.dll" TargetDir="" /> <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExpressionCompiler\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler.dll" TargetDir="" /> - <_File Include="$(ArtifactsBinDir)BasicResultProvider.NetFX20\$(Configuration)\net20\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.dll" TargetDir="RemoteDebugger\net20" /> - <_File Include="$(ArtifactsBinDir)CSharpResultProvider.NetFX20\$(Configuration)\net20\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.dll" TargetDir="RemoteDebugger\net20" /> - <_File Include="$(ArtifactsBinDir)ResultProvider.NetFX20\$(Configuration)\net20\Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider.dll" TargetDir="RemoteDebugger\net20" /> - <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.FunctionResolver\$(Configuration)\net45\Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.dll" TargetDir="RemoteDebugger\net45" /> - <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp.ResultProvider\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" /> <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp.ExpressionCompiler\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" /> <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.VisualBasic.ResultProvider\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" /> diff --git a/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs b/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs index 90d8e051795ac..a56d36bbf93cc 100644 --- a/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs +++ b/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs @@ -169,10 +169,6 @@ private bool CheckExternalApis(TextWriter textWriter) textWriter.WriteLine("Verifying contents of VS.ExternalAPIs.Roslyn"); textWriter.WriteLine("\tRoot Folder"); verifyFolder(""); - textWriter.WriteLine("\tRemote Debugger net20"); - verifyFolder(@"RemoteDebugger\net20"); - textWriter.WriteLine("\tRemote Debugger net50"); - verifyFolder(@"RemoteDebugger\net45"); return allGood; void verifyFolder(string folderRelativeName) diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs index 0cb613b77a64f..c7b907afdef00 100644 --- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs +++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs @@ -287,7 +287,6 @@ private bool CheckTargetFrameworks(TextWriter textWriter) { switch (targetFramework) { - case "net20": case "net472": case "netcoreapp3.1": case "net6.0":