mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Merge
--HG-- branch : dev
This commit is contained in:
@@ -249,10 +249,6 @@
|
||||
<Project>{72457126-E118-4171-A08F-9A709EE4B7FC}</Project>
|
||||
<Name>Orchard.MultiTenancy</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Orchard.Web\Modules\Orchard.PackageManager\Orchard.PackageManager.csproj">
|
||||
<Project>{E66935C0-830B-466E-A571-4AEED7057CBD}</Project>
|
||||
<Name>Orchard.PackageManager</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Orchard.Web\Modules\Orchard.Packaging\Orchard.Packaging.csproj">
|
||||
<Project>{DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}</Project>
|
||||
<Name>Orchard.Packaging</Name>
|
||||
|
@@ -85,8 +85,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.DesignerTools", "..
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.MediaPicker", "..\Orchard.Web\Modules\Orchard.MediaPicker\Orchard.MediaPicker.csproj", "{43D0EC0B-1955-4566-8D31-7B9102DA1703}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.PackageManager", "..\Orchard.Web\Modules\Orchard.PackageManager\Orchard.PackageManager.csproj", "{E66935C0-830B-466E-A571-4AEED7057CBD}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@@ -249,10 +247,6 @@ Global
|
||||
{43D0EC0B-1955-4566-8D31-7B9102DA1703}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{43D0EC0B-1955-4566-8D31-7B9102DA1703}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{43D0EC0B-1955-4566-8D31-7B9102DA1703}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{E66935C0-830B-466E-A571-4AEED7057CBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{E66935C0-830B-466E-A571-4AEED7057CBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{E66935C0-830B-466E-A571-4AEED7057CBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E66935C0-830B-466E-A571-4AEED7057CBD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -290,7 +284,6 @@ Global
|
||||
{2AD6973D-C7BB-416E-89FE-EEE34664E05F} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
|
||||
{4A4595EF-6C37-4F99-96ED-4AE0B9E438D3} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
|
||||
{43D0EC0B-1955-4566-8D31-7B9102DA1703} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
|
||||
{E66935C0-830B-466E-A571-4AEED7057CBD} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
|
||||
{33B1BC8D-E292-4972-A363-22056B207156} = {75E7476C-C05B-4C41-8E38-081D3EB55659}
|
||||
{CB70A642-8CEC-4DDE-8C9F-AD08900EC98D} = {84650275-884D-4CBB-9CC0-67553996E211}
|
||||
EndGlobalSection
|
||||
|
Reference in New Issue
Block a user