Merge pull request #49 from stoveproject/dev

dev to master
stoveproject · Jul 23, 2017 · 5dfe6d8 · 5dfe6d8
2 parents 77c236a + 8b7d1dd
commit 5dfe6d8
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 54 deletions.
diff --git a/build.cake b/build.cake
@@ -84,7 +84,8 @@ Task("Build")
     .IsDependentOn("Restore-NuGet-Packages")
     .Does(() =>
     {
-        DotNetBuild(solution, c=> c.Configuration = configuration);
+        MSBuild(solution, new MSBuildSettings(){Configuration = configuration}
+                                               .WithProperty("SourceLinkCreate","true"));
     });
 
 Task("Run-Unit-Tests")
@@ -98,23 +99,9 @@ Task("Run-Unit-Tests")
            XUnit2(testFile.ToString(), new XUnit2Settings { });
         }
     });
-
-Task("Coverage")
-    .IsDependentOn("Run-Unit-Tests")
-    .Does(()=>
-    {
-      Information("Coverage...");
-    });
-
-Task("Analyse")
-    .IsDependentOn("Coverage")
-    .Does(()=>
-    {
-        Information("Sonar running!...");
-    });
-
+
 Task("Pack")
-    .IsDependentOn("Analyse")
+    .IsDependentOn("Run-Unit-Tests")
     .Does(() =>
     {
         var nupkgFiles = GetFiles(nupkgRegex);

diff --git a/common.props b/common.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.1.2</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://raw.githubusercontent.com/osoykan/Stove/master/stove.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/osoykan/Stove</PackageProjectUrl>

diff --git a/src/Stove.Dapper/Stove.Dapper.csproj b/src/Stove.Dapper/Stove.Dapper.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="bin\Release\net452\Stove.Dapper.pdb">
+    <None Include="bin\Release\net452\Stove.Dapper.pdb">
       <PackagePath>lib/net452/</PackagePath>
       <Pack>true</Pack>
     </None>
@@ -24,18 +24,12 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="1.50.2" />
-    <PackageReference Include="DapperExtensions" Version="1.5.0" />
+    <PackageReference Include="DapperExtensions" Version="1.6.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.ComponentModel.DataAnnotations.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Stove.EntityFramework/Stove.EntityFramework.csproj b/src/Stove.EntityFramework/Stove.EntityFramework.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="bin\Release\net452\Stove.EntityFramework.pdb">
+    <None Include="bin\Release\net452\Stove.EntityFramework.pdb">
       <PackagePath>lib/net452/</PackagePath>
       <Pack>true</Pack>
     </None>
@@ -24,16 +24,12 @@
 
   <ItemGroup>
     <PackageReference Include="EntityFramework" Version="6.1.3" />
-    <PackageReference Include="EntityFramework.DynamicFilters" Version="2.8.1" />
+    <PackageReference Include="EntityFramework.DynamicFilters" Version="2.9.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup>
     <Reference Include="System.Transactions" />
   </ItemGroup>
-
 </Project>
diff --git a/src/Stove.HangFire/Stove.HangFire.csproj b/src/Stove.HangFire/Stove.HangFire.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="bin\Release\net452\Stove.Hangfire.pdb">
+    <None Include="bin\Release\net452\Stove.Hangfire.pdb">
       <PackagePath>lib/net452/</PackagePath>
       <Pack>true</Pack>
     </None>
@@ -31,7 +31,7 @@
     <PackageReference Include="Hangfire.SqlServer" Version="1.6.14" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>

diff --git a/src/Stove.Mapster/Stove.Mapster.csproj b/src/Stove.Mapster/Stove.Mapster.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="bin\Release\net452\Stove.Mapster.pdb">
+    <None Include="bin\Release\net452\Stove.Mapster.pdb">
       <PackagePath>lib/net452/</PackagePath>
       <Pack>true</Pack>
     </None>
@@ -26,7 +26,7 @@
     <PackageReference Include="Mapster" Version="3.1.1" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>

diff --git a/src/Stove.NHibernate/Stove.NHibernate.csproj b/src/Stove.NHibernate/Stove.NHibernate.csproj
@@ -25,4 +25,11 @@
     <Reference Include="System.Transactions" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="bin\Release\net452\Stove.NHibernate.pdb">
+      <PackagePath>lib/net452/</PackagePath>
+      <Pack>true</Pack>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Stove.NLog/Stove.NLog.csproj b/src/Stove.NLog/Stove.NLog.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="bin\Release\net452\Stove.NLog.pdb">
+    <None Include="bin\Release\net452\Stove.NLog.pdb">
       <PackagePath>lib/net452/</PackagePath>
       <Pack>true</Pack>
     </None>
@@ -26,7 +26,7 @@
     <PackageReference Include="NLog" Version="4.4.11" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>

diff --git a/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj b/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="bin\Release\net452\Stove.RabbitMQ.pdb">
+    <None Include="bin\Release\net452\Stove.RabbitMQ.pdb">
       <PackagePath>lib/net452/</PackagePath>
       <Pack>true</Pack>
     </None>

diff --git a/src/Stove.RavenDB/Stove.RavenDB.csproj b/src/Stove.RavenDB/Stove.RavenDB.csproj
@@ -12,14 +12,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="bin\Release\net452\Stove.RavenDB.pdb">
+    <None Include="bin\Release\net452\Stove.RavenDB.pdb">
       <PackagePath>lib/net452/</PackagePath>
       <Pack>true</Pack>
     </None>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RavenDB.Client" Version="3.5.3" />
+    <PackageReference Include="RavenDB.Client" Version="3.5.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Stove.Redis/Stove.Redis.csproj b/src/Stove.Redis/Stove.Redis.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="bin\Release\net452\Stove.Redis.pdb">
+    <None Include="bin\Release\net452\Stove.Redis.pdb">
       <PackagePath>lib/net452/</PackagePath>
       <Pack>true</Pack>
     </None>
@@ -27,7 +27,7 @@
     <PackageReference Include="StackExchange.Redis.Extensions.Core" Version="2.2.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>

diff --git a/src/Stove/Stove.csproj b/src/Stove/Stove.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="bin\Release\net452\Stove.pdb">
+    <None Include="bin\Release\net452\Stove.pdb">
       <PackagePath>lib/net452/</PackagePath>
       <Pack>true</Pack>
     </None>
@@ -22,13 +22,13 @@
     <PackageReference Include="Autofac.Extras.IocManager" Version="3.1.1" />
     <PackageReference Include="Autofac.Extras.IocManager.DynamicProxy" Version="3.1.1" />
     <PackageReference Include="Castle.Core" Version="4.1.1" />
-    <PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="Nito.AsyncEx" Version="4.0.1" />
     <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+  <ItemGroup>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Transactions" />

diff --git a/test/Stove.Demo.ConsoleApp.Nh/Stove.Demo.ConsoleApp.Nh.csproj b/test/Stove.Demo.ConsoleApp.Nh/Stove.Demo.ConsoleApp.Nh.csproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NHibernateProfiler.Appender" Version="4.0.4042" />
+    <PackageReference Include="NHibernateProfiler.Appender" Version="4.0.4044" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Stove.Demo.ConsoleApp/Stove.Demo.ConsoleApp.csproj b/test/Stove.Demo.ConsoleApp/Stove.Demo.ConsoleApp.csproj
@@ -43,7 +43,7 @@
 
   <ItemGroup>
     <PackageReference Include="EntityFramework" Version="6.1.3" />
-    <PackageReference Include="EntityFrameworkProfiler.Appender" Version="4.0.4042" />
+    <PackageReference Include="EntityFrameworkProfiler.Appender" Version="4.0.4044" />
     <PackageReference Include="LinqKit" Version="1.1.9" />
   </ItemGroup>
 

diff --git a/test/Stove.Demo.WebApi/Stove.Demo.WebApi.csproj b/test/Stove.Demo.WebApi/Stove.Demo.WebApi.csproj
@@ -31,7 +31,7 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac.WebApi2.Owin" Version="4.0.0" />
-    <PackageReference Include="EntityFrameworkProfiler.Appender" Version="4.0.4042" />
+    <PackageReference Include="EntityFrameworkProfiler.Appender" Version="4.0.4044" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Cors" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Owin" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.3" />

diff --git a/test/Stove.RavenDB.Tests/Stove.RavenDB.Tests.csproj b/test/Stove.RavenDB.Tests/Stove.RavenDB.Tests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RavenDB.Database" Version="3.5.3" />
-    <PackageReference Include="RavenDB.Embedded" Version="3.5.3" />
-    <PackageReference Include="RavenDB.Tests.Helpers" Version="3.5.3" />
+    <PackageReference Include="RavenDB.Database" Version="3.5.4" />
+    <PackageReference Include="RavenDB.Embedded" Version="3.5.4" />
+    <PackageReference Include="RavenDB.Tests.Helpers" Version="3.5.4" />
   </ItemGroup>
 
   <ItemGroup>