Skip to content

Merge new commits. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Nov 28, 2017
Merged

Merge new commits. #2

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
38a9f39
:sparkles: Add CacheEntry and IEasyCachingProvider
catcherwong Nov 13, 2017
fc6ab43
:fire: Delete useless file
catcherwong Nov 13, 2017
c05d5b1
:sparkles: Add EasyCachingAttribute
catcherwong Nov 14, 2017
c937da0
:sparkles: Add MemoryCaching Project
catcherwong Nov 14, 2017
80f201c
:wrench: Update gitignore
catcherwong Nov 14, 2017
70a9376
:fire: Delete useless file
catcherwong Nov 14, 2017
0ee993c
:fire: Delete useless file
catcherwong Nov 14, 2017
be9a6fb
:sparkles: Add solution and project
catcherwong Nov 14, 2017
282b683
:sparkles: Add EmptyCachingObject and EasyCachingManager
catcherwong Nov 15, 2017
26cca02
:wrench: Update EasyCachingManage
catcherwong Nov 15, 2017
7fc1e86
:sparkles: Add Caching Interceptor.
catcherwong Nov 27, 2017
1f2ff02
Merge branch 'dev' into master
catcherwong Nov 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'dev' into master
  • Loading branch information
@catcherwong
catcherwong authored Nov 28, 2017
commit 1f2ff02c815c20c785c54a622a161163ce7276e1
8 changes: 8 additions & 0 deletions EasyCaching.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyCaching.Memory", "src\E
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyCaching.Extensions", "src\EasyCaching.Extensions\EasyCaching.Extensions.csproj", "{679ABDB5-7218-4B4E-A632-10612750CD74}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyCaching.Demo.Interceptor", "sample\EasyCaching.Demo.Interceptor\EasyCaching.Demo.Interceptor.csproj", "{C94E91EB-1F55-40E7-9A69-BBFEF740839C}"
EndProject

Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -31,10 +34,15 @@ Global
{679ABDB5-7218-4B4E-A632-10612750CD74}.Debug|Any CPU.Build.0 = Debug|Any CPU
{679ABDB5-7218-4B4E-A632-10612750CD74}.Release|Any CPU.ActiveCfg = Release|Any CPU
{679ABDB5-7218-4B4E-A632-10612750CD74}.Release|Any CPU.Build.0 = Release|Any CPU
{C94E91EB-1F55-40E7-9A69-BBFEF740839C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C94E91EB-1F55-40E7-9A69-BBFEF740839C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C94E91EB-1F55-40E7-9A69-BBFEF740839C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C94E91EB-1F55-40E7-9A69-BBFEF740839C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{CE61FAA2-0233-451C-991D-4222ED61C84B} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
{B9490432-737B-4518-B851-9D40FD29B392} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
{679ABDB5-7218-4B4E-A632-10612750CD74} = {A0F5CC7E-155F-4726-8DEB-E966950B3FE9}
{C94E91EB-1F55-40E7-9A69-BBFEF740839C} = {F88D727A-9F9C-43D9-90B1-D4A02BF8BC98}
EndGlobalSection
EndGlobal
You are viewing a condensed version of this merge commit. You can view the full changes here.