Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
eMazeika committed Feb 5, 2015
2 parents 8bdd54e + b31e1b8 commit 147bebd
Showing 1 changed file with 51 additions and 33 deletions.
84 changes: 51 additions & 33 deletions VirtoCommerce.sln
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
MinimumVisualStudioVersion = 10.0.40219.1
# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{2675E160-FF7B-409D-87FC-41EF1F170A7C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2EA23B38-B707-4697-BBF6-882ABA02AD54}"
Expand Down Expand Up @@ -211,8 +209,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{479FE547-2E03-41D0-BF51-621D2B4EDAC0}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
.nuget\packages.config = .nuget\packages.config
EndProjectSection
EndProject
Expand All @@ -239,6 +235,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Presentation.Localization",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureSearchProvider", "src\Extensions\Search\AzureSearchProvider\AzureSearchProvider.csproj", "{B7A061D8-6D0A-4996-B222-6611715F516B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchedulerConsole", "src\Extensions\Jobs\SchedulerConsole\SchedulerConsole.csproj", "{7AB6B367-1BC3-474B-982D-B50B32B1574A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logging", "Logging", "{7F4999F5-7952-4F64-9285-61A77E1F0890}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtoCommerce.Slab", "src\Extensions\Logging\VirtoCommerce.Slab.csproj", "{8DCDA1BC-E983-4DBB-98B6-320847ACCDFE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -547,37 +549,63 @@ Global
{B7A061D8-6D0A-4996-B222-6611715F516B}.DebugLocal|Any CPU.Build.0 = Debug|Any CPU
{B7A061D8-6D0A-4996-B222-6611715F516B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B7A061D8-6D0A-4996-B222-6611715F516B}.Release|Any CPU.Build.0 = Release|Any CPU
{7AB6B367-1BC3-474B-982D-B50B32B1574A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7AB6B367-1BC3-474B-982D-B50B32B1574A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7AB6B367-1BC3-474B-982D-B50B32B1574A}.DebugLocal|Any CPU.ActiveCfg = Debug|Any CPU
{7AB6B367-1BC3-474B-982D-B50B32B1574A}.DebugLocal|Any CPU.Build.0 = Debug|Any CPU
{7AB6B367-1BC3-474B-982D-B50B32B1574A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7AB6B367-1BC3-474B-982D-B50B32B1574A}.Release|Any CPU.Build.0 = Release|Any CPU
{8DCDA1BC-E983-4DBB-98B6-320847ACCDFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8DCDA1BC-E983-4DBB-98B6-320847ACCDFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8DCDA1BC-E983-4DBB-98B6-320847ACCDFE}.DebugLocal|Any CPU.ActiveCfg = Debug|Any CPU
{8DCDA1BC-E983-4DBB-98B6-320847ACCDFE}.DebugLocal|Any CPU.Build.0 = Debug|Any CPU
{8DCDA1BC-E983-4DBB-98B6-320847ACCDFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8DCDA1BC-E983-4DBB-98B6-320847ACCDFE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{BB168A74-0F1E-43BE-A616-134902238B80} = {2675E160-FF7B-409D-87FC-41EF1F170A7C}
{E7FC9A51-1B39-4BDC-983A-8A059C5FC58B} = {2675E160-FF7B-409D-87FC-41EF1F170A7C}
{2465FF0C-BE5D-4371-8E65-7DE3DDA15516} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{3E38A90D-0CAC-40F5-A62A-28FF92B410D2} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{5B1C8E63-A8D4-4EF1-A1A3-842DE452BE0D} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{36E91BFB-0F96-4C31-9D41-0CC37CDD8BCC} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{DE81746A-92B8-4458-8313-1AD8C699D696} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{7C4E66FC-927B-4785-9B3F-238AB75C0D6E} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{464DA96A-08A5-4BB1-99DF-0FFA876AB6C4} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{F6E00088-6457-4F50-9C16-82F33BBDA007} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{9F0978C4-8AD6-4CA0-91C8-B0294C83595B} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{CECDE122-6128-402F-B3B4-4D8C388308D3} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{45EA55AE-61F7-4816-A55F-5DCBF6C00B87} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{2AD827AA-165D-4C13-8AEA-108F9FA6E96C} = {9F0978C4-8AD6-4CA0-91C8-B0294C83595B}
{019BD24E-4A1D-4C01-BB52-F608CC36EC4C} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{B96FE56E-D29E-4EE2-90D4-0AA993563D05} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{B23D71DE-DC4A-4783-AEE4-6C6CDF0EE4EB} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{82A84146-05E1-4075-B56D-B4FA4A89F314} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{7F4999F5-7952-4F64-9285-61A77E1F0890} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{9F5493C4-0080-4BB5-9C12-25D0CDBEA2DD} = {464DA96A-08A5-4BB1-99DF-0FFA876AB6C4}
{BB168A74-0F1E-43BE-A616-134902238B80} = {2675E160-FF7B-409D-87FC-41EF1F170A7C}
{E7FC9A51-1B39-4BDC-983A-8A059C5FC58B} = {2675E160-FF7B-409D-87FC-41EF1F170A7C}
{039E7914-2925-44C4-ACAD-6BCCFA2A370E} = {464DA96A-08A5-4BB1-99DF-0FFA876AB6C4}
{4882F43B-AE8D-489B-911B-7F9A1D526715} = {464DA96A-08A5-4BB1-99DF-0FFA876AB6C4}
{B7A061D8-6D0A-4996-B222-6611715F516B} = {464DA96A-08A5-4BB1-99DF-0FFA876AB6C4}
{930184F0-9508-4C17-8AAE-1141A00C43A5} = {F6E00088-6457-4F50-9C16-82F33BBDA007}
{196FF814-152F-416D-82AB-9B1DF3323839} = {F6E00088-6457-4F50-9C16-82F33BBDA007}
{039E7914-2925-44C4-ACAD-6BCCFA2A370E} = {464DA96A-08A5-4BB1-99DF-0FFA876AB6C4}
{2AD827AA-165D-4C13-8AEA-108F9FA6E96C} = {9F0978C4-8AD6-4CA0-91C8-B0294C83595B}
{7BF794D6-39B2-4A69-9371-F35DF8D53E88} = {CECDE122-6128-402F-B3B4-4D8C388308D3}
{1BBC47C6-DB1D-4C85-B5CC-6D48F9ABA146} = {CECDE122-6128-402F-B3B4-4D8C388308D3}
{BFC7B47D-A7EE-4693-9334-5084C09C3D31} = {CECDE122-6128-402F-B3B4-4D8C388308D3}
{F4831210-2600-444F-8510-2BD825E3F13B} = {CECDE122-6128-402F-B3B4-4D8C388308D3}
{7AB6B367-1BC3-474B-982D-B50B32B1574A} = {CECDE122-6128-402F-B3B4-4D8C388308D3}
{B5987D54-8BC5-4588-A2E2-72DD0EEC338E} = {3BDA4586-0A60-43CA-BFB6-0095FFD4FAB8}
{2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6} = {3BDA4586-0A60-43CA-BFB6-0095FFD4FAB8}
{C67724E6-4EBC-4BE8-B639-8C2CD0CFFD59} = {45EA55AE-61F7-4816-A55F-5DCBF6C00B87}
{3FE4EB14-557A-46BC-94AD-2E9874F85ACE} = {45EA55AE-61F7-4816-A55F-5DCBF6C00B87}
{7BF794D6-39B2-4A69-9371-F35DF8D53E88} = {CECDE122-6128-402F-B3B4-4D8C388308D3}
{2465FF0C-BE5D-4371-8E65-7DE3DDA15516} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{019BD24E-4A1D-4C01-BB52-F608CC36EC4C} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{98748B0A-4C04-4E70-A4EF-7CBAE5959D18} = {019BD24E-4A1D-4C01-BB52-F608CC36EC4C}
{90AE6DE4-E330-4814-8000-95BCFEC26DBA} = {019BD24E-4A1D-4C01-BB52-F608CC36EC4C}
{5E7A5F66-7788-4C9B-8EEB-A3EE9149B87B} = {B5987D54-8BC5-4588-A2E2-72DD0EEC338E}
{B5987D54-8BC5-4588-A2E2-72DD0EEC338E} = {3BDA4586-0A60-43CA-BFB6-0095FFD4FAB8}
{B96FE56E-D29E-4EE2-90D4-0AA993563D05} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{8F364FCD-E08E-42C1-AB83-1D9790FB1426} = {B96FE56E-D29E-4EE2-90D4-0AA993563D05}
{B23D71DE-DC4A-4783-AEE4-6C6CDF0EE4EB} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{9179B790-1F77-475F-B6EF-0B567D5CE8E0} = {B23D71DE-DC4A-4783-AEE4-6C6CDF0EE4EB}
{C5A05C8F-6BA8-4CE7-9830-0E4870D1E272} = {B23D71DE-DC4A-4783-AEE4-6C6CDF0EE4EB}
{2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6} = {3BDA4586-0A60-43CA-BFB6-0095FFD4FAB8}
{C63B4116-AA04-451D-ABCD-49F80A0A7DF7} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
{9E551181-E3BF-450C-B9AB-1097C6CAA3A8} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
{17F55CEA-DA45-421D-B81C-157A8182E8AF} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
Expand All @@ -591,35 +619,25 @@ Global
{315535F9-143C-41F0-8554-93708DD1091F} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
{F0497F8D-B4A3-4B02-9BED-804FC332E8A3} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
{5DCF1227-2E84-4AA2-A8D2-5894C1E6FF5F} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
{82A84146-05E1-4075-B56D-B4FA4A89F314} = {5E7C52DA-805F-4F37-878B-8DE95F1B92EF}
{E3769352-34C8-41A9-A6C8-DA95D7DFF903} = {82A84146-05E1-4075-B56D-B4FA4A89F314}
{414E17F3-7333-4C6E-9DC6-09F1614BA047} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
{25F62F0B-3260-4802-B65E-5043585528B6} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
{90AE6DE4-E330-4814-8000-95BCFEC26DBA} = {019BD24E-4A1D-4C01-BB52-F608CC36EC4C}
{1BBC47C6-DB1D-4C85-B5CC-6D48F9ABA146} = {CECDE122-6128-402F-B3B4-4D8C388308D3}
{BFC7B47D-A7EE-4693-9334-5084C09C3D31} = {CECDE122-6128-402F-B3B4-4D8C388308D3}
{2044B7A5-4050-4745-A430-6E29D7AB47C9} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
{10A07A08-2934-4338-B8BD-B89BDC1D014E} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
{E3769352-34C8-41A9-A6C8-DA95D7DFF903} = {82A84146-05E1-4075-B56D-B4FA4A89F314}
{5F14CFD8-2255-4EF2-A28D-4B6F509DEAE1} = {DD917BFE-4A90-4F60-90A2-645DBD016EBB}
{D363E16C-C28E-4BF4-ACA3-99E6083BA1FA} = {DD917BFE-4A90-4F60-90A2-645DBD016EBB}
{8820DBC1-A4DA-4C80-84D0-E3581F46E93F} = {5F14CFD8-2255-4EF2-A28D-4B6F509DEAE1}
{A613C589-6AB6-47C2-A8F0-CCF19687AF8F} = {D363E16C-C28E-4BF4-ACA3-99E6083BA1FA}
{FECC89B7-B1E1-497B-B64D-A8ACD92BD4A4} = {D363E16C-C28E-4BF4-ACA3-99E6083BA1FA}
{8CDB4D88-BCCF-4B32-8F4E-F9438A714FBE} = {A613C589-6AB6-47C2-A8F0-CCF19687AF8F}
{D8346A15-2725-493B-A08F-E987D045E614} = {A613C589-6AB6-47C2-A8F0-CCF19687AF8F}
{FECC89B7-B1E1-497B-B64D-A8ACD92BD4A4} = {D363E16C-C28E-4BF4-ACA3-99E6083BA1FA}
{2731A396-AF95-483D-AC46-C7EC2246C963} = {FECC89B7-B1E1-497B-B64D-A8ACD92BD4A4}
{8ACF62DF-41C7-4CD8-98B1-566A9B17E82F} = {FECC89B7-B1E1-497B-B64D-A8ACD92BD4A4}
{8820DBC1-A4DA-4C80-84D0-E3581F46E93F} = {5F14CFD8-2255-4EF2-A28D-4B6F509DEAE1}
{5C1D0949-50AD-499E-96E3-B6973A23FAF8} = {8820DBC1-A4DA-4C80-84D0-E3581F46E93F}
{3E38A90D-0CAC-40F5-A62A-28FF92B410D2} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{5B1C8E63-A8D4-4EF1-A1A3-842DE452BE0D} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{36E91BFB-0F96-4C31-9D41-0CC37CDD8BCC} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{DE81746A-92B8-4458-8313-1AD8C699D696} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{7C4E66FC-927B-4785-9B3F-238AB75C0D6E} = {2EA23B38-B707-4697-BBF6-882ABA02AD54}
{F4831210-2600-444F-8510-2BD825E3F13B} = {CECDE122-6128-402F-B3B4-4D8C388308D3}
{4882F43B-AE8D-489B-911B-7F9A1D526715} = {464DA96A-08A5-4BB1-99DF-0FFA876AB6C4}
{2044B7A5-4050-4745-A430-6E29D7AB47C9} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
{10A07A08-2934-4338-B8BD-B89BDC1D014E} = {2C4CBAC6-17BD-4EC5-A378-93BAADF3DDF6}
{B7A061D8-6D0A-4996-B222-6611715F516B} = {464DA96A-08A5-4BB1-99DF-0FFA876AB6C4}
{8DCDA1BC-E983-4DBB-98B6-320847ACCDFE} = {7F4999F5-7952-4F64-9285-61A77E1F0890}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EnterpriseLibraryConfigurationToolBinariesPath = packages\ y.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
EndGlobalSection
EndGlobal

0 comments on commit 147bebd

Please sign in to comment.