feat(netcore2): add netcore2 with netstandard serialization

Author: jrgcubano

README.md

@@ -3,31 +3,31 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/3uk49dtw8u4hdt7w/branch/master?svg=true)](https://ci.appveyor.com/project/jrogalan/fluent-nhibernate/branch/master)
 [![NuGet](https://img.shields.io/nuget/v/FluentNHibernate.svg)](https://www.nuget.org/packages/FluentNHibernate)
 
+## What is FluentNHibernate?
 Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate. *Get your fluent on.*
 
+## Where can I get it?
 
-Getting started
----------------------------------------------
+Install using the [FluentNHibernate NuGet package](https://www.nuget.org/packages/FluentNHibernate):
+
+```
+dotnet add package FluentNHibernate
+```
+
+## How do I use it?
 
 * Read the [introduction](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Getting-started).
 * Get latest version from NuGet
-    - [.NET 4.6.1 with NHibernate 5.x](https://www.nuget.org/packages/FluentNHibernate)
+    - [.NETCore2.0, NETStandard2.0 or NET 4.6.1 with NHibernate 5.x](https://www.nuget.org/packages/FluentNHibernate)
     - [.NET 4.0 with NHibernate 4.x](https://www.nuget.org/packages/FluentNHibernate/2.0.3)
     - [.NET 3.5 with NHibernate 3 if you like it vintage](https://www.nuget.org/packages/FluentNHibernate.Net35)
 
 * Create your [first project](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Getting-started#wiki-yourfirstproject).
 
-Further reading
----------------------------------------------
+## Further reading
 
 Once you've followed the above, you can compare our [auto mapping](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Auto-mapping) to our [fluent interface](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Fluent-mapping) to see which suits your application, read through our [API documentation](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Fluent-configuration), or just see what's available for reading in our [wiki](https://github.com/FluentNHibernate/fluent-nhibernate/wiki).
 
-
-Building
----------------------------------------------
-
-Follow the instructions from the [wiki page](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Building) to build the project.
-
 Contributors
 ---------------------------------------------
 

build.cake

@@ -75,33 +75,41 @@ Task("Build")
 Task("Test")
     .IsDependentOn("Build")
     .Does(() =>
-    {    
-        var frameworks = new [] { "net461"};
-        foreach (var framework in frameworks)
-        {
-            var testAssemblies = $"./src/**/bin/{parameters.Configuration}/{framework}/*.Testing.dll";  
-            NUnit3(testAssemblies, new NUnit3Settings {
-              NoResults = true
-            });
+    {       
+        var unitProjects = GetFiles("./src/**/*.Testing.csproj");
+        var specProjects = GetFiles("./src/**/*.Specs.csproj");
+        var testProjects = unitProjects.Union(specProjects).ToArray();
 
-            testAssemblies = $"./src/**/bin/{parameters.Configuration}/{framework}/*.Specs.dll";  
-            MSpec(testAssemblies, new MSpecSettings {
-              Silent = true
-            });
-        }   
-        /* Tests not working in netcoreapp2.0
-        foreach(var project in TestProjects) 
-        {
-          var projectPath = File($"./src/{project}/{project}.csproj");
-          DotNetCoreTest(projectPath, new DotNetCoreTestSettings
-          {
-            Framework = "netcoreapp2.0",
-            NoBuild = true,
-            NoRestore = true,
-            Configuration = parameters.Configuration
-          });          
+        // foreach (var framework in frameworks)
+        // {
+        //     var testAssemblies = $"./src/**/bin/{parameters.Configuration}/{framework}/*.Testing.dll";  
+        //     NUnit3(testAssemblies, new NUnit3Settings {
+        //       NoResults = true
+        //     });
+
+        //     testAssemblies = $"./src/**/bin/{parameters.Configuration}/{framework}/*.Specs.dll";  
+        //     MSpec(testAssemblies, new MSpecSettings {
+        //       Silent = true
+        //     });
+        // }           
+        foreach(var project in testProjects) 
+        {                      
+            DotNetCoreTest(project.ToString(), new DotNetCoreTestSettings
+            {
+                Framework = "net461",
+                NoBuild = true,
+                NoRestore = true,
+                Configuration = parameters.Configuration
+            });          
+
+            DotNetCoreTest(project.ToString(), new DotNetCoreTestSettings
+            {
+                Framework = "netcoreapp2.0",
+                NoBuild = true,
+                NoRestore = true,
+                Configuration = parameters.Configuration
+            });          
         }
-        */
     });
 
 Task("Copy-Files")

src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>    
     <NoWarn>1591</NoWarn>
-    <PlatformTarget>AnyCpu</PlatformTarget>
   </PropertyGroup>
 
   <Import Project="..\Shared.msbuild" />
@@ -15,12 +14,8 @@
     <ProjectReference Include="..\FluentNHibernate\FluentNHibernate.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-    <PackageReference Include="NHibernate" Version="5.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+  <ItemGroup>
     <PackageReference Include="NHibernate" Version="5.1.0" />
   </ItemGroup>
-
+  
 </Project>

src/FluentNHibernate.Specs/Automapping/AutoPersistenceModelSpecs.cs

@@ -5,7 +5,6 @@
 using FluentNHibernate.Automapping;
 using FluentNHibernate.Cfg;
 using FluentNHibernate.Cfg.Db;
-using FluentNHibernate.MappingModel;
 using FluentNHibernate.MappingModel.ClassBased;
 using FluentNHibernate.Specs.Automapping.Fixtures;
 using FluentNHibernate.Specs.ExternalFixtures;
@@ -48,8 +47,10 @@ public class when_the_automapper_is_told_to_map_a_single_type
     public class when_the_automapper_is_ran_to_completion
     {
         Establish context = () =>
+
             setup = Fluently.Configure()
-                .Database(SQLiteConfiguration.Standard.InMemory)
+                .Database(
+                    CreateStandardInMemoryConfiguration())
                 .Mappings(x => x.AutoMappings.Add(AutoMap.Source(new StubTypeSource(typeof(Entity)))));
 
         Because of = () =>
@@ -60,6 +61,18 @@ public class when_the_automapper_is_ran_to_completion
 
         static FluentConfiguration setup;
         static Exception ex;
+
+        private static IPersistenceConfigurer CreateStandardInMemoryConfiguration()
+        {
+#if NETFX
+            var configuration = SQLiteConfiguration.Standard.InMemory();
+#endif
+
+#if NETCORE
+            var configuration = MsSqliteConfiguration.Standard.InMemory();
+#endif
+            return configuration;
+        }
     }
 
     public class when_the_automapper_is_told_to_map_an_inheritance_hierarchy

src/FluentNHibernate.Specs/Conventions/ComponentConventionSpecs.cs

@@ -1,10 +1,10 @@
-using System.Linq;
+using FluentAssertions;
 using FluentNHibernate.Conventions;
 using FluentNHibernate.Conventions.Instances;
 using FluentNHibernate.Mapping;
 using FluentNHibernate.MappingModel.ClassBased;
 using Machine.Specifications;
-using FluentAssertions;
+using System.Linq;
 
 namespace FluentNHibernate.Specs.Conventions
 {
@@ -14,26 +14,25 @@ public class when_specifying_component_convention
         {
             model = new FluentNHibernate.PersistenceModel();
             model.Conventions.Add<ComponentConvention>();
-            model.Add(new EntityWithComponentMap());
             model.Add(new AddressMap());
+            model.Add(new EntityWithComponentMap());
         };
 
         Because of = () =>
         {
-            mapping = model.BuildMappingFor<EntityWithComponent>();
+             mapping = model.BuildMappingFor<EntityWithComponent>();
         };
 
         It should_be_able_to_specify_column_name = () =>
         {
-            mapping.Components.First()
-                .Properties.Single(x => x.Name == "Count")
-                .Columns.FirstOrDefault().Name.Should().Be("Count");
-                // TODO (we need to fix this test, is not working as expected)
-                // .Columns.FirstOrDefault().Name.Should().Be("different");
+            var property = mapping.Components.First()
+                .Properties.Single(x => x.Name == "Count");
+
+            property.Columns.FirstOrDefault().Name.Should().Be("different");
         };
 
-        static FluentNHibernate.PersistenceModel model;
-        static ClassMapping mapping;
+        private static FluentNHibernate.PersistenceModel model;
+        private static ClassMapping mapping;
     }
 
     public class EntityWithComponent
@@ -50,7 +49,7 @@ public class Address
         public string Line2 { get; set; }
     }
 
-    class AddressMap: ComponentMap<Address>
+    internal class AddressMap : ComponentMap<Address>
     {
         public AddressMap()
         {
@@ -60,20 +59,19 @@ public AddressMap()
         }
     }
 
-    public class ComponentConvention: IComponentConvention
+    public class ComponentConvention : IComponentConvention
     {
-
         public void Apply(IComponentInstance instance)
         {
             if (instance.Type == typeof(Address))
             {
-                instance.Properties.First(p => p.Type.GetType() == typeof(int))
-                    .Column("different");
+                var type = instance.Properties.First(p => p.Type == typeof(int));
+                type.Column("different");
             }
         }
     }
 
-    public class EntityWithComponentMap: ClassMap<EntityWithComponent>
+    public class EntityWithComponentMap : ClassMap<EntityWithComponent>
     {
         public EntityWithComponentMap()
         {
@@ -82,4 +80,4 @@ public EntityWithComponentMap()
             Component(x => x.Address);
         }
     }
-}
+}

src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <NoWarn>1591</NoWarn>
-    <PlatformTarget>AnyCpu</PlatformTarget>
     <DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp2.0'">Full</DebugType>
   </PropertyGroup>
 
@@ -14,11 +13,6 @@
     <ProjectReference Include="..\FluentNHibernate\FluentNHibernate.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\FluentNHibernate.Specs.ExternalFixtures\FluentNHibernate.Specs.ExternalFixtures.csproj" />
-    <ProjectReference Include="..\FluentNHibernate\FluentNHibernate.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="NHibernate" Version="5.1.0" />

src/FluentNHibernate.Testing/App.config

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <startup>
     <supportedRuntime version="v2.0.50727"></supportedRuntime>
@@ -12,22 +10,9 @@
   </appSettings>
   <connectionStrings>
     <add name="main" connectionString="connection string" />
-  </connectionStrings>
-  <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
-      <parameters>
-        <parameter value="v13.0" />
-      </parameters>
-    </defaultConnectionFactory>
-    <providers>
-      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-    </providers>
-  </entityFramework>
+  </connectionStrings> 
   <system.data>
     <DbProviderFactories>
-      <remove invariant="System.Data.SQLite.EF6" />
-      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
       <remove invariant="System.Data.SQLite" />
       <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
     </DbProviderFactories>

src/FluentNHibernate.Testing/AutoMapping/BaseAutoMapFixture.cs

@@ -1,8 +1,8 @@
 using System;
 using FluentNHibernate.Automapping;
-using FluentNHibernate.Cfg.Db;
 using NHibernate.Cfg;
 using NUnit.Framework;
+using static FluentNHibernate.Testing.Cfg.SQLiteFrameworkConfigurationFactory;
 
 namespace FluentNHibernate.Testing.Automapping
 {
@@ -16,8 +16,7 @@ public void CreateDatabaseCfg()
         {
             cfg = new Configuration();
 
-            SQLiteConfiguration.Standard
-                .InMemory()
+            CreateStandardInMemoryConfiguration()
                 .ConfigureProperties(cfg);
         }
 

src/FluentNHibernate.Testing/Cfg/Db/ConnectionStringBuilderTester.cs

@@ -22,19 +22,23 @@ public void CanExplicitlySetConnectionString()
             builder.ConnectionString.ShouldEqual("a string");
         }
 
+#if NETFX
         [Test]
         public void ConnectionStringSetFromAppSetting()
         {
             builder.FromAppSetting("connectionString");
             builder.ConnectionString.ShouldContain("a-connection-string");
         }
+#endif
 
+#if NETFX
         [Test]
         public void ConnectionStringSetFromConnectionStrings()
         {
             builder.FromConnectionStringWithKey("main");
             builder.ConnectionString.ShouldContain("connection string");
         }
+#endif
 
         private class ConnectionStringBuilderDouble : ConnectionStringBuilder
         {

src/FluentNHibernate.Testing/Cfg/Db/DB2400ConfigurationTester.cs

@@ -39,6 +39,7 @@ public void ConnectionStringSetExplicitly()
                 .ToProperties().ShouldContain("connection.connection_string", "value");
         }
 
+#if NETFX
         [Test]
         public void ConnectionStringSetFromAppSetting()
         {
@@ -47,7 +48,9 @@ public void ConnectionStringSetFromAppSetting()
                     .FromAppSetting("connectionString"))
                 .ToProperties().ShouldContain("connection.connection_string", "a-connection-string");
         }
+#endif
 
+#if NETFX
         [Test]
         public void ConnectionStringSetFromConnectionStrings()
         {
@@ -56,6 +59,7 @@ public void ConnectionStringSetFromConnectionStrings()
                     .FromConnectionStringWithKey("main"))
                 .ToProperties().ShouldContain("connection.connection_string", "connection string");
         }
+#endif
 
         [Test]
         public void ShouldBeAbleToSpecifyConnectionStringDirectly()