lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'feature/caching' into feature/messagebus

Browse Source 
Conflicts:
	src/Orchard.sln
This commit is contained in:
Piotr Szmyd
2014-10-15 02:05:18 +02:00
parent d0c7091964 dc6087e620
commit 5feb717dc4
1003 changed files with 42476 additions and 51256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Orchard.sln
View File

@@ -247,6 +247,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.MessageBus", "Orcha
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Redis", "Orchard.Web\Modules\Orchard.Redis\Orchard.Redis.csproj", "{2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Layouts", "Orchard.Web\Modules\Orchard.Layouts\Orchard.Layouts.csproj", "{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.DynamicForms", "Orchard.Web\Modules\Orchard.DynamicForms\Orchard.DynamicForms.csproj", "{82190F52-2901-46D6-8A4C-34649959483F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CodeCoverage|Any CPU = CodeCoverage|Any CPU
@@ -1012,6 +1016,26 @@ Global
{3DD574CD-9C5D-4A45-85E1-EBBA64C22B5F}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
{3DD574CD-9C5D-4A45-85E1-EBBA64C22B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3DD574CD-9C5D-4A45-85E1-EBBA64C22B5F}.Release|Any CPU.Build.0 = Release|Any CPU
{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.Coverage|Any CPU.Build.0 = Release|Any CPU
{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.FxCop|Any CPU.Build.0 = Release|Any CPU
{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.Release|Any CPU.Build.0 = Release|Any CPU
{82190F52-2901-46D6-8A4C-34649959483F}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
{82190F52-2901-46D6-8A4C-34649959483F}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
{82190F52-2901-46D6-8A4C-34649959483F}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
{82190F52-2901-46D6-8A4C-34649959483F}.Coverage|Any CPU.Build.0 = Release|Any CPU
{82190F52-2901-46D6-8A4C-34649959483F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{82190F52-2901-46D6-8A4C-34649959483F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82190F52-2901-46D6-8A4C-34649959483F}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
{82190F52-2901-46D6-8A4C-34649959483F}.FxCop|Any CPU.Build.0 = Release|Any CPU
{82190F52-2901-46D6-8A4C-34649959483F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82190F52-2901-46D6-8A4C-34649959483F}.Release|Any CPU.Build.0 = Release|Any CPU
{ED715544-E649-4F48-B8EE-9368C41C3AC0}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
{ED715544-E649-4F48-B8EE-9368C41C3AC0}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
{ED715544-E649-4F48-B8EE-9368C41C3AC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1108,7 +1132,5 @@ Global
{7528BF74-25C7-4ABE-883A-443B4EEC4776} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{14A96B1A-9DC9-44C8-A675-206329E15263} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{3DD574CD-9C5D-4A45-85E1-EBBA64C22B5F} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{ED715544-E649-4F48-B8EE-9368C41C3AC0} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
EndGlobalSection
EndGlobal