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

Commit

Permalink
Merge pull request #26 from osoykan/dev
Browse files Browse the repository at this point in the history
dev to master
  • Loading branch information
osoykan authored Mar 29, 2017
2 parents 316e99d + 656e3e1 commit 6cdc006
Show file tree
Hide file tree
Showing 262 changed files with 4,795 additions and 780 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
* Dapper and EF both can use in one application.
* Dapper and EF have their own repositories. `IDapperRepository<Product>`, `IRepository<Product>`
* Dapper-EntityFramework works under same transaction and unit of work scope, if any exception appears in domain whole transaction will be rollback, including Dapper's insert/deletes and EF's.
* Stove.Dapper supports *Dynamic Filters* to filter automatically and default ISoftDelete or other user defined filters.
* RabbitMQ support
* HangFire support
* Redis support
Expand Down Expand Up @@ -67,7 +68,7 @@ IRootResolver resolver = IocBuilder.New

var someDomainService = resolver.Resolve<SomeDomainService>();
someDomainService.DoSomeStuff();

```

## It will be documented in detail!
43 changes: 41 additions & 2 deletions Stove.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
VisualStudioVersion = 15.0.26228.10
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}"
EndProject
Expand All @@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
appveyor.yml = appveyor.yml
common.props = common.props
LICENSE = LICENSE
README.md = README.md
EndProjectSection
Expand Down Expand Up @@ -49,6 +50,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stove.Hangfire.Tests", "tes
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stove.Dapper.Tests", "test\Stove.Dapper.Tests\Stove.Dapper.Tests.csproj", "{C4CCB48D-8B1E-4640-8B42-8E840678B120}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stove.NHibernate", "src\Stove.NHibernate\Stove.NHibernate.csproj", "{B2BF70AB-4D1E-43C3-9994-28247CCFF69C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stove.NHibernate.Tests", "test\Stove.NHibernate.Tests\Stove.NHibernate.Tests.csproj", "{7D034039-62FF-4E79-8028-99A5B0F9E441}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "consoleapp", "consoleapp", "{25A21354-76A5-4B85-90B2-55B51187A217}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stove.Demo.ConsoleApp.Nh", "test\Stove.Demo.ConsoleApp.Nh\Stove.Demo.ConsoleApp.Nh.csproj", "{8B85CA32-694C-4135-ADB2-EF87B43980BF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stove.Redis.Tests", "test\Stove.Redis.Tests\Stove.Redis.Tests.csproj", "{7686E5C7-C1A9-49A1-BBAB-6D6E975B6255}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stove.NLog.Tests", "test\Stove.NLog.Tests\Stove.NLog.Tests.csproj", "{715448AE-F428-4F5C-9F18-B040FE7121FE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -123,6 +136,26 @@ Global
{C4CCB48D-8B1E-4640-8B42-8E840678B120}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4CCB48D-8B1E-4640-8B42-8E840678B120}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C4CCB48D-8B1E-4640-8B42-8E840678B120}.Release|Any CPU.Build.0 = Release|Any CPU
{B2BF70AB-4D1E-43C3-9994-28247CCFF69C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B2BF70AB-4D1E-43C3-9994-28247CCFF69C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2BF70AB-4D1E-43C3-9994-28247CCFF69C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B2BF70AB-4D1E-43C3-9994-28247CCFF69C}.Release|Any CPU.Build.0 = Release|Any CPU
{7D034039-62FF-4E79-8028-99A5B0F9E441}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D034039-62FF-4E79-8028-99A5B0F9E441}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D034039-62FF-4E79-8028-99A5B0F9E441}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D034039-62FF-4E79-8028-99A5B0F9E441}.Release|Any CPU.Build.0 = Release|Any CPU
{8B85CA32-694C-4135-ADB2-EF87B43980BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8B85CA32-694C-4135-ADB2-EF87B43980BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B85CA32-694C-4135-ADB2-EF87B43980BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8B85CA32-694C-4135-ADB2-EF87B43980BF}.Release|Any CPU.Build.0 = Release|Any CPU
{7686E5C7-C1A9-49A1-BBAB-6D6E975B6255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7686E5C7-C1A9-49A1-BBAB-6D6E975B6255}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7686E5C7-C1A9-49A1-BBAB-6D6E975B6255}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7686E5C7-C1A9-49A1-BBAB-6D6E975B6255}.Release|Any CPU.Build.0 = Release|Any CPU
{715448AE-F428-4F5C-9F18-B040FE7121FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{715448AE-F428-4F5C-9F18-B040FE7121FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{715448AE-F428-4F5C-9F18-B040FE7121FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{715448AE-F428-4F5C-9F18-B040FE7121FE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -135,7 +168,7 @@ Global
{DACA9BC4-BE8A-4FFE-9243-74FBBC70FA5B} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
{F14A49EE-4931-4A13-86E2-74DAACFEAB94} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
{A540038F-D692-41E6-9455-8D420E024A86} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
{7428E8F9-A34C-4B05-B4FF-D5A0E19F3BE1} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
{7428E8F9-A34C-4B05-B4FF-D5A0E19F3BE1} = {25A21354-76A5-4B85-90B2-55B51187A217}
{1A13425B-038F-4F76-86C1-F25E5F02991C} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
{5D02A99B-2E08-44C5-83FB-F607AFA2B6FF} = {23CB5044-8ECE-4DDC-89E0-FC1B8EC9DDDF}
{0213E41B-70C4-4E53-89ED-70A1753CAF4B} = {23CB5044-8ECE-4DDC-89E0-FC1B8EC9DDDF}
Expand All @@ -145,5 +178,11 @@ Global
{7182FAE3-631D-4485-AF40-69D60A8BD8B7} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
{44BFDB6A-ECAD-4B6C-8616-2EC182706FD1} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
{C4CCB48D-8B1E-4640-8B42-8E840678B120} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
{B2BF70AB-4D1E-43C3-9994-28247CCFF69C} = {23CB5044-8ECE-4DDC-89E0-FC1B8EC9DDDF}
{7D034039-62FF-4E79-8028-99A5B0F9E441} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
{25A21354-76A5-4B85-90B2-55B51187A217} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
{8B85CA32-694C-4135-ADB2-EF87B43980BF} = {25A21354-76A5-4B85-90B2-55B51187A217}
{7686E5C7-C1A9-49A1-BBAB-6D6E975B6255} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
{715448AE-F428-4F5C-9F18-B040FE7121FE} = {4D2BAE52-1E23-4321-BBE6-2BAC28F7B389}
EndGlobalSection
EndGlobal
13 changes: 13 additions & 0 deletions Stove.v3.ncrunchsolution
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,19 @@
<Value>test\Stove.TestBase\Stove.TestBase.csproj</Value>
<Value>test\Stove.Tests.SampleApplication\Stove.Tests.SampleApplication.csproj</Value>
<Value>test\Stove.Dapper.Tests\Stove.Dapper.Tests.csproj</Value>
<Value>test\Stove.Hangfire.Tests\Stove.Hangfire.Tests.csproj:net461</Value>
<Value>test\Stove.Dapper.Tests\Stove.Dapper.Tests.csproj:net461</Value>
<Value>test\Stove.EntityFramework.Tests\Stove.EntityFramework.Tests.csproj:net461</Value>
<Value>test\Stove.Demo.ConsoleApp.Nh\Stove.Demo.ConsoleApp.Nh.csproj:net461</Value>
<Value>test\Stove.Demo.ConsoleApp\Stove.Demo.ConsoleApp.csproj:net461</Value>
<Value>test\Stove.TestBase\Stove.TestBase.csproj:net452</Value>
<Value>test\Stove.Tests\Stove.Tests.csproj:net461</Value>
<Value>test\Stove.Mapster.Tests\Stove.Mapster.Tests.csproj:net461</Value>
<Value>test\Stove.RabbitMQ.Tests\Stove.RabbitMQ.Tests.csproj:net461</Value>
<Value>test\Stove.Tests.SampleApplication\Stove.Tests.SampleApplication.csproj:net461</Value>
<Value>test\Stove.NHibernate.Tests\Stove.NHibernate.Tests.csproj:net461</Value>
<Value>test\Stove.NLog.Tests\Stove.NLog.Tests.csproj:net461</Value>
<Value>test\Stove.Redis.Tests\Stove.Redis.Tests.csproj:net461</Value>
</MetricsExclusionList>
<SolutionConfigured>True</SolutionConfigured>
</Settings>
Expand Down
37 changes: 26 additions & 11 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 1.0.{build}
configuration: Release
image: Visual Studio 2017 RC
image: Visual Studio 2017
pull_requests:
do_not_increment_build_number: true

Expand All @@ -17,31 +17,46 @@ environment:
secure: w73Xs1Is7iK/DtAOf0XTHg==

before_build:
- cmd: set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin;%PATH%
- cmd: nuget install nuget.commandline -source https://dotnet.myget.org/F/nuget-build -prerelease -excludeversion
- cmd: set PATH=%appveyor_build_folder%\NuGet.CommandLine\tools;%PATH%
- cmd: nuget restore Stove.sln
# - cmd: set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin;%PATH%
# - cmd: nuget install nuget.commandline -source https://dotnet.myget.org/F/nuget-build -prerelease -excludeversion
# - cmd: set PATH=%appveyor_build_folder%\NuGet.CommandLine\tools;%PATH%
- cmd: dotnet restore Stove.sln

build:
project: Stove.sln
publish_nuget: true
publish_nuget_symbols: true
include_nuget_references: true
verbosity: minimal

after_build:
- ps: >-
$versionSuffix=(Get-Item Env:APPVEYOR_BUILD_NUMBER).Value
Set-Location "nupkg"
.\packs.ps1 -versionSuffix "$versionSuffix"
# - cmd: >-
# icacls "test\Stove.Dapper.Tests\Db\StoveDapperTest.mdf" /Grant Everyone:F

test:
assemblies:
- test\Stove.EntityFramework.Tests\bin\Debug\net461\win7-x64\Stove.EntityFramework.Tests.dll
- test\Stove.Mapster.Tests\bin\Debug\net461\win7-x64\Stove.Mapster.Tests.dll
- test\Stove.RabbitMQ.Tests\bin\Debug\net461\win7-x64\Stove.RabbitMQ.Tests.dll
- test\Stove.Tests\bin\Debug\net461\win7-x64\Stove.Tests.dll
- test\Stove.Tests.SampleApplication\bin\Debug\net461\win7-x64\Stove.Tests.SampleApplication.dll
- test\Stove.Tests\bin\Release\net461\Stove.Tests.dll
#- test\Stove.Dapper.Tests\bin\Release\net461\Stove.Dapper.Tests.dll
- test\Stove.EntityFramework.Tests\bin\Release\net461\Stove.EntityFramework.Tests.dll
#- test\Stove.Hangfire.Tests\bin\Release\net461\Stove.Hangfire.Tests.dll
- test\Stove.Mapster.Tests\bin\Release\net461\Stove.Mapster.Tests.dll
#- test\Stove.NHibernate.Tests\bin\Release\net461\Stove.NHibernate.Tests.dll
- test\Stove.RabbitMQ.Tests\bin\Release\net461\Stove.RabbitMQ.Tests.dll
- test\Stove.Tests.SampleApplication\bin\Release\net461\Stove.Tests.SampleApplication.dll

deploy:
- provider: NuGet
on:
branch: master
api_key:
secure: liSTqN52OJQy9fZJk6gubSgYBAy4EXcEPCDSCLJ/3T9cZufzpTwvBlGPLX+iP2n9

artifacts:
- path: '**\.nupkg/'
- path: nupkg\*.nupkg
name: nuget-packages
21 changes: 21 additions & 0 deletions common.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Project>
<PropertyGroup>
<VersionPrefix>1.0.0</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>
<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>
</PropertyGroup>
</Project>
39 changes: 39 additions & 0 deletions nupkg/packs.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Paths
$packFolder = (Get-Item -Path "./" -Verbose).FullName
$slnPath = Join-Path $packFolder "../"
$srcPath = Join-Path $slnPath "src"

# List of projects
$projects = (
"Stove",
"Stove.Dapper",
"Stove.EntityFramework",
"Stove.HangFire",
"Stove.Mapster",
"Stove.NHibernate",
"Stove.NLog",
"Stove.RabbitMQ",
"Stove.Redis"
)

# Rebuild solution
Set-Location $slnPath
& dotnet msbuild /t:Rebuild /p:Configuration=Release

# Copy all nuget packages to the pack folder
foreach($project in $projects) {

$projectFolder = Join-Path $srcPath $project

# Create nuget pack
Set-Location $projectFolder
& dotnet msbuild /t:pack /p:Configuration=Release /p:IncludeSymbols=true

# Copy nuget package
$projectPackPath = Join-Path $projectFolder ("/bin/Release/" + $project + ".*.nupkg")
Move-Item $projectPackPath $packFolder

}

# Go back to the pack folder
Set-Location $packFolder
46 changes: 0 additions & 46 deletions src/Stove.Dapper/Dapper/DapperRepositoryRegistrar.cs

This file was deleted.

19 changes: 19 additions & 0 deletions src/Stove.Dapper/Dapper/EfBasedDapperAutoRepositoryTypes.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using Stove.Dapper.Repositories;

namespace Stove.Dapper
{
public static class EfBasedDapperAutoRepositoryTypes
{
static EfBasedDapperAutoRepositoryTypes()
{
Default = new DapperAutoRepositoryTypeAttribute(
typeof(IDapperRepository<>),
typeof(IDapperRepository<,>),
typeof(DapperEfRepositoryBase<,>),
typeof(DapperEfRepositoryBase<,,>)
);
}

public static DapperAutoRepositoryTypeAttribute Default { get; private set; }
}
}
2 changes: 1 addition & 1 deletion src/Stove.Dapper/Dapper/Expressions/DapperEvaluator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq.Expressions;

namespace Stove.Dapper.Dapper.Expressions
namespace Stove.Dapper.Expressions
{
/// <summary>
/// Reference
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

using Stove.Domain.Entities;

namespace Stove.Dapper.Dapper.Expressions
namespace Stove.Dapper.Expressions
{
/// <summary>
/// http://stackoverflow.com/questions/15154783/pulling-apart-expressionfunct-object
Expand Down
Loading

0 comments on commit 6cdc006

Please sign in to comment.