Skip to content

Commit 77b4647

Browse files
committed
Merge branch 'develop-version-3' into main-version-3
2 parents e222ce2 + 568b057 commit 77b4647

20 files changed

+484
-204
lines changed

NuGet.Config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
-->
88
<packageSources>
99
<add key="UmbracoCoreMyGet" value="https://www.myget.org/F/umbracocore/api/v3/index.json" />
10-
<add key="ExamineAppVeyor" value="https://ci.appveyor.com/nuget/examine-f73l6qv0oqfh/" />
1110
</packageSources>
1211
</configuration>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
**This version is for Umbraco v8 only**. For the v1 package for **Umbraco v7** please visit the [develop branch](https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure/tree/develop)
44

5-
**For Umbraco v9** please goto [https://github.com/umbraco/Umbraco.StorageProviders](https://github.com/umbraco/Umbraco.StorageProviders)
5+
**For Umbraco v9 & v10** please goto [https://github.com/umbraco/Umbraco.StorageProviders](https://github.com/umbraco/Umbraco.StorageProviders)
66

77
![Image Alt](build/assets/logo/azure-logo-256.png)
88

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
version: 3.0.2.{build}
1+
version: 3.1.0.{build}
22

3-
os: Visual Studio 2019
3+
os: Visual Studio 2022
44

55
cache:
66
- 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.Forms.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<!-- SHARED PROPERTIES -->
1717
<PropertyGroup>
1818
<PackageName>UmbracoFileSystemProviders.Azure.Forms</PackageName>
19-
<MinUmbracoVersion>8.1.0</MinUmbracoVersion>
19+
<MinUmbracoVersion>8.18.5</MinUmbracoVersion>
2020
<Readme>An Azure Blob Storage IFileSystem provider for Umbraco Forms files.</Readme>
2121
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold, Warren Buckley, Callum Whyte, Sebastiaan Janssen, Rachel Breeze, Shannon Deminick, Chad Currie</AuthorName>
2222
<AuthorUrl>https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure/graphs/contributors</AuthorUrl>

build/UmbracoFileSystemProviders.Azure.Media.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<!-- SHARED PROPERTIES -->
1717
<PropertyGroup>
1818
<PackageName>UmbracoFileSystemProviders.Azure.Media</PackageName>
19-
<MinUmbracoVersion>8.1.0</MinUmbracoVersion>
19+
<MinUmbracoVersion>8.18.5</MinUmbracoVersion>
2020
<Readme>An Azure Blob Storage IFileSystem provider for Umbraco Media.</Readme>
2121
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold, Warren Buckley, Callum Whyte, Sebastiaan Janssen, Rachel Breeze, Shannon Deminick, Chad Currie</AuthorName>
2222
<AuthorUrl>https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure/graphs/contributors</AuthorUrl>

build/UmbracoFileSystemProviders.Azure.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<dependencies>
1919
<dependency id="UmbracoCms.Core" version="0.0.0" />
2020
<dependency id="UmbracoCms.Web" version="0.0.0" />
21-
<dependency id="Azure.Storage.Blobs" version="12.10.0" />
22-
<dependency id="Azure.Storage.Common" version="12.9.0" />
23-
<dependency id="Azure.Core" version="1.19.0" />
21+
<dependency id="Azure.Storage.Blobs" version="12.17.0" />
22+
<dependency id="Azure.Storage.Common" version="12.16.0" />
23+
<dependency id="Azure.Core" version="1.33.0" />
2424
<dependency id="System.Diagnostics.DiagnosticSource" version="5.0.0" />
2525
</dependencies>
2626
</metadata>

build/UmbracoFileSystemProviders.Azure.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<!-- SHARED PROPERTIES -->
1515
<PropertyGroup>
1616
<PackageName>UmbracoFileSystemProviders.Azure</PackageName>
17-
<MinUmbracoVersion>8.1.0</MinUmbracoVersion>
17+
<MinUmbracoVersion>8.18.5</MinUmbracoVersion>
1818
<Readme>An Azure Blob Storage IFileSystem provider for Umbraco.</Readme>
1919
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold, Warren Buckley, Callum Whyte, Sebastiaan Janssen, Rachel Breeze, Shannon Deminick, Chad Currie</AuthorName>
2020
<AuthorUrl>https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure/graphs/contributors</AuthorUrl>

src/UmbracoFileSystemProviders.Azure.Forms/UmbracoFileSystemProviders.Azure.Forms.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="UmbracoCms.Web" Version="8.1.0" />
10+
<PackageReference Include="UmbracoCms.Web" Version="8.18.5" />
1111
<PackageReference Include="UmbracoForms.Core" Version="8.1.1" />
1212
</ItemGroup>
1313

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

Lines changed: 100 additions & 41 deletions
Large diffs are not rendered by default.

src/UmbracoFileSystemProviders.Azure.Installer/app.config

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,18 @@
106106
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
107107
<bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1" />
108108
</dependentAssembly>
109+
<dependentAssembly>
110+
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
111+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
112+
</dependentAssembly>
113+
<dependentAssembly>
114+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
115+
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
116+
</dependentAssembly>
117+
<dependentAssembly>
118+
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
119+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
120+
</dependentAssembly>
109121
</assemblyBinding>
110122
</runtime>
111123
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

0 commit comments

Comments
 (0)