Skip to content

Commit 256fa33

Browse files
author
perploug
committed
Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0
2 parents ebaa46b + e207185 commit 256fa33

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

‎build/Build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@ECHO OFF
22
SET release=7.1.0
3-
SET comment=RC
3+
SET comment=
44
SET version=%release%
55

66
IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)

‎build/NuSpecs/UmbracoCms.Core.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency id="ClientDependency-Mvc" version="[1.7.0.4, 2.0.0)" />
3131
<dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
3232
<dependency id="Newtonsoft.Json" version="[4.5.11, 5.0.0)" />
33-
<dependency id="ImageProcessor" version="[1.8.6.1, 2.0.0)" />
33+
<dependency id="ImageProcessor" version="[1.8.7, 2.0.0)" />
3434
<dependency id="ImageProcessor.Web" version="[3.2.0, 4.0.0)" />
3535
</dependencies>
3636
</metadata>

‎build/NuSpecs/build/UmbracoCms.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<UmbracoVersion>7.1.0-RC</UmbracoVersion>
4+
<UmbracoVersion>7.1.0</UmbracoVersion>
55
</PropertyGroup>
66
<Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
77
<PropertyGroup>

‎src/Umbraco.Core/Configuration/UmbracoVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static Version Current
2323
/// Gets the version comment (like beta or RC).
2424
/// </summary>
2525
/// <value>The version comment.</value>
26-
public static string CurrentComment { get { return "RC"; } }
26+
public static string CurrentComment { get { return ""; } }
2727

2828
// Get the version of the umbraco.dll by looking at a class in that dll
2929
// Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx

‎src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ul class="unstyled">
33
<li ng-repeat="item in model.config.items">
44
<label class="radio">
5-
<input type="radio" name="checkboxlist"
5+
<input type="radio" name="radiobuttons-{{model.alias}}"
66
value="{{item.id}}"
77
ng-model="model.value" />
88
{{item.value}}

‎src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,11 @@
127127
<SpecificVersion>False</SpecificVersion>
128128
<HintPath>..\packages\Examine.0.1.55.2941\lib\Examine.dll</HintPath>
129129
</Reference>
130-
<Reference Include="ImageProcessor">
131-
<HintPath>..\packages\ImageProcessor.1.8.6.1\lib\net45\ImageProcessor.dll</HintPath>
130+
<Reference Include="ImageProcessor, Version=1.8.7.0, Culture=neutral, processorArchitecture=MSIL">
131+
<SpecificVersion>False</SpecificVersion>
132+
<HintPath>..\packages\ImageProcessor.1.8.7.0\lib\ImageProcessor.dll</HintPath>
132133
</Reference>
133-
<Reference Include="ImageProcessor.Web, Version=3.1.1.0, Culture=neutral, processorArchitecture=MSIL">
134+
<Reference Include="ImageProcessor.Web, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
134135
<SpecificVersion>False</SpecificVersion>
135136
<HintPath>..\packages\ImageProcessor.Web.3.2.0.0\lib\net45\ImageProcessor.Web.dll</HintPath>
136137
</Reference>

‎src/Umbraco.Web.UI/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<package id="ClientDependency" version="1.7.1.2" targetFramework="net40" />
55
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net40" />
66
<package id="Examine" version="0.1.55.2941" targetFramework="net40" />
7-
<package id="ImageProcessor" version="1.8.6.1" targetFramework="net45" />
8-
<package id="ImageProcessor.Web" version="3.2.0" targetFramework="net45" />
7+
<package id="ImageProcessor" version="1.8.7.0" targetFramework="net45" />
8+
<package id="ImageProcessor.Web" version="3.2.0.0" targetFramework="net45" />
99
<package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
1010
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
1111
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />

0 commit comments

Comments
 (0)