Cleanup ifdefs

src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#if NET461
+#if NET46
 using System;
 using System.Collections.Immutable;
 using System.IO;

src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs

@@ -21317,7 +21317,7 @@ public ValueTuple(T1 _1, T2 _2, T3 _3) { }
         }
 
         // https://github.com/dotnet/roslyn/issues/25141
-#if NET461
+#if NET46
         [Fact]
         public void ValueTupleBase_AssemblyUnification()
         {

src/Compilers/CSharp/Test/Emit/Emit/CompilationEmitTests.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#if NET461
+#if NET46
 
 using System;
 using System.Collections.Immutable;

src/Compilers/CSharp/Test/Emit/Emit/DesktopStrongNameProviderTests.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#if NET461
+#if NET46
 
 using System.Collections.Immutable;
 using System.IO;

src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#if NET46 || NET461
+#if NET46
 
 using System;
 using System.Collections.Generic;

src/Compilers/CSharp/Test/Emit/Emit/NoPiaEmbedTypes.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#if NET461
+#if NET46
 
 using Microsoft.Cci;
 using Microsoft.CodeAnalysis.CSharp.Symbols;

src/Compilers/CSharp/Test/Emit/PDB/PDBUsingTests.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#if NET461
+#if NET46
 
 using System.Collections.Immutable;
 using System.IO;

src/Compilers/CSharp/Test/Emit/PrivateProtected.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-#if NET461
+#if NET46
 
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis.CSharp.Test.Utilities;

src/Compilers/Shared/DesktopAnalyzerAssemblyLoader.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-#if NET46 || NET461
+#if NET46
 
 using System;
 using System.Reflection;

src/EditorFeatures/CSharpTest/RemoveUnusedVariable/RemoveUnusedVariableTests.cs

@@ -212,7 +212,7 @@ public async Task LeadingDirectives()
         {
             await TestInRegularAndScriptAsync(
 @"
-#define NET461
+#define NET46
 
 using System;
 
@@ -222,7 +222,7 @@ public class Class1
     {
         public static string GetText()
         {
-#if NET461
+#if NET46
         return ""Hello from "" + Environment.OSVersion;
 #elif NETSTANDARD1_4
         return ""Hello from .NET Standard"";
@@ -234,7 +234,7 @@ public static string GetText()
     }
 }",
 @"
-#define NET461
+#define NET46
 
 using System;
 
@@ -244,7 +244,7 @@ public class Class1
     {
         public static string GetText()
         {
-#if NET461
+#if NET46
         return ""Hello from "" + Environment.OSVersion;
 #elif NETSTANDARD1_4
         return ""Hello from .NET Standard"";

src/Test/Utilities/Portable/Assert/UseCultureAttribute.cs

@@ -51,7 +51,7 @@ public UseCultureAttribute(string culture)
         /// <param name="uiCulture">The name of the UI culture.</param>
         public UseCultureAttribute(string culture, string uiCulture)
         {
-#if NET46 || NET461
+#if NET46
             _culture = new Lazy<CultureInfo>(() => new CultureInfo(culture, useUserOverride: false));
             _uiCulture = new Lazy<CultureInfo>(() => new CultureInfo(uiCulture, useUserOverride: false));
 #elif NETCOREAPP2_0
@@ -83,11 +83,11 @@ public override void Before(MethodInfo methodUnderTest)
             _originalCulture = CultureInfo.CurrentCulture;
             _originalUICulture = CultureInfo.CurrentUICulture;
 
-#if NET46 || NET461 || NETCOREAPP2_0
+#if NET46 || NETCOREAPP2_0
             CultureInfo.CurrentCulture = Culture;
             CultureInfo.CurrentUICulture = UICulture;
 
-#if NET46 || NET461
+#if NET46
             CultureInfo.CurrentCulture.ClearCachedData();
             CultureInfo.CurrentUICulture.ClearCachedData();
 #endif
@@ -103,11 +103,11 @@ public override void Before(MethodInfo methodUnderTest)
         /// <param name="methodUnderTest">The method under test</param>
         public override void After(MethodInfo methodUnderTest)
         {
-#if NET46 || NET461 || NETCOREAPP2_0
+#if NET46 || NETCOREAPP2_0
             CultureInfo.CurrentCulture = _originalCulture;
             CultureInfo.CurrentUICulture = _originalUICulture;
 
-#if NET46 || NET461
+#if NET46
             CultureInfo.CurrentCulture.ClearCachedData();
             CultureInfo.CurrentUICulture.ClearCachedData();
 #endif

src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs

@@ -15,7 +15,7 @@ public static partial class RuntimeUtilities
     {
         internal static BuildPaths CreateBuildPaths(string workingDirectory)
         {
-#if NET461 || NET46
+#if NET46
             return new BuildPaths(
                 clientDir: Path.GetDirectoryName(typeof(BuildPathsUtil).Assembly.Location),
                 workingDir: workingDirectory,
@@ -32,7 +32,7 @@ internal static BuildPaths CreateBuildPaths(string workingDirectory)
 
         internal static IRuntimeEnvironmentFactory GetRuntimeEnvironmentFactory()
         {
-#if NET461 || NET46
+#if NET46
             return new Roslyn.Test.Utilities.Desktop.DesktopRuntimeEnvironmentFactory();
 #elif NETCOREAPP2_0
             return new Roslyn.Test.Utilities.CoreClr.CoreCLRRuntimeEnvironmentFactory();
@@ -45,7 +45,7 @@ internal static IRuntimeEnvironmentFactory GetRuntimeEnvironmentFactory()
 
         internal static AnalyzerAssemblyLoader CreateAnalyzerAssemblyLoader()
         {
-#if NET461 || NET46
+#if NET46
             return new DesktopAnalyzerAssemblyLoader();
 #else 
             return new ThrowingAnalyzerAssemblyLoader();
@@ -57,7 +57,7 @@ internal static AnalyzerAssemblyLoader CreateAnalyzerAssemblyLoader()
         /// </summary>
         internal static string GetAssemblyLocation(Type type)
         {
-#if NET461 || NET46 || NETCOREAPP2_0
+#if NET46 || NETCOREAPP2_0
             return type.GetTypeInfo().Assembly.Location;
 #elif NETSTANDARD1_3
             throw new NotSupportedException();

src/Test/Utilities/Portable/Platform/Desktop/AppDomainAssemblyCache.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-#if NET461 || NET46
+#if NET46
 
 using System;
 using System.Collections.Concurrent;

src/Test/Utilities/Portable/Platform/Desktop/AppDomainUtils.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#if NET461 || NET46
+#if NET46
 using System;
 using System.IO;
 using System.Reflection;

src/Test/Utilities/Portable/Platform/Desktop/CLRHelpers.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#if NET461 || NET46
+#if NET46
 
 using System;
 using System.Collections.Generic;

src/Test/Utilities/Portable/Platform/Desktop/ConditionalFactAttribute.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#if NET461 || NET46
+#if NET46
 
 using System;
 using System.Drawing;

src/Test/Utilities/Portable/Platform/Desktop/DesktopRuntimeEnvironment.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-#if NET461 || NET46
+#if NET46
 
 using System;
 using System.Collections.Generic;

src/Test/Utilities/Portable/Platform/Desktop/DesktopRuntimeEnvironmentFactory.cs

@@ -1,4 +1,4 @@
-#if NET461 || NET46
+#if NET46
 using System.Collections.Generic;
 using Roslyn.Test.Utilities;
 

src/Test/Utilities/Portable/Platform/Desktop/DesktopRuntimeUtil.cs

@@ -1,4 +1,4 @@
-#if NET461 || NET46
+#if NET46
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;

src/Test/Utilities/Portable/Platform/Desktop/ErrorDiagnostics.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-#if NET461 || NET46
+#if NET46
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Test/Utilities/Portable/Platform/Desktop/Exceptions.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-#if NET461 || NET46
+#if NET46
 using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;

src/Test/Utilities/Portable/Platform/Desktop/Extensions.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-#if NET461 || NET46
+#if NET46
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;

src/Test/Utilities/Portable/Platform/Desktop/RuntimeAssemblyManager.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-#if NET461 || NET46
+#if NET46
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;

src/Test/Utilities/Portable/Platform/Desktop/RuntimeModuleData.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#if NET461 || NET46
+#if NET46
 
 using System;
 using System.Collections.Concurrent;

src/Test/Utilities/Portable/Platform/Desktop/TestHelpers.cs

@@ -1,4 +1,4 @@
-#if NET461 || NET46
+#if NET46
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;