Merge pull request #119 from jeremymeng/netcore

Port DictionaryAdapter and tests to .Net Core

Author: jonorossi

README.md

@@ -42,12 +42,16 @@ Symbol                              | NET35              | NET40              |
 ----------------------------------- | ------------------ | ------------------ | ------------------ | ------------------
 `FEATURE_APPDOMAIN`                 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `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_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:
+`FEATURE_IDATAERRORINFO`            | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
+`FEATURE_ISUPPORTINITIALIZE`        | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `FEATURE_LEGACY_REFLECTION_API`     | :white_check_mark: | :white_check_mark: | :no_entry_sign:    | :no_entry_sign:
-`FEATURE_NETCORE_CONVERTER_API`     | :no_entry_sign:    | :no_entry_sign:    | :no_entry_sign:    | :white_check_mark:
+`FEATURE_LISTSORT`                  | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `FEATURE_NETCORE_REFLECTION_API`    | :no_entry_sign:    | :no_entry_sign:    | :no_entry_sign:    | :white_check_mark:
 `FEATURE_REMOTING`                  | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
 `FEATURE_SECURITY_PERMISSIONS`      | :white_check_mark: | :white_check_mark: | :white_check_mark: | :no_entry_sign:
@@ -68,17 +72,21 @@ Symbol                              | NET35              | NET40              |
 
 * `FEATURE_APPDOMAIN` - enables support for features that make use of an AppDomain in the host.
 * `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_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().
+* `FEATURE_IDATAERRORINFO` - enables code that depends on System.ComponentModel.IDataErrorInfo.
+* `FEATURE_ISUPPORTINITIALIZE` - enables support for features that make use of System.ComponentModel.ISupportInitialize.
 * `FEATURE_LEGACY_REFLECTION_API` - provides a shim for .NET 3.5/4.0 that emulates the `TypeInfo` API available in .NET 4.5+ and .NET Core.
-* `FEATURE_NETCORE_CONVERTER_API` - provides shims to implement missing Converter in .NET Core.
+* `FEATURE_LISTSORT` - enables support for features that make use of System.ComponentModel.ListSortDescription.
 * `FEATURE_NETCORE_REFLECTION_API` - provides shims to implement missing functionality in .NET Core that has no alternatives.
 * `FEATURE_REMOTING` - supports remoting on various types including inheriting from MarshalByRefObject.
 * `FEATURE_SECURITY_PERMISSIONS` - enables the use of CAS and Security[Critical|SafeCritical|Transparent].
 * `FEATURE_SERIALIZATION` - enables support for serialization of dynamic proxies and other types.
-* `FEATURE_SMTP` - providers the email sender abstraction and implementation.
+* `FEATURE_SMTP` - provides the email sender abstraction and implementation.
 * `FEATURE_STRONGNAME` - supports a strong named `Castle.Core.dll` assembly.
 * `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.

Settings.proj

@@ -57,10 +57,15 @@ limitations under the License.
 		<AdditionalDefineConstants></AdditionalDefineConstants>
 		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_APPDOMAIN</AdditionalDefineConstants>
 		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_ASSEMBLYBUILDER_SAVE</AdditionalDefineConstants>
+		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_BINDINGLIST</AdditionalDefineConstants>
+		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_DICTIONARYADAPTER_XML</AdditionalDefineConstants>
 		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_EMIT_CUSTOMMODIFIERS</AdditionalDefineConstants>
 		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_EVENTLOG</AdditionalDefineConstants>
 		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_GAC</AdditionalDefineConstants>
 		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_GET_REFERENCED_ASSEMBLIES</AdditionalDefineConstants>
+		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_IDATAERRORINFO</AdditionalDefineConstants>
+		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_ISUPPORTINITIALIZE</AdditionalDefineConstants>
+		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_LISTSORT</AdditionalDefineConstants>
 		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_REMOTING</AdditionalDefineConstants>
 		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_SECURITY_PERMISSIONS</AdditionalDefineConstants>
 		<AdditionalDefineConstants>$(AdditionalDefineConstants) FEATURE_SERIALIZATION</AdditionalDefineConstants>

src/Castle.Core.Tests/BaseTestCaseTestCase.cs

@@ -49,10 +49,8 @@ public void TearDown_DoesNotSaveAnything_IfNoProxyGenerated()
 			Assert.IsFalse(File.Exists(path));
 		}
 
+#if FEATURE_ASSEMBLYBUILDER_SAVE
 		[Test]
-#if SILVERLIGHT
-		[Ignore("Cannot do in Silverlight")]
-#endif
 #if __MonoCS__
 		[Ignore("Expected: True  But was: False")]
 #endif
@@ -69,6 +67,7 @@ public void TearDown_SavesAssembly_IfProxyGenerated()
 			base.TearDown();
 			Assert.IsTrue(File.Exists(path));
 		}
+#endif
 
 		private void FindVerificationErrors()
 		{
@@ -91,6 +90,7 @@ private void FindVerificationErrors()
 			base.TearDown();
 		}
 
+#if FEATURE_ASSEMBLYBUILDER_SAVE
 		[Test]
 #if SILVERLIGHT
 		[Ignore("Cannot do in Silverlight")]
@@ -106,6 +106,7 @@ public void TearDown_FindsVerificationErrors()
 			StringAssert.Contains("PeVerify reported error(s)", ex.Message);
 			StringAssert.Contains("fall through end of the method without returning", ex.Message);
 		}
+#endif
 
 		[Test]
 		public void DisableVerification_DisablesVerificationForTestCase()

src/Castle.Core.Tests/BasicClassProxyTestCase.cs

@@ -89,7 +89,11 @@ public void ProxyForNonPublicClass()
 			var type = Type.GetType("System.AppDomainInitializerInfo, mscorlib");
 			var exception = Assert.Throws<GeneratorException>(() => generator.CreateClassProxy(type, new StandardInterceptor()));
 			Assert.AreEqual(
+#if FEATURE_STRONGNAME
 				"Can not create proxy for type System.AppDomainInitializerInfo because it is not accessible. Make it public, or internal and mark your assembly with [assembly: InternalsVisibleTo(\"DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7\")] attribute, because assembly mscorlib is strong-named.",
+#else
+				"Can not create proxy for type System.AppDomainInitializerInfo because it is not accessible. Make it public, or internal and mark your assembly with [assembly: InternalsVisibleTo(\"DynamicProxyGenAssembly2\")] attribute, because assembly mscorlib is strong-named.",
+#endif
 				exception.Message);
 		}
 

src/Castle.Core.Tests/BasicInterfaceProxyTestCase.cs

@@ -252,6 +252,7 @@ public void Cannot_proxy_inaccessible_interface()
 				ex.Message);
 		}
 
+#if FEATURE_STRONGNAME
 		[Test]
 		public void Cannot_proxy_generic_interface_with_inaccessible_type_argument()
 		{
@@ -261,6 +262,7 @@ public void Cannot_proxy_generic_interface_with_inaccessible_type_argument()
 				"Can not create proxy for type System.Collections.Generic.IList`1[[Castle.DynamicProxy.Tests.BasicInterfaceProxyTestCase+PrivateInterface, Castle.Core.Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc]] because type Castle.DynamicProxy.Tests.BasicInterfaceProxyTestCase+PrivateInterface is not accessible. Make it public, or internal",
 				ex.Message);
 		}
+#endif
 
 		[Test]
 		public void Cannot_proxy_generic_interface_with_type_argument_that_has_inaccessible_type_argument()

src/Castle.Core.Tests/Components.DictionaryAdapter.Tests/CustomAssert.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if !SILVERLIGHT // Until support for other platforms is verified
+#if FEATURE_DICTIONARYADAPTER_XML
 namespace Castle.Components.DictionaryAdapter.Tests
 {
 	using System;

src/Castle.Core.Tests/Components.DictionaryAdapter.Tests/DictionaryAdapterFactoryTestCase.cs

@@ -18,6 +18,7 @@ namespace Castle.Components.DictionaryAdapter.Tests
 	using System.Collections;
 	using System.Collections.Generic;
 	using System.Linq;
+	using System.Reflection;
 
 	using CastleTests.Components.DictionaryAdapter.Tests;
 
@@ -429,7 +430,7 @@ public void ReadAdapter_WithDefaultConversions_WorksFine()
 			dictionary["Double"] = string.Format("{0}", 3.14D);
 			dictionary["Decimal"] = string.Format("{0}", 100M);
 			dictionary["String"] = "Hello World";
-			dictionary["DateTime"] = now.ToShortDateString();
+			dictionary["DateTime"] = now.ToString("d");
 			dictionary["Guid"] = guid.ToString();
 
 			var conversions = factory.GetAdapter<IConversions>(dictionary);
@@ -468,7 +469,7 @@ public void UpdateAdapter_WithDefaultConversions_WorksFine()
 #if SILVERLIGHT // SL impl limitation
 			Assert.AreEqual(today.ToString(), dictionary["DateTime"]);
 #else
-			Assert.AreEqual(today.ToShortDateString(), dictionary["DateTime"]);
+			Assert.AreEqual(today.ToString("d"), dictionary["DateTime"]);
 #endif
 			Assert.AreEqual(guid.ToString(), dictionary["Guid"]);
 			Assert.AreEqual("2124751012,22", dictionary["Phone"]);
@@ -484,7 +485,7 @@ public void ReadAdapter_WithDefaultNullableConversions_WorksFine()
 			dictionary["NullFloat"] = string.Format("{0}", 98.6);
 			dictionary["NullDouble"] = string.Format("{0}", 3.14D);
 			dictionary["NullDecimal"] = string.Format("{0}", 100M);
-			dictionary["NullDateTime"] = now.Value.ToShortDateString();
+			dictionary["NullDateTime"] = now.Value.ToString("d");
 			dictionary["NullGuid"] = guid.ToString();
 
 			var conversions = factory.GetAdapter<IConversions>(dictionary);
@@ -517,7 +518,7 @@ public void UpdateAdapter_WithDefaultNullableConversions_WorksFine()
 #if SILVERLIGHT // SL impl limitation
 			Assert.AreEqual(today.Value.ToString(), dictionary["NullDateTime"]);
 #else
-			Assert.AreEqual(today.Value.ToShortDateString(), dictionary["NullDateTime"]);
+			Assert.AreEqual(today.Value.ToString("d"), dictionary["NullDateTime"]);
 #endif
 			Assert.AreEqual(guid.ToString(), dictionary["NullGuid"]);
 		}
@@ -767,7 +768,7 @@ public void WillNotPropagatePropertyChangedEventWhenNestedPropertyChanged()
 			container.Item.Name = "Craig";
 		}
 
-#if !SILVERLIGHT //no BindingList in Silverlight
+#if FEATURE_BINDINGLIST
 
 		[Test]
 		public void WillPropagatePropertyChangedEventWhenBindingListPropertyChanged()
@@ -1123,6 +1124,7 @@ public void CanInitializeTheDictionaryAdapterWithAttributes()
 			Assert.IsTrue(((IDictionaryAdapter)name).Validators.OfType<TestDictionaryValidator>().Any());
 		}
 
+#if FEATURE_IDATAERRORINFO
 		[Test]
 		public void CanValidateAndObtainDataErrorInformation()
 		{
@@ -1188,6 +1190,7 @@ public void WillNotifyPropertyChangesOnValidateGroup()
 			name.LastName = "Monster";
 			Assert.IsTrue(notifyCalled);
 		}
+#endif
 
 		[Test]
 		public void CanCreateDictionaryAdapterFromExistingAdapter()
@@ -1257,7 +1260,7 @@ public void CanGetInterfacePropertyOnDemand()
 			Assert.IsNotNull(container.Phone);
 		}
 
-#if !SILVERLIGHT //no BindingList in Silverlight
+#if FEATURE_BINDINGLIST
 
 		[Test]
 		public void CanAddBindingListItemsOnDemand()
@@ -1321,7 +1324,7 @@ public void CanGetNewGuidPropertyOnDemand()
 		public void CanDetermineTheAdaptedInterface()
 		{
 			var person = factory.GetAdapter<IPerson>(dictionary);
-			var type = person.GetType().GetCustomAttributes(
+			var type = person.GetType().GetTypeInfo().GetCustomAttributes(
 				typeof(DictionaryAdapterAttribute), false).Cast<DictionaryAdapterAttribute>()
 				.FirstOrDefault();
 			Assert.IsNotNull(type);

src/Castle.Core.Tests/Components.DictionaryAdapter.Tests/IAddress.cs

@@ -17,7 +17,10 @@ namespace Castle.Components.DictionaryAdapter.Tests
 	using System.ComponentModel;
 
 	//[PropagateNotifications(false)]
-	public interface IAddress : IEditableObject, INotifyPropertyChanged, IDataErrorInfo
+	public interface IAddress : IEditableObject, INotifyPropertyChanged
+#if FEATURE_IDATAERRORINFO
+		, IDataErrorInfo
+#endif
 	{
 		string Line1 { get; set; }
 		string Line2 { get; set; }

src/Castle.Core.Tests/Components.DictionaryAdapter.Tests/IItemContainer.cs

@@ -43,7 +43,7 @@ public interface IItemContainer<TItem> : IDictionaryAdapter, IDictionaryCreate,
 
 		IList<TItem> GenericItems { get; set; }
 
-#if !SILVERLIGHT
+#if FEATURE_BINDINGLIST
 		BindingList<TItem> Bindingtems { get; set; }
 #endif
 

src/Castle.Core.Tests/Components.DictionaryAdapter.Tests/IPerson.cs

@@ -19,7 +19,10 @@ namespace Castle.Components.DictionaryAdapter.Tests
 	using System.ComponentModel;
 
 	[MultiLevelEdit]
-	public interface IPerson : IDictionaryAdapter, IEditableObject, IDictionaryNotify, IDataErrorInfo
+	public interface IPerson : IDictionaryAdapter, IEditableObject, IDictionaryNotify
+#if FEATURE_IDATAERRORINFO
+		, IDataErrorInfo
+#endif
 	{
 		[RemoveIf(null)]
 		string Name { get; set; }