yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch dev-v8 into temp-u4-8497

Browse Source
This commit is contained in:
Stephan
2016-07-20 18:04:41 +02:00
parent f9fd8b67b1 fe61553243
commit 6e84e085c1
9 changed files with 130 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SolutionInfo.cs
View File

@@ -12,4 +12,4 @@ using System.Resources;
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("8.0.0")]
[assembly: AssemblyInformationalVersion("8.0.0-alpha0000")]
[assembly: AssemblyInformationalVersion("8.0.0-alpha0015")]

6
src/Umbraco.Core/project.json
View File

@@ -3,15 +3,15 @@
"AutoMapper": "4.2.*",
"HtmlAgilityPack": "1.4.9.5",
"ImageProcessor": "2.4.*",
"LightInject": "4.0.*",
"LightInject.Annotation": "1.0.*",
"LightInject": "4.0.9",
"LightInject.Annotation": "1.0.0.4",
"log4net": "2.0.*",
"Microsoft.AspNet.Identity.Core": "2.2.*",
"Microsoft.AspNet.Identity.Owin": "2.2.*",
"Microsoft.Owin.Security.Cookies": "3.0.*",
"Microsoft.Owin.Security.OAuth": "3.0.*",
"MiniProfiler": "3.2.*",
"MySql.Data": "6.9.*",
"MySql.Data": "6.9.8",
"Newtonsoft.Json": "8.0.*",
"NPoco": "3.3.4",
"semver": "1.*",

5
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -30,6 +30,7 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
<NugetPackagesDirectory Condition="$(NugetPackagesDirectory) == '' Or $(NugetPackagesDirectory) == '*Undefined*'">$(SolutionDir)\packages</NugetPackagesDirectory>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -733,8 +734,8 @@
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent>xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D
xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" /Y /F /E /I /C /D</PreBuildEvent>
<PreBuildEvent>xcopy "$(NugetPackagesDirectory)"\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D
xcopy "$(NugetPackagesDirectory)"\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" /Y /F /E /I /C /D</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

4
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -132,8 +132,8 @@
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor, Version=2.3.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.3.3.0\lib\net45\ImageProcessor.dll</HintPath>
<Reference Include="ImageProcessor, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.4.1.0\lib\net45\ImageProcessor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor.Web, Version=4.6.1.0, Culture=neutral, processorArchitecture=MSIL">

2
src/Umbraco.Web/app.config
View File

@@ -77,7 +77,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.4" newVersion="1.4.9.4" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
</dependentAssembly>
</assemblyBinding>
</runtime>

4
src/Umbraco.Web/project.json
View File

@@ -5,8 +5,8 @@
"dotless": "1.4.1.0",
"Examine": "2.0.0-beta2",
"HtmlAgilityPack": "1.4.9.5",
"LightInject": "4.0.*",
"LightInject.Annotation": "1.0.*",
"LightInject": "4.0.9",
"LightInject.Annotation": "1.0.0.4",
"LightInject.Mvc": "1.0.*",
"LightInject.Web": "1.0.*",
"LightInject.WebApi": "1.0.*",

2
src/umbraco.datalayer/app.config
View File

@@ -32,7 +32,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
</dependentAssembly>
</assemblyBinding>
</runtime>