Skip to content
This repository was archived by the owner on May 7, 2020. It is now read-only.

Commit 5ed7c89

Browse files
osoykanosoykan
authored
Merge pull request #142 from stoveproject/dev
dev to master
2 parents c458d29 + 068b6e2 commit 5ed7c89

File tree

63 files changed

+142
-386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+142
-386
lines changed

‎build.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var testProjects = new List<Tuple<string, string[]>>
3131
new Tuple<string, string[]>("Stove.Tests.SampleApplication", new[] { "net461" }),
3232
new Tuple<string, string[]>("Stove.Dapper.Tests", new[] { "net461" }),
3333
new Tuple<string, string[]>("Stove.Hangfire.Tests", new[] { "netcoreapp2.0" }),
34-
new Tuple<string, string[]>("Stove.NHibernate.Tests", new[] { "net461" }),
34+
new Tuple<string, string[]>("Stove.NHibernate.Tests", new[] { "netcoreapp2.0" }),
3535
new Tuple<string, string[]>("Stove.EntityFrameworkCore.Tests", new[] { "netcoreapp2.0" }),
3636
new Tuple<string, string[]>("Stove.Serilog.Tests", new[] { "netcoreapp2.0" })
3737
};

‎build.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ Param(
3131
[string[]]$ScriptArgs
3232
)
3333

34-
$CakeVersion = "0.22.2"
34+
$CakeVersion = "0.27.2"
3535
$DotNetChannel = "LTS";
36-
$DotNetVersion = "2.0.0";
36+
$DotNetVersion = "2.1.200";
3737
$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
3838
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
3939

‎common.props‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>2.3.5</VersionPrefix>
3+
<VersionPrefix>2.3.6</VersionPrefix>
44
<NoWarn>$(NoWarn);CS1591</NoWarn>
55
<PackageIconUrl>https://raw.githubusercontent.com/osoykan/Stove/master/stove.png</PackageIconUrl>
66
<PackageProjectUrl>https://github.com/osoykan/Stove</PackageProjectUrl>
77
<PackageLicenseUrl>https://github.com/osoykan/Stove/blob/master/LICENSE</PackageLicenseUrl>
88
<RepositoryType>git</RepositoryType>
99
<RepositoryUrl>https://github.com/osoykan/Stove</RepositoryUrl>
1010
<Authors>Oguzhan Soykan</Authors>
11+
<Company>Stove Project</Company>
12+
<ProductName>Stove</ProductName>
13+
<Copyright>Copyright © 2016</Copyright>
1114
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
12-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
13-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
14-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
15-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
16-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
17-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
18-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
19-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
15+
<GenerateAssemblyTitleAttribute>true</GenerateAssemblyTitleAttribute>
16+
<GenerateAssemblyDescriptionAttribute>true</GenerateAssemblyDescriptionAttribute>
17+
<GenerateAssemblyConfigurationAttribute>true</GenerateAssemblyConfigurationAttribute>
18+
<GenerateAssemblyCompanyAttribute>true</GenerateAssemblyCompanyAttribute>
19+
<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
20+
<GenerateAssemblyCopyrightAttribute>true</GenerateAssemblyCopyrightAttribute>
21+
<GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
22+
<GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
2023
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2124
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
2225
<LangVersion>7.1</LangVersion>
2326
</PropertyGroup>
2427
<ItemGroup>
25-
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.7.6" PrivateAssets="All" />
28+
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.1" PrivateAssets="All" />
2629
</ItemGroup>
2730
</Project>

‎src/Stove.Couchbase/Stove.Couchbase.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="CouchbaseNetClient" Version="2.5.4" />
27-
<PackageReference Include="Linq2Couchbase" Version="1.3.3" />
26+
<PackageReference Include="CouchbaseNetClient" Version="2.5.10" />
27+
<PackageReference Include="Linq2Couchbase" Version="1.3.4" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/Stove.Dapper/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/Stove.Dapper/Stove.Dapper.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
<PropertyGroup>
66
<TargetFramework>netstandard2.0</TargetFramework>
7+
<RootNamespace>Stove</RootNamespace>
78
<AssemblyName>Stove.Dapper</AssemblyName>
89
<PackageId>Stove.Dapper</PackageId>
910
<PackageTags>.net;framework;boilerplate;Dapper</PackageTags>
@@ -27,9 +28,8 @@
2728
</ItemGroup>
2829

2930
<ItemGroup>
30-
<PackageReference Include="Dapper" Version="1.50.4" />
31+
<PackageReference Include="Dapper" Version="1.50.5" />
3132
<PackageReference Include="DapperExtensions.DotnetCore" Version="1.0.1" />
32-
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
33+
<PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
3334
</ItemGroup>
34-
3535
</Project>

‎src/Stove.EntityFramework.Common/Stove.EntityFramework.Common.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<PropertyGroup>
66
<TargetFramework>netstandard2.0</TargetFramework>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
8+
<RootNamespace>Stove</RootNamespace>
89
<AssemblyName>Stove.EntityFramework.Common</AssemblyName>
910
<PackageId>Stove.EntityFramework.Common</PackageId>
1011
<PackageTags>asp.net;asp.net mvc;boilerplate;application framework;web framework;framework;domain driven design;EntityFrameworkCore;ORM;Entity Framework Core</PackageTags>

‎src/Stove.EntityFramework/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎src/Stove.EntityFramework/Stove.EntityFramework.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
<PropertyGroup>
66
<TargetFramework>net461</TargetFramework>
7+
<RootNamespace>Stove</RootNamespace>
78
<AssemblyName>Stove.EntityFramework</AssemblyName>
89
<PackageId>Stove.EntityFramework</PackageId>
910
<PackageTags>.net;framework;boilerplate;entityframework</PackageTags>
10-
<RootNamespace>Stove</RootNamespace>
1111
<Description>EntityFramework integration for Stove.</Description>
1212
</PropertyGroup>
1313

@@ -36,6 +36,5 @@
3636
<Reference Include="System" />
3737
<Reference Include="Microsoft.CSharp" />
3838
<Reference Include="System.Transactions" />
39-
</ItemGroup>
40-
39+
</ItemGroup>
4140
</Project>

‎src/Stove.EntityFrameworkCore/EntityFrameworkCore/StoveDbContext.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
using Microsoft.EntityFrameworkCore.ChangeTracking;
1616
using Microsoft.EntityFrameworkCore.Metadata;
1717

18-
using Stove.Collections.Extensions;
1918
using Stove.Commands;
2019
using Stove.Domain.Entities;
2120
using Stove.Domain.Entities.Auditing;
2221
using Stove.Domain.Uow;
23-
using Stove.Events;
2422
using Stove.Events.Bus;
2523
using Stove.Events.Bus.Entities;
2624
using Stove.Extensions;

0 commit comments

Comments
 (0)