Clean up features (#264)

IronLanguages · Oct 21, 2022 · b4b3019 · b4b3019
1 parent a28a4c5
commit b4b3019
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 60 deletions.
diff --git a/Build/net452.props b/Build/net452.props
@@ -6,9 +6,6 @@
 
   <PropertyGroup>
     <Features>$(Features);FEATURE_APARTMENTSTATE</Features>
-    <Features>$(Features);FEATURE_APPLICATIONEXCEPTION</Features>
-    <Features>$(Features);FEATURE_ASSEMBLY_CODEBASE</Features>
-    <Features>$(Features);FEATURE_ASSEMBLY_LOCATION</Features>
     <Features>$(Features);FEATURE_ASSEMBLY_RESOLVE</Features>
     <Features>$(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY</Features>
     <Features>$(Features);FEATURE_ASSEMBLYBUILDER_SAVE</Features>
@@ -17,22 +14,17 @@
     <Features>$(Features);FEATURE_COM</Features>
     <Features>$(Features);FEATURE_CONFIGURATION</Features>
     <Features>$(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR</Features>
-    <Features>$(Features);FEATURE_DBNULL</Features>
-    <Features>$(Features);FEATURE_DRIVENOTFOUNDEXCEPTION</Features>
-    <Features>$(Features);FEATURE_DYNAMIC_EXPRESSION_VISITOR</Features>
     <Features>$(Features);FEATURE_EXCEPTION_STATE</Features>
     <Features>$(Features);FEATURE_FILESYSTEM</Features>
     <Features>$(Features);FEATURE_FULL_CONSOLE</Features>
     <Features>$(Features);FEATURE_FULL_CRYPTO</Features>
     <Features>$(Features);FEATURE_FULL_NET</Features>
-    <Features>$(Features);FEATURE_ICLONEABLE</Features>
     <Features>$(Features);FEATURE_LAMBDAEXPRESSION_COMPILETOMETHOD</Features>
     <Features>$(Features);FEATURE_LCG</Features>
     <Features>$(Features);FEATURE_LOADWITHPARTIALNAME</Features>
     <Features>$(Features);FEATURE_METADATA_READER</Features>
     <Features>$(Features);FEATURE_MMAP</Features>
     <Features>$(Features);FEATURE_NATIVE</Features>
-    <Features>$(Features);FEATURE_OS_SERVICEPACK</Features>
     <Features>$(Features);FEATURE_PDBEMIT</Features>
     <Features>$(Features);FEATURE_PIPES</Features>
     <Features>$(Features);FEATURE_PROCESS</Features>
@@ -42,14 +34,11 @@
     <Features>$(Features);FEATURE_REMOTING</Features>
     <Features>$(Features);FEATURE_SECURITY_RULES</Features>
     <Features>$(Features);FEATURE_SERIALIZATION</Features>
-    <Features>$(Features);FEATURE_SORTKEY</Features>
     <Features>$(Features);FEATURE_STACK_TRACE</Features>
     <Features>$(Features);FEATURE_SYNC_SOCKETS</Features>
     <Features>$(Features);FEATURE_THREAD</Features>
     <Features>$(Features);FEATURE_TYPE_EQUIVALENCE</Features>
     <Features>$(Features);FEATURE_TYPECONVERTER</Features>
-    <Features>$(Features);FEATURE_WARNING_EXCEPTION</Features>
-    <Features>$(Features);FEATURE_WIN32EXCEPTION</Features>
     <Features>$(Features);FEATURE_WPF</Features>
     <Features>$(Features);FEATURE_XMLDOC</Features>
   </PropertyGroup>

diff --git a/Build/net6.0.props b/Build/net6.0.props
@@ -6,46 +6,35 @@
 
   <PropertyGroup>
     <Features>$(Features);FEATURE_APARTMENTSTATE</Features>
-    <Features>$(Features);FEATURE_APPLICATIONEXCEPTION</Features>
-    <Features>$(Features);FEATURE_ASSEMBLY_CODEBASE</Features>
     <Features>$(Features);FEATURE_ASSEMBLY_GETFORWARDEDTYPES</Features>
-    <Features>$(Features);FEATURE_ASSEMBLY_LOCATION</Features>
     <Features>$(Features);FEATURE_ASSEMBLY_RESOLVE</Features>
     <Features>$(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY</Features>
     <Features>$(Features);FEATURE_BASIC_CONSOLE</Features>
     <Features>$(Features);FEATURE_CODEDOM</Features>
     <Features>$(Features);FEATURE_COM</Features>
     <Features>$(Features);FEATURE_CONFIGURATION</Features>
     <Features>$(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR</Features>
-    <Features>$(Features);FEATURE_DBNULL</Features>
-    <Features>$(Features);FEATURE_DRIVENOTFOUNDEXCEPTION</Features>
-    <Features>$(Features);FEATURE_DYNAMIC_EXPRESSION_VISITOR</Features>
     <Features>$(Features);FEATURE_EXCEPTION_STATE</Features>
     <Features>$(Features);FEATURE_FILESYSTEM</Features>
     <Features>$(Features);FEATURE_FULL_CONSOLE</Features>
     <Features>$(Features);FEATURE_FULL_CRYPTO</Features>
     <Features>$(Features);FEATURE_FULL_NET</Features>
-    <Features>$(Features);FEATURE_ICLONEABLE</Features>
     <Features>$(Features);FEATURE_LCG</Features>
     <Features>$(Features);FEATURE_LOADWITHPARTIALNAME</Features>
     <Features>$(Features);FEATURE_METADATA_READER</Features>
     <Features>$(Features);FEATURE_MMAP</Features>
     <Features>$(Features);FEATURE_NATIVE</Features>
-    <Features>$(Features);FEATURE_OS_SERVICEPACK</Features>
     <Features>$(Features);FEATURE_PIPES</Features>
     <Features>$(Features);FEATURE_PROCESS</Features>
     <Features>$(Features);FEATURE_REFEMIT</Features>
     <Features>$(Features);FEATURE_REGISTRY</Features>
     <Features>$(Features);FEATURE_SECURITY_RULES</Features>
     <Features>$(Features);FEATURE_SERIALIZATION</Features>
-    <Features>$(Features);FEATURE_SORTKEY</Features>
     <Features>$(Features);FEATURE_STACK_TRACE</Features>
     <Features>$(Features);FEATURE_SYNC_SOCKETS</Features>
     <Features>$(Features);FEATURE_THREAD</Features>
     <Features>$(Features);FEATURE_TYPE_EQUIVALENCE</Features>
     <Features>$(Features);FEATURE_TYPECONVERTER</Features>
-    <Features>$(Features);FEATURE_WARNING_EXCEPTION</Features>
-    <Features>$(Features);FEATURE_WIN32EXCEPTION</Features>
     <Features>$(Features);FEATURE_XMLDOC</Features>
   </PropertyGroup>
 </Project>
diff --git a/Build/netcoreapp3.1.props b/Build/netcoreapp3.1.props
@@ -6,46 +6,35 @@
 
   <PropertyGroup>
     <Features>$(Features);FEATURE_APARTMENTSTATE</Features>
-    <Features>$(Features);FEATURE_APPLICATIONEXCEPTION</Features>
-    <Features>$(Features);FEATURE_ASSEMBLY_CODEBASE</Features>
     <Features>$(Features);FEATURE_ASSEMBLY_GETFORWARDEDTYPES</Features>
-    <Features>$(Features);FEATURE_ASSEMBLY_LOCATION</Features>
     <Features>$(Features);FEATURE_ASSEMBLY_RESOLVE</Features>
     <Features>$(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY</Features>
     <Features>$(Features);FEATURE_BASIC_CONSOLE</Features>
     <Features>$(Features);FEATURE_CODEDOM</Features>
     <Features>$(Features);FEATURE_COM</Features>
     <Features>$(Features);FEATURE_CONFIGURATION</Features>
     <Features>$(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR</Features>
-    <Features>$(Features);FEATURE_DBNULL</Features>
-    <Features>$(Features);FEATURE_DRIVENOTFOUNDEXCEPTION</Features>
-    <Features>$(Features);FEATURE_DYNAMIC_EXPRESSION_VISITOR</Features>
     <Features>$(Features);FEATURE_EXCEPTION_STATE</Features>
     <Features>$(Features);FEATURE_FILESYSTEM</Features>
     <Features>$(Features);FEATURE_FULL_CONSOLE</Features>
     <Features>$(Features);FEATURE_FULL_CRYPTO</Features>
     <Features>$(Features);FEATURE_FULL_NET</Features>
-    <Features>$(Features);FEATURE_ICLONEABLE</Features>
     <Features>$(Features);FEATURE_LCG</Features>
     <Features>$(Features);FEATURE_LOADWITHPARTIALNAME</Features>
     <Features>$(Features);FEATURE_METADATA_READER</Features>
     <Features>$(Features);FEATURE_MMAP</Features>
     <Features>$(Features);FEATURE_NATIVE</Features>
-    <Features>$(Features);FEATURE_OS_SERVICEPACK</Features>
     <Features>$(Features);FEATURE_PIPES</Features>
     <Features>$(Features);FEATURE_PROCESS</Features>
     <Features>$(Features);FEATURE_REFEMIT</Features>
     <Features>$(Features);FEATURE_REGISTRY</Features>
     <Features>$(Features);FEATURE_SECURITY_RULES</Features>
     <Features>$(Features);FEATURE_SERIALIZATION</Features>
-    <Features>$(Features);FEATURE_SORTKEY</Features>
     <Features>$(Features);FEATURE_STACK_TRACE</Features>
     <Features>$(Features);FEATURE_SYNC_SOCKETS</Features>
     <Features>$(Features);FEATURE_THREAD</Features>
     <Features>$(Features);FEATURE_TYPE_EQUIVALENCE</Features>
     <Features>$(Features);FEATURE_TYPECONVERTER</Features>
-    <Features>$(Features);FEATURE_WARNING_EXCEPTION</Features>
-    <Features>$(Features);FEATURE_WIN32EXCEPTION</Features>
     <Features>$(Features);FEATURE_XMLDOC</Features>
   </PropertyGroup>
 </Project>
diff --git a/Build/netstandard2.0.props b/Build/netstandard2.0.props
@@ -6,44 +6,33 @@
 
   <PropertyGroup>
     <Features>$(Features);FEATURE_APARTMENTSTATE</Features>
-    <Features>$(Features);FEATURE_APPLICATIONEXCEPTION</Features>
-    <Features>$(Features);FEATURE_ASSEMBLY_CODEBASE</Features>
-    <Features>$(Features);FEATURE_ASSEMBLY_LOCATION</Features>
     <Features>$(Features);FEATURE_ASSEMBLY_RESOLVE</Features>
     <Features>$(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY</Features>
     <Features>$(Features);FEATURE_BASIC_CONSOLE</Features>
     <Features>$(Features);FEATURE_CODEDOM</Features>
     <Features>$(Features);FEATURE_CONFIGURATION</Features>
     <Features>$(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR</Features>
-    <Features>$(Features);FEATURE_DBNULL</Features>
-    <Features>$(Features);FEATURE_DRIVENOTFOUNDEXCEPTION</Features>
-    <Features>$(Features);FEATURE_DYNAMIC_EXPRESSION_VISITOR</Features>
     <Features>$(Features);FEATURE_EXCEPTION_STATE</Features>
     <Features>$(Features);FEATURE_FILESYSTEM</Features>
     <Features>$(Features);FEATURE_FULL_CONSOLE</Features>
     <Features>$(Features);FEATURE_FULL_CRYPTO</Features>
     <Features>$(Features);FEATURE_FULL_NET</Features>
-    <Features>$(Features);FEATURE_ICLONEABLE</Features>
     <Features>$(Features);FEATURE_LCG</Features>
     <Features>$(Features);FEATURE_LOADWITHPARTIALNAME</Features>
     <Features>$(Features);FEATURE_METADATA_READER</Features>
     <Features>$(Features);FEATURE_MMAP</Features>
     <Features>$(Features);FEATURE_NATIVE</Features>
-    <Features>$(Features);FEATURE_OS_SERVICEPACK</Features>
     <Features>$(Features);FEATURE_PIPES</Features>
     <Features>$(Features);FEATURE_PROCESS</Features>
     <Features>$(Features);FEATURE_REFEMIT</Features>
     <Features>$(Features);FEATURE_REGISTRY</Features>
     <Features>$(Features);FEATURE_SECURITY_RULES</Features>
     <Features>$(Features);FEATURE_SERIALIZATION</Features>
-    <Features>$(Features);FEATURE_SORTKEY</Features>
     <Features>$(Features);FEATURE_STACK_TRACE</Features>
     <Features>$(Features);FEATURE_SYNC_SOCKETS</Features>
     <Features>$(Features);FEATURE_THREAD</Features>
     <Features>$(Features);FEATURE_TYPE_EQUIVALENCE</Features>
     <Features>$(Features);FEATURE_TYPECONVERTER</Features>
-    <Features>$(Features);FEATURE_WARNING_EXCEPTION</Features>
-    <Features>$(Features);FEATURE_WIN32EXCEPTION</Features>
     <Features>$(Features);FEATURE_XMLDOC</Features>
   </PropertyGroup>
 </Project>
diff --git a/Src/Microsoft.Dynamic/Runtime/ScriptingRuntimeHelpers.cs b/Src/Microsoft.Dynamic/Runtime/ScriptingRuntimeHelpers.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Scripting.Runtime {
     /// These are some generally useful helper methods. Currently the only methods are those to
     /// cached boxed representations of commonly used primitive types so that they can be shared.
     /// This is useful to most dynamic languages that use object as a universal type.
-    /// 
+    ///
     /// The methods in RuntimeHelepers are caleld by the generated code. From here the methods may
     /// dispatch to other parts of the runtime to get bulk of the work done, but the entry points
     /// should be here.
@@ -106,9 +106,7 @@ internal static object GetPrimitiveDefaultValue(Type type) {
                 case TypeCode.UInt64: return default(UInt64);
                 case TypeCode.Single: return default(Single);
                 case TypeCode.Double: return default(Double);
-#if FEATURE_DBNULL
                 case TypeCode.DBNull: return default(DBNull);
-#endif
                 case TypeCode.DateTime: return default(DateTime);
                 case TypeCode.Decimal: return default(Decimal);
                 default: return null;
@@ -140,7 +138,7 @@ public static object ReadOnlyAssignError(bool field, string fieldName) {
         /// <summary>
         /// Helper method to create an instance.  Work around for Silverlight where Activator.CreateInstance
         /// is SecuritySafeCritical.
-        /// 
+        ///
         /// TODO: Why can't we just emit the right thing for default(T)?
         /// It's always null for reference types and it's well defined for value types
         /// </summary>
@@ -152,7 +150,7 @@ public static T CreateInstance<T>() {
         public static T[] CreateArray<T>(int args) {
             return new T[args];
         }
-        
+
         /// <summary>
         /// EventInfo.EventHandlerType getter is marked SecuritySafeCritical in CoreCLR
         /// This method is to get to the property without using Reflection
@@ -220,7 +218,7 @@ public static T IncorrectBoxType<T>(object received) {
         public static Exception MakeIncorrectBoxTypeError(Type type, object received) {
             return Error.UnexpectedType("StrongBox<" + type.Name + ">", CompilerHelpers.GetType(received).Name);
         }
-        
+
         /// <summary>
         /// Provides the test to see if an interpreted call site should switch over to being compiled.
         /// </summary>

diff --git a/Src/Microsoft.Dynamic/Utils/DynamicUtils.cs b/Src/Microsoft.Dynamic/Utils/DynamicUtils.cs
@@ -17,13 +17,6 @@
 using Microsoft.Scripting.Interpreter;
 using Microsoft.Scripting.Runtime;
 
-#if !FEATURE_DYNAMIC_EXPRESSION_VISITOR
-namespace System.Linq.Expressions {
-    public abstract class DynamicExpressionVisitor : ExpressionVisitor {
-    }
-}
-#endif
-
 namespace Microsoft.Scripting.Utils {
     using AstUtils = Microsoft.Scripting.Ast.Utils;
 
@@ -62,7 +55,7 @@ public static DynamicMetaObject ObjectToMetaObject(object argValue, Expression p
         /// <summary>
         /// Produces an interpreted binding using the given binder which falls over to a compiled
         /// binding after hitCount tries.
-        /// 
+        ///
         /// This method should be called whenever an interpreted binding is required.  Sometimes it will
         /// return a compiled binding if a previous binding was produced and it's hit count was exhausted.
         /// In this case the binder will not be called back for a new binding - the previous one will
@@ -217,10 +210,10 @@ public void AddInstructions(LightCompiler compiler) {
 
     /// <summary>
     /// Base class for storing information about the binding that a specific rule is applicable for.
-    /// 
+    ///
     /// We have a derived generic class but this class enables us to refer to it w/o having the
     /// generic type information around.
-    /// 
+    ///
     /// This class tracks both the count down to when we should compile.  When we compile we
     /// take the Expression[T] that was used before and compile it.  While this is happening
     /// we continue to allow the interpreted code to run.  When the compilation is complete we