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

Merge remote-tracking branch 'origin/6.1.4' into 6.1.4-cmsContentXml_Optimizations

Browse Source
This commit is contained in:
Shannon
2013-07-26 18:14:13 +10:00
parent ed88bbf75f e41d3c7e84
commit 614aea203d
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/Build.bat
View File

@@ -1,5 +1,5 @@
@ECHO OFF
SET release=6.1.3
SET release=6.1.4
SET comment=
SET version=%release%

1
build/NuSpecs/UmbracoCms.Core.nuspec
View File

@@ -23,6 +23,7 @@
<dependency id="Lucene.Net" version="[2.9.4.1]" />
<dependency id="SharpZipLib" version="0.86.0" />
<dependency id="MySql.Data" version="[6.6.5]" />
<dependency id="xmlrpcnet" version="2.5.0" />
<dependency id="ClientDependency" version="[1.7.0,1.7.1)" />
<dependency id="ClientDependency-Mvc" version="[1.7.0,1.7.1)" />
</dependencies>

2
src/Umbraco.Core/Configuration/UmbracoVersion.cs
View File

@@ -5,7 +5,7 @@ namespace Umbraco.Core.Configuration
{
public class UmbracoVersion
{
private static readonly Version Version = new Version("6.1.3");
private static readonly Version Version = new Version("6.1.4");
/// <summary>
/// Gets the current version of Umbraco.

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

@@ -2574,9 +2574,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
<WebProjectProperties>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>6130</DevelopmentServerPort>
<DevelopmentServerPort>6140</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:6130</IISUrl>
<IISUrl>http://localhost:6140</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>