Skip to content

Commit d43b673

Browse files
ShazwazzaShazwazza
committed
Merge branch '7.1.9' of https://github.com/umbraco/Umbraco-CMS into 7.1.9
2 parents 4ec37b9 + 4eb0981 commit d43b673

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

‎build/NuSpecs/UmbracoCms.Core.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
3434
<dependency id="Newtonsoft.Json" version="[6.0.4, 7.0.0)" />
3535
<dependency id="Examine" version="[0.1.57, 1.0.0)" />
36-
<dependency id="ImageProcessor" version="[1.9.5, 2.0.0)" />
37-
<dependency id="ImageProcessor.Web" version="[3.3.0, 4.0.0)" />
36+
<dependency id="ImageProcessor" version="[1.9.5, 3.0.0)" />
37+
<dependency id="ImageProcessor.Web" version="[3.3.1, 5.0.0)" />
3838
</dependencies>
3939
</metadata>
4040
<files>

‎build/UmbracoVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.8
1+
7.1.9

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Umbraco.Core.Configuration
55
{
66
public class UmbracoVersion
77
{
8-
private static readonly Version Version = new Version("7.1.8");
8+
private static readonly Version Version = new Version("7.1.9");
99

1010
/// <summary>
1111
/// Gets the current version of Umbraco.

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@
132132
<SpecificVersion>False</SpecificVersion>
133133
<HintPath>..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll</HintPath>
134134
</Reference>
135-
<Reference Include="ImageProcessor.Web, Version=3.2.2.0, Culture=neutral, processorArchitecture=MSIL">
135+
<Reference Include="ImageProcessor.Web, Version=3.3.1.0, Culture=neutral, processorArchitecture=MSIL">
136136
<SpecificVersion>False</SpecificVersion>
137-
<HintPath>..\packages\ImageProcessor.Web.3.3.0.0\lib\net45\ImageProcessor.Web.dll</HintPath>
137+
<HintPath>..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll</HintPath>
138138
<Private>True</Private>
139139
</Reference>
140140
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
@@ -199,6 +199,7 @@
199199
</Reference>
200200
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
201201
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
202+
<Private>True</Private>
202203
</Reference>
203204
<Reference Include="System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
204205
<SpecificVersion>False</SpecificVersion>
@@ -223,9 +224,11 @@
223224
</Reference>
224225
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
225226
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
227+
<Private>True</Private>
226228
</Reference>
227229
<Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
228230
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
231+
<Private>True</Private>
229232
</Reference>
230233
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
231234
<Private>True</Private>
@@ -2530,9 +2533,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
25302533
<WebProjectProperties>
25312534
<UseIIS>True</UseIIS>
25322535
<AutoAssignPort>True</AutoAssignPort>
2533-
<DevelopmentServerPort>7180</DevelopmentServerPort>
2536+
<DevelopmentServerPort>7190</DevelopmentServerPort>
25342537
<DevelopmentServerVPath>/</DevelopmentServerVPath>
2535-
<IISUrl>http://localhost:7180</IISUrl>
2538+
<IISUrl>http://localhost:7190</IISUrl>
25362539
<NTLMAuthentication>False</NTLMAuthentication>
25372540
<UseCustomServer>False</UseCustomServer>
25382541
<CustomServerUrl>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net40" />
66
<package id="Examine" version="0.1.57.2941" targetFramework="net40" />
77
<package id="ImageProcessor" version="1.9.5.0" targetFramework="net45" />
8-
<package id="ImageProcessor.Web" version="3.3.0.0" targetFramework="net45" />
8+
<package id="ImageProcessor.Web" version="3.3.1.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)