Merge branch 'develop-umbraco-version-8' into master-umbraco-version-8

umbraco-community · Feb 10, 2020 · 9906799 · 9906799
2 parents 511aa3a + f7cda9a
commit 9906799
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -160,6 +160,10 @@ In `Web.config` update the new application keys with the required credentials
 <add key="AzureBlobFileSystem.UsePrivateContainer:forms" value="false" />
 ```
 
+### Warning
+
+The Azure Blob container cannot be called `forms` as this will give unexpected behaviour, and we recommend you call it `form-data` or similar.
+
 ## Authors
 
  - James Jackson-South

diff --git a/appveyor.yml b/appveyor.yml
@@ -9,7 +9,7 @@ configuration: Release
 
 environment:
   # Version Suffix
-  version_suffix: alpha5
+  version_suffix: beta1
 
 install:
   - ps: .\build\appveyor-semver.ps1
@@ -55,10 +55,10 @@ artifacts:
 deploy:
      # MyGet Deployment for builds & releases
   - provider: NuGet
-    server: https://www.myget.org/F/umbracofilesystemproviders-azure/api/v2/package
-    symbol_server: https://www.myget.org/F/umbracofilesystemproviders-azure/symbols/api/v2/package
+    server: https://www.myget.org/F/umbraco-packages/api/v2/package
+    symbol_server: https://www.myget.org/F/umbraco-packages/symbols/api/v2/package
     api_key:
-      secure: fz0rUrt3B1HczUC1ZehwVsrFSWX9WZGDQoueDztLte9/+yQG+BBU7UrO+coE8lUf
+      secure: yvlnQEq6tmxGOdbtTuKyAhcdY1GCD98/sG9+Qo7y7SNb89GAbjLXxueOMspkjvUh
     artifact: /.*\.nupkg/
     on:
       branch: develop

diff --git a/build/UmbracoFileSystemProviders.Azure.nuspec b/build/UmbracoFileSystemProviders.Azure.nuspec
@@ -18,7 +18,7 @@
         <dependencies>
             <dependency id="UmbracoCms.Core" version="0.0.0" />
             <dependency id="UmbracoCms.Web" version="0.0.0" />
-            <dependency id="Microsoft.Azure.Storage.Blob" version="11.1.0" />
+            <dependency id="Microsoft.Azure.Storage.Blob" version="11.1.2" />
             <dependency id="Microsoft.Azure.ConfigurationManager" version="4.0.0" />
             <dependency id="Microsoft.Azure.KeyVault.Core" version="3.0.3" />
             <dependency id="Microsoft.Data.Services.Client" version="5.8.4" />

diff --git a/...racoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj b/...racoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj
@@ -123,11 +123,11 @@
     <Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Azure.KeyVault.Core.3.0.3\lib\net452\Microsoft.Azure.KeyVault.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.0\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.2\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.0\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.2\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>

diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/packages.config b/src/UmbracoFileSystemProviders.Azure.Installer/packages.config
@@ -30,8 +30,8 @@
   <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
   <package id="Microsoft.Azure.ConfigurationManager" version="4.0.0" targetFramework="net472" />
   <package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
-  <package id="Microsoft.Azure.Storage.Blob" version="11.1.0" targetFramework="net472" />
-  <package id="Microsoft.Azure.Storage.Common" version="11.1.0" targetFramework="net472" />
+  <package id="Microsoft.Azure.Storage.Blob" version="11.1.2" targetFramework="net472" />
+  <package id="Microsoft.Azure.Storage.Common" version="11.1.2" targetFramework="net472" />
   <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />

diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj b/src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj
@@ -123,11 +123,11 @@
     <Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Azure.KeyVault.Core.3.0.3\lib\net452\Microsoft.Azure.KeyVault.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.0\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.2\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.0\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.2\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>

diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/packages.config b/src/UmbracoFileSystemProviders.Azure.Tests/packages.config
@@ -29,8 +29,8 @@
   <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
   <package id="Microsoft.Azure.ConfigurationManager" version="4.0.0" targetFramework="net472" />
   <package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
-  <package id="Microsoft.Azure.Storage.Blob" version="11.1.0" targetFramework="net472" />
-  <package id="Microsoft.Azure.Storage.Common" version="11.1.0" targetFramework="net472" />
+  <package id="Microsoft.Azure.Storage.Blob" version="11.1.2" targetFramework="net472" />
+  <package id="Microsoft.Azure.Storage.Common" version="11.1.2" targetFramework="net472" />
   <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />

diff --git a/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs b/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs
@@ -684,8 +684,7 @@ public Stream OpenFile(string path)
                     return null;
                 }
 
-                MemoryStream stream = new MemoryStream();
-                blockBlob.DownloadToStream(stream);
+                Stream stream = blockBlob.OpenRead();
 
                 if (stream.CanSeek)
                 {

diff --git a/src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj b/src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj
@@ -124,11 +124,11 @@
     <Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Azure.KeyVault.Core.3.0.3\lib\net452\Microsoft.Azure.KeyVault.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.0\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Storage.Blob, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.1.2\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.0\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Storage.Common, Version=11.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Azure.Storage.Common.11.1.2\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>

diff --git a/src/UmbracoFileSystemProviders.Azure/packages.config b/src/UmbracoFileSystemProviders.Azure/packages.config
@@ -29,8 +29,8 @@
   <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
   <package id="Microsoft.Azure.ConfigurationManager" version="4.0.0" targetFramework="net472" />
   <package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
-  <package id="Microsoft.Azure.Storage.Blob" version="11.1.0" targetFramework="net472" />
-  <package id="Microsoft.Azure.Storage.Common" version="11.1.0" targetFramework="net472" />
+  <package id="Microsoft.Azure.Storage.Blob" version="11.1.2" targetFramework="net472" />
+  <package id="Microsoft.Azure.Storage.Common" version="11.1.2" targetFramework="net472" />
   <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
   <package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />