merge
This commit is contained in:
commit
0c3e3ad7b6
|
|
@ -79,6 +79,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mango.Nop.Core", "..\NopCom
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mango.Nop.Services", "..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\Mango.Nop.Services.csproj", "{C5BA7268-004F-4B54-9F65-5E895629F01F}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mango.Nop.Services", "..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\Mango.Nop.Services.csproj", "{C5BA7268-004F-4B54-9F65-5E895629F01F}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nop.Plugin.Misc.AuctionPlugin", "..\Nopcommerce.Common\4.70\Plugins\Nop.Plugin.Misc.AuctionPlugin\Nop.Plugin.Misc.AuctionPlugin.csproj", "{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
|
@ -469,6 +471,18 @@ Global
|
||||||
{C5BA7268-004F-4B54-9F65-5E895629F01F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
{C5BA7268-004F-4B54-9F65-5E895629F01F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||||
{C5BA7268-004F-4B54-9F65-5E895629F01F}.Release|x86.ActiveCfg = Release|Any CPU
|
{C5BA7268-004F-4B54-9F65-5E895629F01F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{C5BA7268-004F-4B54-9F65-5E895629F01F}.Release|x86.Build.0 = Release|Any CPU
|
{C5BA7268-004F-4B54-9F65-5E895629F01F}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E}.Release|x86.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
@ -504,6 +518,7 @@ Global
|
||||||
{8149ADCB-8B84-435F-826D-75712F6A8EC4} = {7881B112-7843-4542-B1F7-F99553FB9BB7}
|
{8149ADCB-8B84-435F-826D-75712F6A8EC4} = {7881B112-7843-4542-B1F7-F99553FB9BB7}
|
||||||
{C1CA2B3F-C502-4581-9B20-15C721CEA1F8} = {7881B112-7843-4542-B1F7-F99553FB9BB7}
|
{C1CA2B3F-C502-4581-9B20-15C721CEA1F8} = {7881B112-7843-4542-B1F7-F99553FB9BB7}
|
||||||
{17D5E0F3-9182-4946-AF37-0514B045CD5B} = {7881B112-7843-4542-B1F7-F99553FB9BB7}
|
{17D5E0F3-9182-4946-AF37-0514B045CD5B} = {7881B112-7843-4542-B1F7-F99553FB9BB7}
|
||||||
|
{5F6D9C9B-FFFD-4136-8DFB-EA679244E65E} = {7881B112-7843-4542-B1F7-F99553FB9BB7}
|
||||||
{D5440687-19C4-4AE6-8E1C-394AA2FA2A13} = {7881B112-7843-4542-B1F7-F99553FB9BB7}
|
{D5440687-19C4-4AE6-8E1C-394AA2FA2A13} = {7881B112-7843-4542-B1F7-F99553FB9BB7}
|
||||||
{A4C2E399-0F6A-4C86-99A8-63051AEEEF20} = {E4ACA93B-D3DE-4557-B069-F1DB42925A4B}
|
{A4C2E399-0F6A-4C86-99A8-63051AEEEF20} = {E4ACA93B-D3DE-4557-B069-F1DB42925A4B}
|
||||||
{2F4A91AD-4AEE-449F-8EDD-775EF76EA6DF} = {A4C2E399-0F6A-4C86-99A8-63051AEEEF20}
|
{2F4A91AD-4AEE-449F-8EDD-775EF76EA6DF} = {A4C2E399-0F6A-4C86-99A8-63051AEEEF20}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue