lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-02 19:44:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-03-28 17:13:30 -07:00
parent 9f5adef34a 7fba9036eb
commit d0af08fce9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj
View File

@@ -59,7 +59,7 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Content Include="Web.config" />
<Content Include="web.config" />
<Content Include="Views\Web.config" />
<Content Include="Scripts\Web.config" />
<Content Include="Styles\Web.config" />
@@ -99,7 +99,7 @@
<Content Include="Views\EditorTemplates\Parts.Warmup.SiteSettings.cshtml" />
</ItemGroup>
<ItemGroup>
<None Include="Placement.info" />
<Content Include="Placement.info" />
<Content Include="Views\Admin\Index.cshtml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

3
src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
View File

@@ -14,6 +14,7 @@
<AssemblyName>Orchard.Widgets</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>false</UseIISExpress>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -159,7 +160,7 @@
<Content Include="Views\WidgetLayerVisibility.cshtml" />
</ItemGroup>
<ItemGroup>
<None Include="Views\WidgetPlacement.Zones.cshtml" />
<Content Include="Views\WidgetPlacement.Zones.cshtml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />