United FEATURE_READ_CUSTOMMODIFIERS and FEATURE_EMIT_CUSTOMMODIFIERS

castleproject · Aug 31, 2018 · aa27233 · aa27233
1 parent 026cfdd
commit aa27233
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Symbol                              | NET35              | NET40              |
 `FEATURE_ASSEMBLYBUILDER_SAVE`      | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `FEATURE_BINDINGLIST`               | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `FEATURE_DICTIONARYADAPTER_XML`     | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
-`FEATURE_EMIT_CUSTOMMODIFIERS`      | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
+`FEATURE_CUSTOMMODIFIERS`           | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `FEATURE_EVENTLOG`                  | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `FEATURE_GAC`                       | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `FEATURE_GET_REFERENCED_ASSEMBLIES` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
@@ -83,7 +83,7 @@ Symbol                              | NET35              | NET40              |
 * `FEATURE_ASSEMBLYBUILDER_SAVE` - enabled support for saving the dynamically generated proxy assembly.
 * `FEATURE_BINDINGLIST` - enables support features that make use of System.ComponentModel.BindingList.
 * `FEATURE_DICTIONARYADAPTER_XML` - enable DictionaryAdapter Xml features.
-* `FEATURE_EMIT_CUSTOMMODIFIERS` - enables emitting optional and required custom modifiers defined on parameters including return parameters. It seems like a defect in corefx not to expose these methods because they are still implemented.
+* `FEATURE_CUSTOMMODIFIERS` - enables reading and emitting optional and required custom modifiers defined on parameters including return parameters. It seems like a defect in corefx not to expose these methods because they are still implemented.
 * `FEATURE_EVENTLOG` - provides a diagnostics logger using the Windows Event Log.
 * `FEATURE_GAC` - enables support for obtaining assemblies using an assembly long form name.
 * `FEATURE_GET_REFERENCED_ASSEMBLIES` - enables code that takes advantage of System.Reflection.Assembly.GetReferencedAssemblies().

diff --git a/buildscripts/common.props b/buildscripts/common.props
@@ -42,8 +42,8 @@
 	<PropertyGroup>
 		<DiagnosticsConstants>DEBUG</DiagnosticsConstants>
 		<NetStandard13Constants>TRACE;FEATURE_NETCORE_REFLECTION_API;FEATURE_TEST_SERILOGINTEGRATION</NetStandard13Constants>
-		<NetStandard15Constants>$(NetStandard13Constants);FEATURE_READ_CUSTOMMODIFIERS;FEATURE_EMIT_CUSTOMMODIFIERS</NetStandard15Constants>
-		<CommonDesktopClrConstants>TRACE;FEATURE_APPDOMAIN;FEATURE_ASSEMBLYBUILDER_SAVE;FEATURE_BINDINGLIST;FEATURE_DICTIONARYADAPTER_XML;FEATURE_READ_CUSTOMMODIFIERS;FEATURE_EMIT_CUSTOMMODIFIERS;FEATURE_EVENTLOG;FEATURE_GAC;FEATURE_GET_REFERENCED_ASSEMBLIES;FEATURE_IDATAERRORINFO;FEATURE_ISUPPORTINITIALIZE;FEATURE_LISTSORT;FEATURE_REMOTING;FEATURE_SECURITY_PERMISSIONS;FEATURE_SERIALIZATION;FEATURE_SMTP;FEATURE_SYSTEM_CONFIGURATION;FEATURE_TARGETEXCEPTION;FEATURE_TEST_COM;FEATURE_TEST_SERILOGINTEGRATION</CommonDesktopClrConstants>
+		<NetStandard15Constants>$(NetStandard13Constants);FEATURE_CUSTOMMODIFIERS</NetStandard15Constants>
+		<CommonDesktopClrConstants>TRACE;FEATURE_APPDOMAIN;FEATURE_ASSEMBLYBUILDER_SAVE;FEATURE_BINDINGLIST;FEATURE_DICTIONARYADAPTER_XML;FEATURE_CUSTOMMODIFIERS;FEATURE_EVENTLOG;FEATURE_GAC;FEATURE_GET_REFERENCED_ASSEMBLIES;FEATURE_IDATAERRORINFO;FEATURE_ISUPPORTINITIALIZE;FEATURE_LISTSORT;FEATURE_REMOTING;FEATURE_SECURITY_PERMISSIONS;FEATURE_SERIALIZATION;FEATURE_SMTP;FEATURE_SYSTEM_CONFIGURATION;FEATURE_TARGETEXCEPTION;FEATURE_TEST_COM;FEATURE_TEST_SERILOGINTEGRATION</CommonDesktopClrConstants>
 		<DesktopClrConstants Condition="'$(OS)'=='Unix'">$(CommonDesktopClrConstants)</DesktopClrConstants>
 		<DesktopClrConstants Condition="'$(OS)'=='Windows_NT'">$(CommonDesktopClrConstants);FEATURE_TEST_PEVERIFY</DesktopClrConstants>
 	</PropertyGroup>

diff --git a/src/Castle.Core.Tests/DynamicProxy.Tests/CustomModifiersTestCase.cs b/src/Castle.Core.Tests/DynamicProxy.Tests/CustomModifiersTestCase.cs
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#if FEATURE_EMIT_CUSTOMMODIFIERS && FEATURE_ASSEMBLYBUILDER_SAVE
+#if FEATURE_CUSTOMMODIFIERS && FEATURE_ASSEMBLYBUILDER_SAVE
 
 namespace Castle.DynamicProxy.Tests
 {

diff --git a/src/Castle.Core.Tests/DynamicProxy.Tests/RhinoMocksTestCase.cs b/src/Castle.Core.Tests/DynamicProxy.Tests/RhinoMocksTestCase.cs
@@ -20,7 +20,7 @@ namespace Castle.DynamicProxy.Tests
 	using System.Data;
 	using System.Runtime.InteropServices;
 
-#if FEATURE_EMIT_CUSTOMMODIFIERS
+#if FEATURE_CUSTOMMODIFIERS
 	using System.Reflection;
 	using System.Runtime.CompilerServices;
 #endif
@@ -115,7 +115,7 @@ public void CanProxyDataSet()
 			generator.CreateClassProxy(typeof (DataSet), new Type[0], new StandardInterceptor());
 		}
 
-#if FEATURE_EMIT_CUSTOMMODIFIERS
+#if FEATURE_CUSTOMMODIFIERS
 		private Type iHaveMethodWithModOptsType;
 
 		[OneTimeSetUp]

diff --git a/src/Castle.Core.Tests/DynamicProxy.Tests/ValueTypeReferenceSemanticsTestCase.cs b/src/Castle.Core.Tests/DynamicProxy.Tests/ValueTypeReferenceSemanticsTestCase.cs
@@ -32,7 +32,7 @@ public void Can_proxy_method_having_valuetyped_parameter_without_in_modifier()
 			proxy.Method(readOnlyStruct);
 		}
 
-#if FEATURE_EMIT_CUSTOMMODIFIERS
+#if FEATURE_CUSTOMMODIFIERS
 
 		// ^^^
 		// Because the `in` parameter modifier gets encoded as a modreq,

diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/MethodEmitter.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/MethodEmitter.cs
@@ -323,7 +323,7 @@ private void SetSignature(Type returnType, ParameterInfo returnParameter, Type[]
 			Type[][] parametersRequiredCustomModifiers;
 			Type[][] parametersOptionalCustomModifiers;
 
-#if FEATURE_EMIT_CUSTOMMODIFIERS
+#if FEATURE_CUSTOMMODIFIERS
 			returnRequiredCustomModifiers = returnParameter.GetRequiredCustomModifiers();
 			Array.Reverse(returnRequiredCustomModifiers);
 

diff --git a/src/Castle.Core/DynamicProxy/Generators/GeneratorUtil.cs b/src/Castle.Core/DynamicProxy/Generators/GeneratorUtil.cs
@@ -81,7 +81,7 @@ bool IsReadOnly(ParameterInfo parameter)
 					return false;
 				}
 
-#if FEATURE_READ_CUSTOMMODIFIERS
+#if FEATURE_CUSTOMMODIFIERS
 				// This check allows to make the detection logic more robust on the platforms which support custom modifiers.
 				// The robustness is achieved by the fact, that usually the `IsReadOnlyAttribute` emitted by the compiler is internal to the assembly.
 				// Therefore, if clients use Reflection.Emit to create "a copy" of the methods with read-only members, they cannot re-use the existing attribute.