Allowing developers to optionally disable MD5 content validation.

.gitignore

@@ -4,7 +4,7 @@
 #VS 2015 hidden folder
 src/.vs/*
 
-build/tools/vswhere.2.0.2
+build/tools/vswhere*
 build/tools/vswhere.exe
 
 artifacts/*

README.md

@@ -1,4 +1,6 @@
-# UmbracoFileSystemProviders.Azure
+# UmbracoFileSystemProviders.Azure v1
+
+**This version is for Umbraco v7 only**. For the v2 package for **Umbraco v8** please visit the [develop-umbraco-version-8 branch](https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure/tree/develop-umbraco-version-8)
 
 ![Image Alt](build/assets/logo/azure-logo-256.png)
 
@@ -16,7 +18,7 @@ Both NuGet and Umbraco packages are available. If you use NuGet but would like t
 |NuGet Packages    |Version           |
 |:-----------------|:-----------------|
 |**Release**|[![NuGet download](http://img.shields.io/nuget/v/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/)|
-|**Pre-release**|[![MyGet download](https://img.shields.io/myget/umbracofilesystemproviders-azure/vpre/UmbracoFileSystemProviders.Azure.svg)](https://www.myget.org/gallery/umbracofilesystemproviders-azure)|[![MyGet count](https://img.shields.io/myget/umbracofilesystemproviders-azure/dt/UmbracoFileSystemProviders.Azure.svg)](https://www.myget.org/gallery/umbracofilesystemproviders-azure)|
+|**Pre-release**|[![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)|
 
 |Umbraco Packages  |                  |
 |:-----------------|:-----------------|
@@ -51,7 +53,7 @@ Update `~/Config/FileSystemProviders.config` replacing the default provider with
   <Provider alias="media" type="Our.Umbraco.FileSystemProviders.Azure.AzureBlobFileSystem, Our.Umbraco.FileSystemProviders.Azure">
     <Parameters>
       <add key="containerName" value="media" />
-      <add key="rootUrl" value="http://[myAccountName].blob.core.windows.net/" />
+      <add key="rootUrl" value="https://[myAccountName].blob.core.windows.net/" />
       <add key="connectionString" value="DefaultEndpointsProtocol=https;AccountName=[myAccountName];AccountKey=[myAccountKey]"/>
       <!--
         Optional configuration value determining the maximum number of days to cache items in the browser.
@@ -125,17 +127,60 @@ In `FileSystemProviders.config` remove the default parameters and add a new one
 </FileSystemProviders>
 ```
 
+
 In `Web.config` create the new application keys and post fix each key with the `alias` defined in `FileSystemProviders.config` after a colon.
 
 ```xml
 <add key="AzureBlobFileSystem.ConnectionString:media" value="DefaultEndpointsProtocol=https;AccountName=[myAccountName];AccountKey=[myAccountKey]" />
 <add key="AzureBlobFileSystem.ContainerName:media" value="media" />
-<add key="AzureBlobFileSystem.RootUrl:media" value="http://[myAccountName].blob.core.windows.net/" />
+<add key="AzureBlobFileSystem.RootUrl:media" value="https://[myAccountName].blob.core.windows.net/" />
 <add key="AzureBlobFileSystem.MaxDays:media" value="365" />
 <add key="AzureBlobFileSystem.UseDefaultRoute:media" value="true" />
 <add key="AzureBlobFileSystem.UsePrivateContainer:media" value="false" />
 ```
 
+**Available in v1.1.2+**
+It is possible to disable the MD5 Content Validation.
+
+MD5 Is used to check the integrity of files downloaded. Only disable MD5 validation if you trust the source of the files and know that there has been no issue with file upload. 
+For example open the file directly from blobstorage to check that it opens without issue.
+
+To use this property:
+
+In `FileSystemProviders.config` remove the default parameters and add a new one with the key `disableContentMD5Validation`, the value should be true to disable it, by default it is enabled
+
+```xml
+<?xml version="1.0"?>
+<FileSystemProviders>
+
+  <!-- Media -->
+  <Provider alias="media" type="Our.Umbraco.FileSystemProviders.Azure.AzureBlobFileSystem, Our.Umbraco.FileSystemProviders.Azure">
+  	<Parameters>
+  		<add key="disableContentMD5Validation" value="true"/>
+  	</Parameters>
+  </Provider>
+
+</FileSystemProviders>
+```
+
+Or in `Web.config`
+
+```xml
+<add key="AzureBlobFileSystem.UsePrivateContainer:disableContentMD5Validation" value="true" />
+```
+
+#### Configuration for Azure Key Vault
+For Azure Key Vault only the key values in the `Web.config` should use '-', rather than a '.' or ':' as shown below
+
+```xml
+<add key="AzureBlobFileSystem-ConnectionString-media" value="DefaultEndpointsProtocol=https;AccountName=[myAccountName];AccountKey=[myAccountKey]" />
+<add key="AzureBlobFileSystem-ContainerName-media" value="media" />
+<add key="AzureBlobFileSystem-RootUrl-media" value="https://[myAccountName].blob.core.windows.net/" />
+<add key="AzureBlobFileSystem-MaxDays-media" value="365" />
+<add key="AzureBlobFileSystem-UseDefaultRoute-media" value="true" />
+<add key="AzureBlobFileSystem-UsePrivateContainer-media" value="false" />
+```
+
 ## Virtual Path Provider
 By default the plugin will serve files transparently from your domain or serve media directly from Azure. This is made possible by using a custom [Virtual Path Provider](https://msdn.microsoft.com/en-us/library/system.web.hosting.virtualpathprovider%28v=vs.110%29.aspx) included and automatically initialised upon application startup. This can be disable by adding the configuration setting noted above.
 
@@ -186,7 +231,7 @@ the cloud simply install the [configuration package](https://www.nuget.org/packa
       <settings>
         <setting key="MaxBytes" value="8194304"/>
         <setting key="Timeout" value="30000"/>
-        <setting key="Host" value="http://[myAccountName].blob.core.windows.net/media/"/>
+        <setting key="Host" value="https://[myAccountName].blob.core.windows.net/media/"/>
       </settings>
     </service>
   </services>  
@@ -206,7 +251,7 @@ If using a version of ImageProcessor.Web version [4.5.0](https://www.nuget.org/p
         <setting key="Container" value="media"/>
         <setting key="MaxBytes" value="8194304"/>
         <setting key="Timeout" value="30000"/>
-        <setting key="Host" value="http://[myAccountName].blob.core.windows.net/media"/>
+        <setting key="Host" value="https://[myAccountName].blob.core.windows.net/media"/>
       </settings>
     </service>
   </services>  

appveyor.yml

@@ -1,29 +1,49 @@
 os: Visual Studio 2017
 
 # Version format
-version: 1.0.3.{build}
+version: 1.2.1.{build}
 
 cache:
   - src\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
 
-# UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
-# example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
-init:
-  - set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=
+configuration: Release
+
+environment:
+  # Version Suffix
+  version_suffix: alpha
 
 install:
+  - ps: .\build\appveyor-semver.ps1
+  - ps: .\build\check-release-version.ps1
+  - ps: Update-AppveyorBuild -Version $Env:appveyor_version
+  - cmd: >-
+        cd build
+
+        npm install
+
+        cd..
   - ps: >-
       $msiPath = "$($env:USERPROFILE)\MicrosoftAzureStorageEmulator.msi"
 
       (New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/F/3/8/F3857A38-D344-43B4-8E5B-2D03489909B9/MicrosoftAzureStorageEmulator.msi', $msiPath)
 
       cmd /c start /wait msiexec /i $msiPath /quiet
 
+assembly_info:
+  patch: true
+  file: 'src\UmbracoFileSystemProviders.Azure**\AssemblyInfo.*'
+  assembly_version: '$(appveyor_file_version)'
+  assembly_file_version: '$(appveyor_file_version)'
+  assembly_informational_version: '$(mssemver)'
+
 build_script:
-- build-appveyor.cmd
+- cmd: >-
+    build-appveyor.cmd
+
+    cd..
 
 before_test:
-- cmd: '"%programfiles(x86)%\Microsoft SDKs\Azure\Storage Emulator\AzureStorageEmulator.exe" start'
+- cmd: '"%programfiles(x86)%\Microsoft SDKs\Azure\Storage Emulator\AzureStorageEmulator.exe" start'
 # Turn tests off just now
 test: on
 
@@ -32,33 +52,95 @@ artifacts:
   - path: artifacts\*.zip
 
 deploy:
-     # MyGet Deployment for builds & releases
+  # Umbraco MyGet community feed - v3
+  - provider: NuGet
+    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: yvlnQEq6tmxGOdbtTuKyAhcdY1GCD98/sG9+Qo7y7SNb89GAbjLXxueOMspkjvUh
+    artifact: /.*\.nupkg/
+    on:
+      branch: develop-version-3
+
+    # GitHub Deployment for releases -v3
+  - provider: GitHub
+    auth_token:
+      secure: Kucu1gQQf8bjRlkR72fyZUiUtmkz7rtZEIgK/RMT1pMnq700m5sSQTiFHOSQUdR5
+    artifact: /.*\.zip/            # upload all Zip packages to release assets
+    draft: false
+    prerelease: false
+    on:
+      branch: main-version-3
+      appveyor_repo_tag: true        # deploy on tag push only
+
+    # NuGet Deployment for releases - v3
+  - provider: NuGet
+    server:
+    api_key:
+      secure: TtE4dizVNNLoy4gfrJDGRH1/vfNMTXiAxuMW0va1bcO1ZPXCw0qy12PUfIB+h9O3
+    artifact: /.*\.nupkg/
+    on:
+      branch: main-version-3
+      appveyor_repo_tag: true
+
+  # Umbraco MyGet community feed
+  - provider: NuGet
+    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: yvlnQEq6tmxGOdbtTuKyAhcdY1GCD98/sG9+Qo7y7SNb89GAbjLXxueOMspkjvUh
+    artifact: /.*\.nupkg/
+    on:
+      branch: develop-version-2
+
+    # GitHub Deployment for releases -v2
+  - provider: GitHub
+    auth_token:
+      secure: Kucu1gQQf8bjRlkR72fyZUiUtmkz7rtZEIgK/RMT1pMnq700m5sSQTiFHOSQUdR5
+    artifact: /.*\.zip/            # upload all Zip packages to release assets
+    draft: false
+    prerelease: false
+    on:
+      branch: master-version-2
+      appveyor_repo_tag: true        # deploy on tag push only
+
+    # NuGet Deployment for releases - v2
+  - provider: NuGet
+    server:
+    api_key:
+      secure: TtE4dizVNNLoy4gfrJDGRH1/vfNMTXiAxuMW0va1bcO1ZPXCw0qy12PUfIB+h9O3
+    artifact: /.*\.nupkg/
+    on:
+      branch: master-version-2
+      appveyor_repo_tag: true
+
+     # MyGet Deployment for builds & releases -v1
   - 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
+      branch: develop-version-1
 
-     # GitHub Deployment for releases
+    # GitHub Deployment for releases -v1
   - provider: GitHub
     auth_token:
-      secure: gnJNHw3btYiQ7G0GexIGpSyA3moAz/GuJvgGZvJmz63/+YVLFC+qew/xlniRLDSk
+      secure: Kucu1gQQf8bjRlkR72fyZUiUtmkz7rtZEIgK/RMT1pMnq700m5sSQTiFHOSQUdR5
     artifact: /.*\.zip/            # upload all Zip packages to release assets
     draft: false
     prerelease: false
     on:
-      branch: master
+      branch: main-version-1
       appveyor_repo_tag: true        # deploy on tag push only
 
-     # NuGet Deployment for releases
+    # NuGet Deployment for releases - v1
   - provider: NuGet
     server:
     api_key:
-      secure: kHataLiMb9nmJEdwBE4BTXvA4nOpoD3Fw14zVeDP6Vs0ZXpL7c8qeegMv/jMZECP
+      secure: TtE4dizVNNLoy4gfrJDGRH1/vfNMTXiAxuMW0va1bcO1ZPXCw0qy12PUfIB+h9O3
     artifact: /.*\.nupkg/
     on:
-      branch: master
+      branch: main-version-1
       appveyor_repo_tag: true

build-appveyor.cmd

@@ -2,6 +2,7 @@ ECHO APPVEYOR_REPO_BRANCH: %APPVEYOR_REPO_BRANCH%
 ECHO APPVEYOR_REPO_TAG: %APPVEYOR_REPO_TAG%
 ECHO APPVEYOR_BUILD_NUMBER : %APPVEYOR_BUILD_NUMBER%
 ECHO APPVEYOR_BUILD_VERSION : %APPVEYOR_BUILD_VERSION%
+ECHO CONFIGURATION : %CONFIGURATION%
 
 CALL NuGet.exe restore src\UmbracoFileSystemProviders.Azure.sln
 
@@ -14,24 +15,28 @@ IF NOT EXIST "%toolsFolder%" (
 
 IF NOT EXIST "%toolsFolder%vswhere.exe" (
 	ECHO vswhere not found - fetching now
-	nuget install vswhere -Version 2.0.2 -Source nuget.org -OutputDirectory tools
+	nuget install vswhere -Version 2.7.1 -Source nuget.org -OutputDirectory tools
 )
 
 FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A\"
 MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe"
 
-for /f "usebackq tokens=1* delims=: " %%i in (`"%CD%\tools\vswhere.exe" -latest -requires Microsoft.Component.MSBuild`) do (
-  if /i "%%i"=="installationPath" set InstallDir=%%j
-)
+SETLOCAL EnableDelayedExpansion
+
+:: This string specifies vs 2019
+:: set vswherestr=^"!%CD%\tools\vswhere.exe^" -version [16.0,17.0^^) -latest -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
 
-SET VSWherePath="%InstallDir%\MSBuild"
+set vswherestr=^"!%CD%\tools\vswhere.exe^" -latest -prerelease -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
+for /f "usebackq tokens=*" %%i in (`!vswherestr!`) do (  
+  set MsBuildDir=%%i
+)
 
 ECHO.
-ECHO Visual Studio is installed in: %InstallDir%
+ECHO MsBuild is installed in: %MsBuildDir%
 
-CALL "%InstallDir%\MSBuild\15.0\Bin\amd64\MsBuild.exe" package.proj %~1
+CALL "%MsBuildDir%" package.proj %~1
 
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @EXIT /B 0
 :err
-@EXIT /B 1
+@EXIT /B 1

build.cmd

@@ -2,7 +2,7 @@ ECHO off
 
 SET /P APPVEYOR_BUILD_NUMBER=Please enter a build number (e.g. 134):
 SET /P PACKAGE_VERISON=Please enter your package version (e.g. 1.0.5):
-SET /P UMBRACO_PACKAGE_PRERELEASE_SUFFIX=Please enter your package release suffix or leave empty (e.g. beta):
+SET /P version_suffix=Please enter your package release suffix or leave empty (e.g. beta):
 
 SET /P APPVEYOR_REPO_TAG=If you want to simulate a GitHub tag for a release (e.g. true):
 
@@ -13,10 +13,19 @@ if "%PACKAGE_VERISON%" == "" (
   SET PACKAGE_VERISON=0.1.0
 )
 
-SET APPVEYOR_BUILD_VERSION=%PACKAGE_VERISON%.%APPVEYOR_BUILD_NUMBER%
+SET mssemver=%PACKAGE_VERISON%-beta-%APPVEYOR_BUILD_NUMBER%
+
+SET CONFIGURATION=Debug
+
+cd build
+call npm install
+call node appveyor-nuspec-patch.js
+cd..
 
 build-appveyor.cmd
 
+cd..
+
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @EXIT /B 0
 :err