lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'feature/fw45' into 1.x

Browse Source 
Conflicts:
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/Orchard.Autoroute.Specs.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/Orchard.Fields.Specs.csproj
	src/Orchard.Web/Modules/Orchard.OutputCache/Scripts/Web.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Styles/Web.config
	src/Orchard.Web/Orchard.Web.csproj
	src/Orchard.Web/Web.config
This commit is contained in:
Sebastien Ros
2013-10-11 16:40:44 -07:00
parent 790cb94d5b 0380f5974f
commit f6f6a56c24
325 changed files with 1990 additions and 3046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
View File

@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Orchard.Tests.Modules</RootNamespace>
<AssemblyName>Orchard.Tests.Modules</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -43,6 +43,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -53,6 +54,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Autofac, Version=2.1.13.813, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">

2
src/Orchard.Tests.Modules/Packaging/Services/Hello.World.csproj.txt
View File

@@ -50,7 +50,7 @@
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
</Reference>