Convert NHibernate.DomainModel to .NET Core multi-target project

Author: hazzik

src/NHibernate.DomainModel/Compat/NonSerializedAttribute.cs

@@ -0,0 +1,10 @@
+#if !FEATURE_SERIALIZATION && NETSTANDARD
+// ReSharper disable once CheckNamespace
+namespace System
+{
+	[AttributeUsage(AttributeTargets.Field, Inherited = false)]
+	internal sealed class NonSerializedAttribute : Attribute
+	{
+	}
+}
+#endif

src/NHibernate.DomainModel/Compat/SerializableAttribute.cs

@@ -0,0 +1,10 @@
+#if !FEATURE_SERIALIZATION && NETSTANDARD
+// ReSharper disable once CheckNamespace
+namespace System
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Delegate, Inherited = false)]
+    internal sealed class SerializableAttribute : Attribute
+    {
+    }
+}
+#endif

src/NHibernate.DomainModel/Foo.cs

@@ -368,7 +368,11 @@ public LifecycleVeto OnSave(ISession s)
 			_component.Glarch = new Glarch();
 			_dependent = new Fee();
 			_dependent.Fi = "belongs to foo # " + Key;
+#if !NETSTANDARD
 			_locale = Thread.CurrentThread.CurrentCulture;
+#else
+			_locale = CultureInfo.CurrentCulture;
+#endif
 			return LifecycleVeto.NoVeto;
 		}
 

src/NHibernate.DomainModel/Master.cs

@@ -45,7 +45,9 @@ public ISet<Detail> Details
 			get { return _details; }
 			set
 			{
+#if !NETSTANDARD
 				Trace.WriteLine("Details assigned");
+#endif
 				_details = value;
 			}
 		}

src/NHibernate.DomainModel/NHSpecific/NullableInt32.cs

@@ -6,7 +6,10 @@ namespace NHibernate.DomainModel.NHSpecific
 	/// <summary>
 	/// A nullable type that wraps an <see cref="Int32"/> value.
 	/// </summary>
-	[TypeConverter(typeof(NullableInt32Converter)), Serializable()]
+#if !NETSTANDARD
+	[TypeConverter(typeof(NullableInt32Converter))]
+#endif
+	[Serializable]
 	public struct NullableInt32 : IFormattable, IComparable
 	{
 		public static readonly NullableInt32 Default = new NullableInt32();

src/NHibernate.DomainModel/NHSpecific/NullableInt32Converter.cs

@@ -1,3 +1,4 @@
+#if !NETSTANDARD
 using System;
 using System.Collections;
 using System.ComponentModel;
@@ -96,4 +97,5 @@ public override bool GetPropertiesSupported(ITypeDescriptorContext context)
 			return true;
 		}
 	}
-}
+}
+#endif

src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

@@ -15,6 +15,14 @@
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <DefineConstants>$(DefineConstants);NETSTANDARD;FEATURE_DATA_GETCOLUMNSCHEMA;FEATURE_INTERNALIZE_IESI;FEATURE_NETCORE_ICLONEABLE_API;FEATURE_NETCORE_REFLECTION_API</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <DefineConstants>$(DefineConstants);NET_4_0;FEATURE_ADONET_SQLCOMMANDSET;FEATURE_APPDOMAIN;FEATURE_ASSEMBLYBUILDER_SAVE;FEATURE_BINDINGLIST;FEATURE_CODEDOM;FEATURE_DATA_CLOSE;FEATURE_DATA_GETSCHEMATABLE;FEATURE_DBPROVIDERFACTORIES;FEATURE_ODBC_OLEDB;FEATURE_REFLECTEDTYPE;FEATURE_REMOTING;FEATURE_SECURITY_PERMISSIONS;FEATURE_SERIALIZATION;FEATURE_STRING_INTERN;FEATURE_SYSTEM_CONFIGURATION;FEATURE_SYSTEM_SERVICEMODEL;FEATURE_SYSTEM_TRANSACTIONS;FEATURE_WEB_SESSION_CONTEXT;FEATURE_XML_SCHEMAS;FEATURE_XML_VALIDATIONEVENTHANDLER</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Remove="**\*.g" />
   </ItemGroup>
@@ -46,14 +54,6 @@
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD;FEATURE_DATA_GETCOLUMNSCHEMA;FEATURE_INTERNALIZE_IESI;FEATURE_NETCORE_ICLONEABLE_API;FEATURE_NETCORE_REFLECTION_API</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>$(DefineConstants);NET_4_0;FEATURE_ADONET_SQLCOMMANDSET;FEATURE_APPDOMAIN;FEATURE_ASSEMBLYBUILDER_SAVE;FEATURE_BINDINGLIST;FEATURE_CODEDOM;FEATURE_DATA_CLOSE;FEATURE_DATA_GETSCHEMATABLE;FEATURE_DBPROVIDERFACTORIES;FEATURE_LEGACY_REFLECTION_API;FEATURE_ODBC_OLEDB;FEATURE_REFLECTEDTYPE;FEATURE_REMOTING;FEATURE_SECURITY_PERMISSIONS;FEATURE_SERIALIZATION;FEATURE_STRING_INTERN;FEATURE_SYSTEM_CONFIGURATION;FEATURE_SYSTEM_SERVICEMODEL;FEATURE_SYSTEM_TRANSACTIONS;FEATURE_WEB_SESSION_CONTEXT;FEATURE_XML_SCHEMAS;FEATURE_XML_VALIDATIONEVENTHANDLER</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <PackageReference Include="Iesi.Collections" Version="4.0.1.4000" />
     <Reference Include="System.Data" />