From 0af3f9dce0ddf378681dde620bde23a39a839c25 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 3 Apr 2014 08:55:19 +0200
Subject: [PATCH 1/3] Fixes U4-4278 Multiple RadioButtonList on one Document

Manually applying pull request as it's a bit faster to copy&paste instead of resolve merge conflicts
---
 .../src/views/propertyeditors/radiobuttons/radiobuttons.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
index a5ae839cfc..cdb5a37ac8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
@@ -2,7 +2,7 @@
     <ul class="unstyled">
         <li ng-repeat="item in model.config.items">
             <label class="radio">
-                <input type="radio" name="checkboxlist"
+                <input type="radio" name="radiobuttons-{{model.alias}}"
                        value="{{item.id}}"
                        ng-model="model.value" />
                 {{item.value}}

From c3fc27565d3f498ff26874378d8eae5c1fc12623 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 3 Apr 2014 09:26:51 +0200
Subject: [PATCH 2/3] Update version of ImageProcessor and refer to NuGet in
 the csproj instead of the bin (!)

---
 build/NuSpecs/UmbracoCms.Core.nuspec     | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 7 ++++---
 src/Umbraco.Web.UI/packages.config       | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index a7bb715c73..4304028bf2 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -30,7 +30,7 @@
             <dependency id="ClientDependency-Mvc" version="[1.7.0.4, 2.0.0)" />
             <dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
             <dependency id="Newtonsoft.Json" version="[4.5.11, 5.0.0)" />
-            <dependency id="ImageProcessor" version="[1.8.6.1, 2.0.0)" />
+            <dependency id="ImageProcessor" version="[1.8.7, 2.0.0)" />
             <dependency id="ImageProcessor.Web" version="[3.2.0, 4.0.0)" />
         </dependencies>
     </metadata>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index b2571a87ed..2b4dd3c8f4 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -127,10 +127,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Examine.0.1.55.2941\lib\Examine.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor">
-      <HintPath>..\packages\ImageProcessor.1.8.6.1\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=1.8.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ImageProcessor.1.8.7.0\lib\ImageProcessor.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor.Web, Version=3.1.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ImageProcessor.Web, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\ImageProcessor.Web.3.2.0.0\lib\net45\ImageProcessor.Web.dll</HintPath>
     </Reference>
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index d3d7e14e07..c9476dd796 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -4,8 +4,8 @@
   <package id="ClientDependency" version="1.7.1.2" targetFramework="net40" />
   <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net40" />
   <package id="Examine" version="0.1.55.2941" targetFramework="net40" />
-  <package id="ImageProcessor" version="1.8.6.1" targetFramework="net45" />
-  <package id="ImageProcessor.Web" version="3.2.0" targetFramework="net45" />
+  <package id="ImageProcessor" version="1.8.7.0" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="3.2.0.0" targetFramework="net45" />
   <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
   <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />

From 5efc45a7dd0240aedc8e1e3b25ceb95b7fb14746 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 3 Apr 2014 09:29:52 +0200
Subject: [PATCH 3/3] Bump version number

---
 build/Build.bat                                  | 2 +-
 build/NuSpecs/build/UmbracoCms.targets           | 2 +-
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/Build.bat b/build/Build.bat
index aef508193b..28aee372ac 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -1,6 +1,6 @@
 @ECHO OFF
 SET release=7.1.0
-SET comment=RC
+SET comment=
 SET version=%release%
 
 IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
diff --git a/build/NuSpecs/build/UmbracoCms.targets b/build/NuSpecs/build/UmbracoCms.targets
index 355cbbd93b..4264c39e9f 100644
--- a/build/NuSpecs/build/UmbracoCms.targets
+++ b/build/NuSpecs/build/UmbracoCms.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <UmbracoVersion>7.1.0-RC</UmbracoVersion>
+    <UmbracoVersion>7.1.0</UmbracoVersion>
   </PropertyGroup>
   <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
     <PropertyGroup>
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 1e4aa0db62..e9a948c125 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "RC"; } }
+        public static string CurrentComment { get { return ""; } }
 
         // Get the version of the umbraco.dll by looking at a class in that dll
         // 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