Skip to content

Commit e48d775

Browse files
JeavonJeavon
committed
Upgrading Azure package dependencies to current latest stable releases and therefore Umbraco dependency to v7.1.9
1 parent d68a655 commit e48d775

File tree

14 files changed

+288
-260
lines changed

14 files changed

+288
-260
lines changed

‎build/UmbracoFileSystemProviders.Azure.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<!-- SHARED PROPERTIES -->
1818
<PropertyGroup>
1919
<PackageName>UmbracoFileSystemProviders.Azure</PackageName>
20-
<MinUmbracoVersion>6.2.5</MinUmbracoVersion>
20+
<MinUmbracoVersion>7.1.9</MinUmbracoVersion>
2121
<Readme>An Azure Blob Storage IFileSystem provider for Umbraco.</Readme>
2222
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold</AuthorName>
2323
<AuthorUrl>https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure/graphs/contributors</AuthorUrl>
@@ -131,7 +131,7 @@
131131

132132
<!-- Umbraco specific -->
133133
<!-- Newtonsoft.Json Excluded for now as Umbraco requires different major versions -->
134-
<UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Edm.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.OData.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Services.Client.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.WindowsAzure.Configuration.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.WindowsAzure.Storage.dll;$(ProjectDir)\bin\$(BuildConfig)\System.Spatial.dll" />
134+
<UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Edm.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.OData.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Services.Client.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.WindowsAzure.Configuration.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.WindowsAzure.Storage.dll;$(ProjectDir)\bin\$(BuildConfig)\System.Spatial.dll;$(ProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.KeyVault.Core.dll" />
135135
<InstallerBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.Installer.dll" />
136136
<UmbracoInstallerFiles Include="$(InstallerProjectDir)\Configurator\**\*.*"/>
137137
<UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\logo\azure-logo-32.png"/>

‎build/package.nuspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<tags></tags>
1818
<dependencies>
1919
<dependency id="UmbracoCms.Core" version="0.0.0" />
20-
<dependency id="WindowsAzure.Storage" version="4.3.0" />
20+
<dependency id="WindowsAzure.Storage" version="6.2.0" />
21+
<dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.1" />
2122
</dependencies>
2223
</metadata>
2324
</package>

‎build/transforms/security.config.install.xdt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<service prefix="media/" name="CloudImageService" type="ImageProcessor.Web.Services.CloudImageService, ImageProcessor.Web" xdt:Locator="Match(prefix, name, type)" xdt:Transform="Remove" />
55
<service prefix="media/" name="CloudImageService" type="ImageProcessor.Web.Services.CloudImageService, ImageProcessor.Web" xdt:Locator="Match(prefix, name, type)" xdt:Transform="InsertIfMissing">
66
<settings xdt:Transform="InsertIfMissing">
7+
<setting key="Container" value="" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
78
<setting key="MaxBytes" value="8194304" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
89
<setting key="Timeout" value="30000" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing"/>
910
<setting key="Host" value="http://[myAccountName].blob.core.windows.net/media/" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing"/>

‎src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj‎

Lines changed: 63 additions & 75 deletions
Large diffs are not rendered by default.

‎src/UmbracoFileSystemProviders.Azure.Installer/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
1919
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
2020
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
24+
</dependentAssembly>
2125
</assemblyBinding>
2226
</runtime>
2327
</configuration>

‎src/UmbracoFileSystemProviders.Azure.Installer/config/imageprocessor/processing.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<processing preserveExifMetaData="false">
2+
<processing preserveExifMetaData="false" fixGamma="false" interceptAllRequests="false">
33
<presets>
44
</presets>
55
<plugins>

‎src/UmbracoFileSystemProviders.Azure.Installer/config/imageprocessor/security.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<!--Disable the LocalFileImageService and enable this one when using virtual paths. -->
66
<!--<service name="CloudImageService" type="ImageProcessor.Web.Services.CloudImageService, ImageProcessor.Web">
77
<settings>
8+
<setting key="Container" value=""/>
89
<setting key="MaxBytes" value="8194304"/>
910
<setting key="Timeout" value="30000"/>
1011
<setting key="Host" value="http://yourhost.com/"/>

‎src/UmbracoFileSystemProviders.Azure.Installer/packages.config‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="AutoMapper" version="3.0.0" targetFramework="net45" />
34
<package id="ClientDependency" version="1.8.2.1" targetFramework="net45" />
45
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
56
<package id="Examine" version="0.1.57.2941" targetFramework="net45" />
67
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
7-
<package id="ImageProcessor" version="2.2.5.0" targetFramework="net45" />
8-
<package id="ImageProcessor.Web" version="4.3.2.0" targetFramework="net45" />
9-
<package id="ImageProcessor.Web.Config" version="2.2.2.0" targetFramework="net45" />
8+
<package id="ImageProcessor" version="2.3.3.0" targetFramework="net45" />
9+
<package id="ImageProcessor.Web" version="4.5.3.0" targetFramework="net45" />
10+
<package id="ImageProcessor.Web.Config" version="2.2.5.0" targetFramework="net45" />
1011
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
1112
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
1213
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />
@@ -16,20 +17,21 @@
1617
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
1718
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
1819
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
19-
<package id="Microsoft.Data.Edm" version="5.6.2" targetFramework="net45" />
20-
<package id="Microsoft.Data.OData" version="5.6.2" targetFramework="net45" />
21-
<package id="Microsoft.Data.Services.Client" version="5.6.2" targetFramework="net45" />
20+
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
21+
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
22+
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
23+
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
2224
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
2325
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
2426
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
25-
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
27+
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.1" targetFramework="net45" />
2628
<package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
2729
<package id="MySql.Data" version="6.6.5" targetFramework="net45" />
28-
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
30+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2931
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
3032
<package id="StyleCop.Analyzers" version="1.0.0-beta014" targetFramework="net45" developmentDependency="true" />
31-
<package id="System.Spatial" version="5.6.2" targetFramework="net45" />
32-
<package id="UmbracoCms.Core" version="6.2.5" targetFramework="net45" />
33-
<package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net45" />
33+
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
34+
<package id="UmbracoCms.Core" version="7.1.9" targetFramework="net45" />
35+
<package id="WindowsAzure.Storage" version="6.2.0" targetFramework="net45" />
3436
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
3537
</packages>

0 commit comments

Comments
 (0)