Merge pull request #142 from stoveproject/dev

dev to master
stoveproject · May 29, 2018 · 5ed7c89 · 5ed7c89
2 parents c458d29 + 068b6e2
commit 5ed7c89
Show file tree

Hide file tree

Showing 63 changed files with 142 additions and 386 deletions.
diff --git a/build.cake b/build.cake
@@ -31,7 +31,7 @@ var testProjects = new List<Tuple<string, string[]>>
                     new Tuple<string, string[]>("Stove.Tests.SampleApplication", new[] { "net461" }),
                     new Tuple<string, string[]>("Stove.Dapper.Tests", new[] { "net461" }),
                     new Tuple<string, string[]>("Stove.Hangfire.Tests", new[] { "netcoreapp2.0" }),
-                    new Tuple<string, string[]>("Stove.NHibernate.Tests", new[] { "net461" }),
+                    new Tuple<string, string[]>("Stove.NHibernate.Tests", new[] { "netcoreapp2.0" }),
                     new Tuple<string, string[]>("Stove.EntityFrameworkCore.Tests", new[] { "netcoreapp2.0" }),
                     new Tuple<string, string[]>("Stove.Serilog.Tests", new[] { "netcoreapp2.0" })
                 };

diff --git a/build.ps1 b/build.ps1
@@ -31,9 +31,9 @@ Param(
     [string[]]$ScriptArgs
 )
 
-$CakeVersion = "0.22.2"
+$CakeVersion = "0.27.2"
 $DotNetChannel = "LTS";
-$DotNetVersion = "2.0.0";
+$DotNetVersion = "2.1.200";
 $DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
 $NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
 

diff --git a/common.props b/common.props
@@ -1,27 +1,30 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.3.5</VersionPrefix>
+    <VersionPrefix>2.3.6</VersionPrefix>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://raw.githubusercontent.com/osoykan/Stove/master/stove.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/osoykan/Stove</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/osoykan/Stove/blob/master/LICENSE</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/osoykan/Stove</RepositoryUrl>
     <Authors>Oguzhan Soykan</Authors>
+    <Company>Stove Project</Company>
+    <ProductName>Stove</ProductName>
+    <Copyright>Copyright ©  2016</Copyright>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyTitleAttribute>true</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>true</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>true</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>true</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>true</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.7.6" PrivateAssets="All" />
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/Stove.Couchbase/Stove.Couchbase.csproj b/src/Stove.Couchbase/Stove.Couchbase.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CouchbaseNetClient" Version="2.5.4" />
-    <PackageReference Include="Linq2Couchbase" Version="1.3.3" />
+    <PackageReference Include="CouchbaseNetClient" Version="2.5.10" />
+    <PackageReference Include="Linq2Couchbase" Version="1.3.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Stove.Dapper/Properties/AssemblyInfo.cs b/src/Stove.Dapper/Properties/AssemblyInfo.cs
diff --git a/src/Stove.Dapper/Stove.Dapper.csproj b/src/Stove.Dapper/Stove.Dapper.csproj
@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>Stove</RootNamespace>
     <AssemblyName>Stove.Dapper</AssemblyName>
     <PackageId>Stove.Dapper</PackageId>
     <PackageTags>.net;framework;boilerplate;Dapper</PackageTags>
@@ -27,9 +28,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="1.50.4" />
+    <PackageReference Include="Dapper" Version="1.50.5" />
     <PackageReference Include="DapperExtensions.DotnetCore" Version="1.0.1" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
   </ItemGroup>
-
 </Project>
diff --git a/src/Stove.EntityFramework.Common/Stove.EntityFramework.Common.csproj b/src/Stove.EntityFramework.Common/Stove.EntityFramework.Common.csproj
@@ -5,6 +5,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <RootNamespace>Stove</RootNamespace>
     <AssemblyName>Stove.EntityFramework.Common</AssemblyName>
     <PackageId>Stove.EntityFramework.Common</PackageId>
     <PackageTags>asp.net;asp.net mvc;boilerplate;application framework;web framework;framework;domain driven design;EntityFrameworkCore;ORM;Entity Framework Core</PackageTags>

diff --git a/src/Stove.EntityFramework/Properties/AssemblyInfo.cs b/src/Stove.EntityFramework/Properties/AssemblyInfo.cs
diff --git a/src/Stove.EntityFramework/Stove.EntityFramework.csproj b/src/Stove.EntityFramework/Stove.EntityFramework.csproj
@@ -4,10 +4,10 @@
 
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
+    <RootNamespace>Stove</RootNamespace>
     <AssemblyName>Stove.EntityFramework</AssemblyName>
     <PackageId>Stove.EntityFramework</PackageId>
     <PackageTags>.net;framework;boilerplate;entityframework</PackageTags>
-    <RootNamespace>Stove</RootNamespace>
     <Description>EntityFramework integration for Stove.</Description>
   </PropertyGroup>
 
@@ -36,6 +36,5 @@
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Transactions" />
-  </ItemGroup>
-
+  </ItemGroup>   
 </Project>
diff --git a/src/Stove.EntityFrameworkCore/EntityFrameworkCore/StoveDbContext.cs b/src/Stove.EntityFrameworkCore/EntityFrameworkCore/StoveDbContext.cs
@@ -15,12 +15,10 @@
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata;
 
-using Stove.Collections.Extensions;
 using Stove.Commands;
 using Stove.Domain.Entities;
 using Stove.Domain.Entities.Auditing;
 using Stove.Domain.Uow;
-using Stove.Events;
 using Stove.Events.Bus;
 using Stove.Events.Bus.Entities;
 using Stove.Extensions;

diff --git a/src/Stove.EntityFrameworkCore/Stove.EntityFrameworkCore.csproj b/src/Stove.EntityFrameworkCore/Stove.EntityFrameworkCore.csproj
@@ -5,10 +5,10 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <RootNamespace>Stove</RootNamespace>
     <AssemblyName>Stove.EntityFrameworkCore</AssemblyName>
     <PackageId>Stove.EntityFrameworkCore</PackageId>
     <PackageTags>asp.net;asp.net mvc;boilerplate;application framework;web framework;framework;domain driven design;EntityFrameworkCore;ORM;Entity Framework Core</PackageTags>
-    <RootNamespace>Stove</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,8 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Stove.HangFire/Properties/AssemblyInfo.cs b/src/Stove.HangFire/Properties/AssemblyInfo.cs
diff --git a/src/Stove.HangFire/Stove.HangFire.csproj b/src/Stove.HangFire/Stove.HangFire.csproj
@@ -4,9 +4,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>Stove</RootNamespace>
     <AssemblyName>Stove.HangFire</AssemblyName>
     <PackageId>Stove.HangFire</PackageId>
-    <RootNamespace>Stove</RootNamespace>
     <Description>Hangfire integration for Stove.</Description>
     <PackageTags>.net;framework;boilerplate;hangfire</PackageTags>
   </PropertyGroup>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Hangfire.Core" Version="1.6.17" />
+    <PackageReference Include="Hangfire.Core" Version="1.6.19" />
   </ItemGroup>
- 
+
 </Project>
diff --git a/src/Stove.Mapster/Properties/AssemblyInfo.cs b/src/Stove.Mapster/Properties/AssemblyInfo.cs
diff --git a/src/Stove.Mapster/Stove.Mapster.csproj b/src/Stove.Mapster/Stove.Mapster.csproj
@@ -4,10 +4,10 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>Stove</RootNamespace>
     <AssemblyName>Stove.Mapster</AssemblyName>
     <PackageId>Stove.Mapster</PackageId>
     <PackageTags>.net;framework;boilerplate;mapster</PackageTags>
-    <RootNamespace>Stove</RootNamespace>
     <Description>Mapster automapping integration for Stove.</Description>
   </PropertyGroup>
 
@@ -28,6 +28,5 @@
 
   <ItemGroup>
     <PackageReference Include="Mapster" Version="3.1.8" />
-  </ItemGroup>
-
+  </ItemGroup>  
 </Project>
diff --git a/src/Stove.NHibernate/NHibernate/Interceptors/StoveNHibernateInterceptors.cs b/src/Stove.NHibernate/NHibernate/Interceptors/StoveNHibernateInterceptors.cs
@@ -12,7 +12,6 @@
 using Stove.Commands;
 using Stove.Domain.Entities;
 using Stove.Domain.Entities.Auditing;
-using Stove.Events;
 using Stove.Events.Bus;
 using Stove.Extensions;
 using Stove.Runtime.Session;

diff --git a/src/Stove.NHibernate/NHibernate/StoveNHibernateBootstrapper.cs b/src/Stove.NHibernate/NHibernate/StoveNHibernateBootstrapper.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Linq;
-
-using NHibernate.Util;
-
+
 using Stove.Bootstrapping;
-using Stove.Domain.Uow;
+using Stove.Extensions;
 using Stove.NHibernate.Configuration;
 using Stove.NHibernate.Interceptors;
 

diff --git a/src/Stove.NHibernate/Stove.NHibernate.csproj b/src/Stove.NHibernate/Stove.NHibernate.csproj
@@ -3,35 +3,32 @@
   <Import Project="..\..\common.props"></Import>
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Stove</RootNamespace>
     <AssemblyName>Stove.NHibernate</AssemblyName>
     <PackageId>Stove.NHibernate</PackageId>
-    <PackageTags>.net;framework;boilerplate;nhibernate</PackageTags>
+    <PackageTags>.net;core;framework;boilerplate;nhibernate</PackageTags>
     <RootNamespace>Stove</RootNamespace>
     <Description>NHibernate Orm integration for Stove.</Description>
   </PropertyGroup>
 
   <PropertyGroup>
-    <DocumentationFile>bin\Release\net461\Stove.NHibernate.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\netstandard2.0\Stove.NHibernate.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentNHibernate" Version="2.0.3" />
-    <PackageReference Include="NHibernate" Version="5.0.3" />
+    <PackageReference Include="FluentNHibernate" Version="2.1.2" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
+    <PackageReference Include="NHibernate" Version="5.1.2" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Stove\Stove.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Transactions" />
-  </ItemGroup>
+  </ItemGroup>   
 
   <ItemGroup>
-    <None Include="bin\Release\net461\Stove.NHibernate.pdb">
-      <PackagePath>lib/net461/</PackagePath>
+    <None Include="bin\Release\netstandard2.0\Stove.NHibernate.pdb">
+      <PackagePath>lib/netstandard2.0/</PackagePath>
       <Pack>true</Pack>
     </None>
   </ItemGroup>