Skip to content

Commit ab24e97

Browse files
JeavonJeavon
committed
Merge branch 'develop'
2 parents 23bd0d8 + 2545a8b commit ab24e97

18 files changed

+218
-83
lines changed

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
os: Visual Studio 2017
22

33
# Version format
4-
version: 1.0.0.{build}
4+
version: 1.0.1.{build}
55

66
cache:
77
- src\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified

‎build/UmbracoFileSystemProviders.Azure.proj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
<BinFiles Include="$(ProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.dll" />
125125
<PdbFiles Include="$(ProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.pdb" />
126126
<WebConfigXDTFiles Include="$(MSBuildProjectDirectory)\transforms\web.config.*.xdt" />
127+
<UmbPakWebConfigXDTFiles Include="$(MSBuildProjectDirectory)\transforms\umbpak-web.config.*.xdt" />
127128
<FileSystemProvidersConfigXDTInstallFile Include="$(MSBuildProjectDirectory)\transforms\FileSystemProviders.config.install.xdt" />
128129

129130
<!-- The FileSystemProviders.config.uninstall.xdt needs to be excluded from the NuGet package so that upgrades don't overwrite parameter values due to NuGet upgrades actually executing uninstall/install -->
@@ -153,6 +154,7 @@
153154
<Copy SourceFiles="@(InstallerBinFiles)" DestinationFolder="$(BuildUmbDir)\bin" />
154155
<Copy SourceFiles="@(UmbracoOtherBinFiles)" DestinationFolder="$(BuildUmbDir)\bin" />
155156
<Copy SourceFiles="@(WebConfigXDTFiles)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
157+
<Copy SourceFiles="@(UmbPakWebConfigXDTFiles)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
156158
<Copy SourceFiles="@(MediaWebConfigXDTInstallFile)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
157159
<Copy SourceFiles="@(MediaWebConfigXDTUninstallFile)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
158160

‎build/package.nuspec

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3-
<metadata>
4-
<id></id>
5-
<version>0.0.0</version>
6-
<title></title>
7-
<authors></authors>
8-
<owners></owners>
9-
<projectUrl></projectUrl>
10-
<iconUrl></iconUrl>
11-
<requireLicenseAcceptance></requireLicenseAcceptance>
12-
<description></description>
13-
<summary></summary>
14-
<copyright></copyright>
15-
<licenseUrl></licenseUrl>
16-
<language></language>
17-
<tags></tags>
18-
<dependencies>
19-
<dependency id="UmbracoCms.Core" version="0.0.0" />
20-
<dependency id="WindowsAzure.Storage" version="8.2.1" />
21-
<dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.3" />
3+
<metadata>
4+
<id></id>
5+
<version>0.0.0</version>
6+
<title></title>
7+
<authors></authors>
8+
<owners></owners>
9+
<projectUrl></projectUrl>
10+
<iconUrl></iconUrl>
11+
<requireLicenseAcceptance></requireLicenseAcceptance>
12+
<description></description>
13+
<summary></summary>
14+
<copyright></copyright>
15+
<licenseUrl></licenseUrl>
16+
<language></language>
17+
<tags></tags>
18+
<dependencies>
19+
<dependency id="UmbracoCms.Core" version="0.0.0" />
20+
<dependency id="WindowsAzure.Storage" version="8.7.0" />
21+
<dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.3" />
22+
<dependency id="Microsoft.Azure.KeyVault.Core" version="2.0.4" />
23+
<dependency id="Microsoft.Data.Services.Client" version="5.8.3" />
2224
</dependencies>
23-
</metadata>
25+
</metadata>
2426
</package>

‎build/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<DataTypes />
3030

3131
<Actions>
32+
<Action runat="install" undo="true" alias="UmbracoFileSystemProviders.Azure.TransformConfig" file="~/web.config" xdtfile="~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/umbpak-web.config"></Action>
3233
<Action runat="uninstall" undo="true" alias="UmbracoFileSystemProviders.Azure.TransformConfig" file="~/web.config" xdtfile="~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/web.config"></Action>
3334
<Action runat="uninstall" undo="true" alias="UmbracoFileSystemProviders.Azure.TransformConfig" file="~/Config/FileSystemProviders.config" xdtfile="~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/FileSystemProviders.config"></Action>
3435
<Action runat="uninstall" undo="true" alias="UmbracoFileSystemProviders.Azure.TransformConfig" file="~/Media/web.config" xdtfile="~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/media-web.config"></Action>

‎build/transforms/umbpak-web.config.install.xdt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0"?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing">
5+
6+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.WindowsAzure.Storage')">
7+
</dependentAssembly>
8+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
9+
</dependentAssembly>
10+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
11+
</dependentAssembly>
12+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
13+
</dependentAssembly>
14+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
15+
</dependentAssembly>
16+
17+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.WindowsAzure.Storage')">
18+
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.7.0.0" xdt:Transform="SetAttributes" />
20+
</dependentAssembly>
21+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
22+
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" xdt:Transform="SetAttributes" />
24+
</dependentAssembly>
25+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
26+
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" xdt:Transform="SetAttributes" />
28+
</dependentAssembly>
29+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
30+
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" xdt:Transform="SetAttributes" />
32+
</dependentAssembly>
33+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
34+
<assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" xdt:Transform="SetAttributes" />
36+
</dependentAssembly>
37+
</assemblyBinding>
38+
</runtime>
39+
</configuration>

‎build/transforms/umbpak-web.config.uninstall.xdt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0"?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.WindowsAzure.Storage')">
6+
</dependentAssembly>
7+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
8+
</dependentAssembly>
9+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
10+
</dependentAssembly>
11+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
12+
</dependentAssembly>
13+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
14+
</dependentAssembly>
15+
</assemblyBinding>
16+
</runtime>
17+
</configuration>

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,17 @@
9797
<HintPath>..\packages\UmbracoCms.Core.7.1.9\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
9898
<Private>True</Private>
9999
</Reference>
100-
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101-
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
102-
<Private>True</Private>
100+
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101+
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.2.0.4\lib\net45\Microsoft.Azure.KeyVault.Core.dll</HintPath>
103102
</Reference>
104-
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105-
<HintPath>..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
103+
<Reference Include="Microsoft.Data.Edm, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
104+
<HintPath>..\packages\Microsoft.Data.Edm.5.8.3\lib\net40\Microsoft.Data.Edm.dll</HintPath>
106105
</Reference>
107-
<Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
108-
<HintPath>..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
106+
<Reference Include="Microsoft.Data.OData, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107+
<HintPath>..\packages\Microsoft.Data.OData.5.8.3\lib\net40\Microsoft.Data.OData.dll</HintPath>
109108
</Reference>
110-
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
111-
<HintPath>..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
109+
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110+
<HintPath>..\packages\Microsoft.Data.Services.Client.5.8.3\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
112111
</Reference>
113112
<Reference Include="Microsoft.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114113
<HintPath>..\packages\UmbracoCms.Core.7.1.9\lib\Microsoft.Web.Helpers.dll</HintPath>
@@ -129,8 +128,8 @@
129128
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130129
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
131130
</Reference>
132-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133-
<HintPath>..\packages\WindowsAzure.Storage.8.2.1\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
131+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
132+
<HintPath>..\packages\WindowsAzure.Storage.8.7.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
134133
</Reference>
135134
<Reference Include="MiniProfiler, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
136135
<HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
@@ -164,8 +163,8 @@
164163
<Private>True</Private>
165164
</Reference>
166165
<Reference Include="System.Net.Http.WebRequest" />
167-
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
168-
<HintPath>..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
166+
<Reference Include="System.Spatial, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
167+
<HintPath>..\packages\System.Spatial.5.8.3\lib\net40\System.Spatial.dll</HintPath>
169168
</Reference>
170169
<Reference Include="System.Web" />
171170
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,22 @@
2222
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
2323
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
2424
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />
32+
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />
36+
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />
40+
</dependentAssembly>
2541
</assemblyBinding>
2642
</runtime>
2743
</configuration>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
1818
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
1919
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
20-
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
21-
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net45" />
22-
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net45" />
23-
<package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net45" />
20+
<package id="Microsoft.Azure.KeyVault.Core" version="2.0.4" targetFramework="net45" />
21+
<package id="Microsoft.Data.Edm" version="5.8.3" targetFramework="net45" />
22+
<package id="Microsoft.Data.OData" version="5.8.3" targetFramework="net45" />
23+
<package id="Microsoft.Data.Services.Client" version="5.8.3" targetFramework="net45" />
2424
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
2525
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
2626
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
@@ -34,8 +34,8 @@
3434
<package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net45" />
3535
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />
3636
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
37-
<package id="System.Spatial" version="5.8.2" targetFramework="net45" />
37+
<package id="System.Spatial" version="5.8.3" targetFramework="net45" />
3838
<package id="UmbracoCms.Core" version="7.1.9" targetFramework="net45" />
39-
<package id="WindowsAzure.Storage" version="8.2.1" targetFramework="net45" />
39+
<package id="WindowsAzure.Storage" version="8.7.0" targetFramework="net45" />
4040
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
4141
</packages>

‎src/UmbracoFileSystemProviders.Azure.Tests/AzureBlobFileSystemTestsBase.cs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Copyright (c) James Jackson-South and contributors. All rights reserved.
33
// Licensed under the Apache License, Version 2.0.
44
// </copyright>
5-
65
namespace Our.Umbraco.FileSystemProviders.Azure.Tests
76
{
87
using System;
@@ -352,6 +351,23 @@ public void TestGetFilesFromRoot()
352351
Assert.IsTrue(expected.SequenceEqual(actual));
353352
}
354353

354+
355+
/// <summary>
356+
/// Asserts that a invalid path parameter passed to GetFiles returns null
357+
/// </summary>
358+
[Test]
359+
public void TestGetFilesInvalidPath()
360+
{
361+
// Arrange
362+
AzureBlobFileSystem provider = this.CreateAzureBlobFileSystem();
363+
364+
// Act
365+
IEnumerable<string> actual = provider.GetFiles("/somethingmissing", "*.jpg");
366+
367+
// Assert
368+
Assert.IsNull(actual);
369+
}
370+
355371
/// <summary>
356372
/// Asserts that the file system correctly returns a sequence of files from the root
357373
/// container in the correct format via a filtered request.

0 commit comments

Comments
 (0)