Make preprocessor directives more flexible

Author: AndriySvyryd

src/EFCore.Tasks/Tasks/Internal/MsBuildUtilities.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if NET472
+#if !NET
 using System.Configuration;
 #endif
 

src/EFCore.Tasks/Tasks/Internal/OperationTaskBase.cs

@@ -193,8 +193,9 @@ protected override string GenerateCommandLineCommands()
             args.Add(runtimeFrameworkVersion);
         }
 
-#if !NET10_0
-#elif NET472
+#if NET472
+#elif NET10_0
+#else
 #error Target framework needs to be updated here
 #endif
         args.Add(

src/ef/AppDomainOperationExecutor.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if NET472
+#if !NET
 using System.Collections;
 using System.Reflection;
 using Microsoft.EntityFrameworkCore.Design;

src/ef/Commands/MigrationsBundleCommand.cs

@@ -29,7 +29,7 @@ protected override void Validate()
         }
     }
 
-#if NET472
+#if !NET
     protected override int Execute(string[] args)
         => throw new CommandException(Resources.VersionRequired("6.0.0"));
 #else

src/ef/Commands/ProjectCommandBase.cs

@@ -5,10 +5,10 @@
 using Microsoft.DotNet.Cli.CommandLine;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.EntityFrameworkCore.Tools.Properties;
-#if NET472
-using System.Configuration;
-#else
+#if NET
 using System.Runtime.Loader;
+#else
+using System.Configuration;
 #endif
 
 namespace Microsoft.EntityFrameworkCore.Tools.Commands
@@ -81,7 +81,7 @@ protected IOperationExecutor CreateExecutor(string[] remainingArguments)
                         Reporter.WriteWarning,
                         Reporter.WriteInformation,
                         Reporter.WriteVerbose);
-#if NET472
+#if !NET
                 try
                 {
                     return new AppDomainOperationExecutor(

src/ef/ReflectionOperationExecutor.cs

@@ -3,7 +3,7 @@
 
 using System.Collections;
 using System.Reflection;
-#if !NET472
+#if NET
 using System.Runtime.Loader;
 #endif
 using Microsoft.EntityFrameworkCore.Design;
@@ -21,7 +21,7 @@ internal class ReflectionOperationExecutor : OperationExecutorBase
     private const string ResultHandlerTypeName = "Microsoft.EntityFrameworkCore.Design.OperationResultHandler";
     private readonly Type _resultHandlerType;
     private string? _efcoreVersion;
-#if !NET472
+#if NET
     private AssemblyLoadContext? _assemblyLoadContext;
 #endif
 
@@ -55,7 +55,7 @@ public ReflectionOperationExecutor(
 
         AppDomain.CurrentDomain.AssemblyResolve += ResolveAssembly;
 
-#if !NET472
+#if NET
         _commandsAssembly = AssemblyLoadContext.LoadFromAssemblyName(new AssemblyName(DesignAssemblyName));
 #else
         if (DesignAssemblyPath != null)
@@ -97,7 +97,7 @@ public ReflectionOperationExecutor(
         _resultHandlerType = _commandsAssembly.GetType(ResultHandlerTypeName, throwOnError: true, ignoreCase: false)!;
     }
 
-#if !NET472
+#if NET
     protected AssemblyLoadContext AssemblyLoadContext
     {
         get
@@ -133,7 +133,7 @@ public override string? EFCoreVersion
             }
 
             Assembly? assembly = null;
-#if !NET472
+#if NET
             assembly = AssemblyLoadContext.LoadFromAssemblyName(new AssemblyName(DesignAssemblyName));
 #else
             if (DesignAssemblyPath != null)

src/ef/Utilities/CallContext.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if !NET472
+#if NET
 namespace System.Runtime.Remoting.Messaging
 {
     internal static class CallContext

src/ef/Utilities/CompilerError.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if !NET472
+#if NET
 namespace System.CodeDom.Compiler
 {
     internal class CompilerError

src/ef/Utilities/CompilerErrorCollection.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if !NET472
+#if NET
 namespace System.CodeDom.Compiler
 {
     internal class CompilerErrorCollection