lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed the things that someone always forgets. ;)

Browse Source 
- Fixed build warnings and cleaned up Web.config files of new modules.
- Added missing project dependencies to new modules.
- Added new modules to Azure solution.
This commit is contained in:
Daniel Stolt
2015-11-24 19:35:27 +01:00
parent b6dc75d4f9
commit cee6539430
5 changed files with 140 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
View File

@@ -278,6 +278,10 @@
<Name>Orchard.Comments</Name>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\Orchard.Web\Modules\Orchard.Conditions\Orchard.Conditions.csproj">
<Project>{98251eae-a41b-47b2-aa91-e28b8482da70}</Project>
<Name>Orchard.Conditions</Name>
</ProjectReference>
<ProjectReference Include="..\..\Orchard.Web\Modules\Orchard.ContentPermissions\Orchard.ContentPermissions.csproj">
<Project>{e826f796-8ce3-4b5b-8423-5aa5f81d2fc3}</Project>
<Name>Orchard.ContentPermissions</Name>
@@ -422,6 +426,10 @@
<Project>{2c5eb8b3-a313-413d-baa0-5c21d2a6ec6e}</Project>
<Name>Orchard.Redis</Name>
</ProjectReference>
<ProjectReference Include="..\..\Orchard.Web\Modules\Orchard.Resources\Orchard.Resources.csproj">
<Project>{d4e8f7c8-2db2-4c50-a422-da1df1e3cc73}</Project>
<Name>Orchard.Resources</Name>
</ProjectReference>
<ProjectReference Include="..\..\Orchard.Web\Modules\Orchard.Roles\Orchard.Roles.csproj">
<Project>{D10AD48F-407D-4DB5-A328-173EC7CB010F}</Project>
<Name>Orchard.Roles</Name>

14
src/Orchard.Azure/Orchard.Azure.sln
View File

@@ -157,6 +157,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.MessageBus", "..\Or
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.Conditions", "..\Orchard.Web\Modules\Orchard.Conditions\Orchard.Conditions.csproj", "{98251EAE-A41B-47B2-AA91-E28B8482DA70}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Resources", "..\Orchard.Web\Modules\Orchard.Resources\Orchard.Resources.csproj", "{D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -451,6 +455,14 @@ Global
{2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E}.Release|Any CPU.Build.0 = Release|Any CPU
{98251EAE-A41B-47B2-AA91-E28B8482DA70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{98251EAE-A41B-47B2-AA91-E28B8482DA70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{98251EAE-A41B-47B2-AA91-E28B8482DA70}.Release|Any CPU.ActiveCfg = Release|Any CPU
{98251EAE-A41B-47B2-AA91-E28B8482DA70}.Release|Any CPU.Build.0 = Release|Any CPU
{D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -525,5 +537,7 @@ Global
{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
{ED715544-E649-4F48-B8EE-9368C41C3AC0} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
{2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
{98251EAE-A41B-47B2-AA91-E28B8482DA70} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
{D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
EndGlobalSection
EndGlobal

27
src/Orchard.Web/Modules/Orchard.Conditions/Web.config
View File

@@ -1,15 +1,11 @@
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<remove name="host" />
<remove name="pages" />
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false"/>
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false"/>
</sectionGroup>
</configSections>
<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<pages pageBaseType="Orchard.Mvc.ViewEngines.Razor.WebViewPage">
@@ -25,7 +21,6 @@
</namespaces>
</pages>
</system.web.webPages.razor>
<system.web>
<compilation targetFramework="4.5.1">
<assemblies>
@@ -39,5 +34,25 @@
</assemblies>
</compilation>
</system.web>
<!-- NOTE: These binding redirects have no runtime effect; they are only here to avoid build warnings. -->
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Iesi.Collections" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863AF14B0044DA" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

27
src/Orchard.Web/Modules/Orchard.Resources/Web.config
View File

@@ -1,15 +1,11 @@
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<remove name="host" />
<remove name="pages" />
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false"/>
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false"/>
</sectionGroup>
</configSections>
<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<pages pageBaseType="Orchard.Mvc.ViewEngines.Razor.WebViewPage">
@@ -25,7 +21,6 @@
</namespaces>
</pages>
</system.web.webPages.razor>
<system.web>
<compilation targetFramework="4.5.1">
<assemblies>
@@ -39,5 +34,25 @@
</assemblies>
</compilation>
</system.web>
<!-- NOTE: These binding redirects have no runtime effect; they are only here to avoid build warnings. -->
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Iesi.Collections" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863AF14B0044DA" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

2
src/Orchard.sln
View File

@@ -65,11 +65,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Web", "Orchard.Web\
{DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059} = {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}
{94E694A2-D140-468D-A277-C5FCE1D13E9B} = {94E694A2-D140-468D-A277-C5FCE1D13E9B}
{EA4F1DA7-F2AB-4384-9AA4-9B756E2026B1} = {EA4F1DA7-F2AB-4384-9AA4-9B756E2026B1}
{98251EAE-A41B-47B2-AA91-E28B8482DA70} = {98251EAE-A41B-47B2-AA91-E28B8482DA70}
{1C981BB3-26F7-494C-9005-CC27A5144233} = {1C981BB3-26F7-494C-9005-CC27A5144233}
{2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E} = {2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E}
{BAC82DB9-F4C4-4DD1-ABDB-F70E6229E6B0} = {BAC82DB9-F4C4-4DD1-ABDB-F70E6229E6B0}
{8C7FCBC2-E6E1-405E-BFB5-D8D9E67A09C4} = {8C7FCBC2-E6E1-405E-BFB5-D8D9E67A09C4}
{2FC1D9C8-446D-4414-B252-5E9FBE61EB63} = {2FC1D9C8-446D-4414-B252-5E9FBE61EB63}
{D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73} = {D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73}
{2CF067CA-064B-43C6-8B88-5E3B99A65F1D} = {2CF067CA-064B-43C6-8B88-5E3B99A65F1D}
{194D3CCC-1153-474D-8176-FDE8D7D0D0BD} = {194D3CCC-1153-474D-8176-FDE8D7D0D0BD}
{08191FCD-7258-4F19-95FB-AEC3DE77B2EB} = {08191FCD-7258-4F19-95FB-AEC3DE77B2EB}