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 '1.9.x' into dev

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj
This commit is contained in:
Sebastien Ros
2016-01-14 08:43:56 -08:00
parent 79337e9e3c e907334b6c
commit a0c61c0328
18 changed files with 181 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Lib/Mono.CSharp.dll
View File

Binary file not shown.

5
src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj
View File

@@ -53,8 +53,9 @@
<HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.CSharp">
<HintPath>Lib\Mono.CSharp.dll</HintPath>
<Reference Include="Mono.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\lib\mono\Mono.CSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />