FEATURE_TEST_COM protects too much in RhinoMocksTestCase

Having dealt with some COM interop tests, I noticed that `FEATURE_TEST
_COM` in `RhinoMocksTestCase` guards against tests that aren't COM-
specific at all.

Minimizing the span of code guarded by this conditional symbol reveals
some tests that won't work on .NET Standard / Core 1.x but for reasons
other than COM (missing `DataSet` API, and different reflection APIs).
Let's fix those.

Author: stakx

README.md

@@ -83,6 +83,7 @@ Symbol                              | NET35              | NET40              |
 `FEATURE_SYSTEM_CONFIGURATION`      | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `FEATURE_TARGETEXCEPTION`           | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `FEATURE_TEST_COM`                  | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
+`FEATURE_TEST_DATASET`              | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `FEATURE_TEST_PEVERIFY`                  | :white_check_mark:    | :white_check_mark:    | :white_check_mark:    | :no_entry_sign:
 `FEATURE_TEST_SERILOGINTEGRATION`   | :no_entry_sign:    | :no_entry_sign:    | :white_check_mark: | :white_check_mark:
 ---                                 |                    |                    |                    | 
@@ -110,5 +111,6 @@ Symbol                              | NET35              | NET40              |
 * `FEATURE_SYSTEM_CONFIGURATION` - enables features that use System.Configuration and the ConfigurationManager.
 * `FEATURE_TARGETEXCEPTION` - enabled catching a `TargetException`. `System.Reflection.TargetException` is implemented by .NET Core but not exposed by corefx.
 * `FEATURE_TEST_COM` - enables COM Interop tests.
+* `FEATURE_TEST_DATASET` - enables tests that involve `System.Data.DataSet`s.
 * `FEATURE_TEST_PEVERIFY` - enables verification of dynamic assemblies using PEVerify during tests. (Only defined on Windows builds since Windows is currently the only platform where PEVerify is available.)
 * `FEATURE_TEST_SERILOGINTEGRATION` - enables Serilog integration tests.

buildscripts/common.props

@@ -43,7 +43,7 @@
 		<DiagnosticsConstants>DEBUG</DiagnosticsConstants>
 		<NetStandard13Constants>TRACE;FEATURE_NETCORE_REFLECTION_API;FEATURE_TEST_SERILOGINTEGRATION</NetStandard13Constants>
 		<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>
+		<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_DATASET;FEATURE_TEST_SERILOGINTEGRATION</CommonDesktopClrConstants>
 		<DesktopClrConstants Condition="'$(OS)'=='Unix'">$(CommonDesktopClrConstants)</DesktopClrConstants>
 		<DesktopClrConstants Condition="'$(OS)'=='Windows_NT'">$(CommonDesktopClrConstants);FEATURE_TEST_PEVERIFY</DesktopClrConstants>
 	</PropertyGroup>

src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj

@@ -39,6 +39,7 @@
 		<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
 		<PackageReference Include="System.ComponentModel" Version="4.3.0" />
 		<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
+		<PackageReference Include="System.Runtime.CompilerServices.VisualC" Version="4.3.0" />
 		<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
 		<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
 		<PackageReference Include="System.Xml.XPath" Version="4.3.0" />

src/Castle.Core.Tests/Castle.Core.Tests.csproj

@@ -59,6 +59,7 @@
 		<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
 		<PackageReference Include="System.ComponentModel" Version="4.3.0" />
 		<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
+		<PackageReference Include="System.Runtime.CompilerServices.VisualC" Version="4.3.0" />
 		<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
 		<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
 		<PackageReference Include="System.Xml.XPath" Version="4.3.0" />

src/Castle.Core.Tests/DynamicProxy.Tests/RhinoMocksTestCase.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if FEATURE_TEST_COM
 namespace Castle.DynamicProxy.Tests
 {
 	using System;
@@ -109,11 +108,13 @@ public void CanGetCorrectValuesFromIntPtr()
 			Assert.AreEqual(IntPtr.Zero, buffer);
 		}
 
+#if FEATURE_TEST_DATASET
 		[Test]
 		public void CanProxyDataSet()
 		{
 			generator.CreateClassProxy(typeof (DataSet), new Type[0], new StandardInterceptor());
 		}
+#endif
 
 #if FEATURE_CUSTOMMODIFIERS
 		private Type iHaveMethodWithModOptsType;
@@ -182,7 +183,11 @@ public void GenerateDynamicAssemblyHavingModopts()
 				},
 				callingConvention: CallingConventions.Standard);
 
+#if FEATURE_LEGACY_REFLECTION_API
 			var iHaveMethodWithModOptsType = typeBuilder.CreateType();
+#else
+			var iHaveMethodWithModOptsType = typeBuilder.CreateTypeInfo().AsType();
+#endif
 
 #if FEATURE_ASSEMBLYBUILDER_SAVE && FEATURE_TEST_PEVERIFY
 			// Let's persist and PE-verify the dynamic assembly before it gets used in tests:
@@ -295,13 +300,15 @@ public void ProxyInternalMethod()
 			Assert.AreEqual("Foo ", logging.LogContents);
 		}
 
+#if FEATURE_TEST_COM
 		[Test]
 		public void ProxyingComInteraces()
 		{
 			var o = generator
 				.CreateInterfaceProxyWithoutTarget(typeof (IComServiceProvider), new StandardInterceptor());
 			Assert.IsNotNull(o);
 		}
+#endif
 
 		[Test]
 		public void ProxyingGenericClassWithGenericClassConstraint()
@@ -494,4 +501,3 @@ public interface IStore1
 		R[] TestMethod<R>();
 	}
 }
-#endif