Skip to content

Commit df0b26a

Browse files
JeavonJeavon
committed
Merge branch 'develop-umbraco-version-8' into master-umbraco-version-8
2 parents f792983 + 9d7e5c8 commit df0b26a

File tree

12 files changed

+179
-96
lines changed

12 files changed

+179
-96
lines changed

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ From **v2.0.0-alpha3** onwards this package was split into 2 NuGet packages and
2323

2424
|NuGet Packages |Version |
2525
|:-----------------|:-----------------|
26-
|**Pre-Release**|[![NuGet download](http://img.shields.io/nuget/vpre/UmbracoFileSystemProviders.Azure.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure/)|[![NuGet count](https://img.shields.io/nuget/dt/UmbracoFileSystemProviders.Azure.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure/)|
26+
|**Pre-Release Core**|[![NuGet download](http://img.shields.io/nuget/vpre/UmbracoFileSystemProviders.Azure.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure/)|[![NuGet count](https://img.shields.io/nuget/dt/UmbracoFileSystemProviders.Azure.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure/)|
27+
|**Pre-Release Media**|[![NuGet download](http://img.shields.io/nuget/vpre/UmbracoFileSystemProviders.Azure.Media.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Media/)|[![NuGet count](https://img.shields.io/nuget/dt/UmbracoFileSystemProviders.Azure.Media.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Media/)|
28+
|**Pre-Release Forms**|[![NuGet download](http://img.shields.io/nuget/vpre/UmbracoFileSystemProviders.Azure.Forms.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Forms/)|[![NuGet count](https://img.shields.io/nuget/dt/UmbracoFileSystemProviders.Azure.Forms.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Forms/)|
2729
|**Bleeding edge Core**|[![MyGet download](https://img.shields.io/myget/umbraco-packages/vpre/UmbracoFileSystemProviders.Azure.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure)|[![MyGet count](https://img.shields.io/myget/umbraco-packages/dt/UmbracoFileSystemProviders.Azure.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure)|
2830
|**Bleeding edge Media**|[![MyGet download](https://img.shields.io/myget/umbraco-packages/vpre/UmbracoFileSystemProviders.Azure.Media.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure.Media)|[![MyGet count](https://img.shields.io/myget/umbraco-packages/dt/UmbracoFileSystemProviders.Azure.Media.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure.Media)|
2931
|**Bleeding edge Forms**|[![MyGet download](https://img.shields.io/myget/umbraco-packages/vpre/UmbracoFileSystemProviders.Azure.Forms.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure.Forms)|[![MyGet count](https://img.shields.io/myget/umbraco-packages/dt/UmbracoFileSystemProviders.Azure.Forms.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure.Forms)|
@@ -131,7 +133,7 @@ the cloud replace the `CloudImageService`setting with the following:
131133
<setting key="Container" value="media"/>
132134
<setting key="MaxBytes" value="8194304"/>
133135
<setting key="Timeout" value="30000"/>
134-
<setting key="Host" value="https://[myAccountName].blob.core.windows.net/media"/>
136+
<setting key="Host" value="https://[myAccountName].blob.core.windows.net/"/>
135137
</settings>
136138
</service>
137139
</services>

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ configuration: Release
99

1010
environment:
1111
# Version Suffix
12-
version_suffix: alpha3
12+
version_suffix: alpha4
1313

1414
install:
1515
- ps: .\build\appveyor-semver.ps1

‎build/UmbracoFileSystemProviders.Azure.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependencies>
1919
<dependency id="UmbracoCms.Core" version="0.0.0" />
2020
<dependency id="UmbracoCms.Web" version="0.0.0" />
21-
<dependency id="Microsoft.Azure.Storage.Blob" version="10.0.3" />
21+
<dependency id="Microsoft.Azure.Storage.Blob" version="11.1.0" />
2222
<dependency id="Microsoft.Azure.ConfigurationManager" version="4.0.0" />
2323
<dependency id="Microsoft.Azure.KeyVault.Core" version="3.0.3" />
2424
<dependency id="Microsoft.Data.Services.Client" version="5.8.4" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@
123123
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124124
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.3.0.3\lib\net452\Microsoft.Azure.KeyVault.Core.dll</HintPath>
125125
</Reference>
126-
<Reference Include="Microsoft.Azure.Storage.Blob, Version=10.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127-
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.10.0.3\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
126+
<Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127+
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.0\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
128128
</Reference>
129-
<Reference Include="Microsoft.Azure.Storage.Common, Version=10.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130-
<HintPath>..\packages\Microsoft.Azure.Storage.Common.10.0.3\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
129+
<Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130+
<HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.0\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
131131
</Reference>
132132
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133133
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
3131
<package id="Microsoft.Azure.ConfigurationManager" version="4.0.0" targetFramework="net472" />
3232
<package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
33-
<package id="Microsoft.Azure.Storage.Blob" version="10.0.3" targetFramework="net472" />
34-
<package id="Microsoft.Azure.Storage.Common" version="10.0.3" targetFramework="net472" />
33+
<package id="Microsoft.Azure.Storage.Blob" version="11.1.0" targetFramework="net472" />
34+
<package id="Microsoft.Azure.Storage.Common" version="11.1.0" targetFramework="net472" />
3535
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
3636
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
3737
<package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />

0 commit comments

Comments
 (0)