Skip to content

Commit 9906799

Browse files
JeavonJeavon
committed
Merge branch 'develop-umbraco-version-8' into master-umbraco-version-8
2 parents 511aa3a + f7cda9a commit 9906799

File tree

10 files changed

+28
-25
lines changed

10 files changed

+28
-25
lines changed

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,10 @@ In `Web.config` update the new application keys with the required credentials
160160
<add key="AzureBlobFileSystem.UsePrivateContainer:forms" value="false" />
161161
```
162162

163+
### Warning
164+
165+
The Azure Blob container cannot be called `forms` as this will give unexpected behaviour, and we recommend you call it `form-data` or similar.
166+
163167
## Authors
164168

165169
- James Jackson-South

‎appveyor.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ configuration: Release
99

1010
environment:
1111
# Version Suffix
12-
version_suffix: alpha5
12+
version_suffix: beta1
1313

1414
install:
1515
- ps: .\build\appveyor-semver.ps1
@@ -55,10 +55,10 @@ artifacts:
5555
deploy:
5656
# MyGet Deployment for builds & releases
5757
- provider: NuGet
58-
server: https://www.myget.org/F/umbracofilesystemproviders-azure/api/v2/package
59-
symbol_server: https://www.myget.org/F/umbracofilesystemproviders-azure/symbols/api/v2/package
58+
server: https://www.myget.org/F/umbraco-packages/api/v2/package
59+
symbol_server: https://www.myget.org/F/umbraco-packages/symbols/api/v2/package
6060
api_key:
61-
secure: fz0rUrt3B1HczUC1ZehwVsrFSWX9WZGDQoueDztLte9/+yQG+BBU7UrO+coE8lUf
61+
secure: yvlnQEq6tmxGOdbtTuKyAhcdY1GCD98/sG9+Qo7y7SNb89GAbjLXxueOMspkjvUh
6262
artifact: /.*\.nupkg/
6363
on:
6464
branch: develop

‎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="11.1.0" />
21+
<dependency id="Microsoft.Azure.Storage.Blob" version="11.1.2" />
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=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>
126+
<Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127+
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.2\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
128128
</Reference>
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>
129+
<Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130+
<HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.2\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="11.1.0" targetFramework="net472" />
34-
<package id="Microsoft.Azure.Storage.Common" version="11.1.0" targetFramework="net472" />
33+
<package id="Microsoft.Azure.Storage.Blob" version="11.1.2" targetFramework="net472" />
34+
<package id="Microsoft.Azure.Storage.Common" version="11.1.2" 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" />

‎src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.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=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>
126+
<Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127+
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.2\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
128128
</Reference>
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>
129+
<Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130+
<HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.2\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.Tests/packages.config‎

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

‎src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,8 +684,7 @@ public Stream OpenFile(string path)
684684
return null;
685685
}
686686

687-
MemoryStream stream = new MemoryStream();
688-
blockBlob.DownloadToStream(stream);
687+
Stream stream = blockBlob.OpenRead();
689688

690689
if (stream.CanSeek)
691690
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@
124124
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125125
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.3.0.3\lib\net452\Microsoft.Azure.KeyVault.Core.dll</HintPath>
126126
</Reference>
127-
<Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128-
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.0\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
127+
<Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128+
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.2\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
129129
</Reference>
130-
<Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131-
<HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.0\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
130+
<Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131+
<HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.2\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
132132
</Reference>
133133
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134134
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>

‎src/UmbracoFileSystemProviders.Azure/packages.config‎

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

0 commit comments

Comments
 (0)