Skip to content

Commit c54f374

Browse files
ronaldbarendseronaldbarendse
authored
Merge pull request #76 from umbraco/feature/v16
Upgrade to 16.0.0-rc2
2 parents 582b15d + 4169614 commit c54f374

File tree

8 files changed

+23
-27
lines changed

8 files changed

+23
-27
lines changed

‎Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<!-- Package Validation -->
2929
<PropertyGroup>
3030
<GenerateCompatibilitySuppressionFile>false</GenerateCompatibilitySuppressionFile>
31-
<EnablePackageValidation>true</EnablePackageValidation>
32-
<PackageValidationBaselineVersion>15.0.0</PackageValidationBaselineVersion>
31+
<!--<EnablePackageValidation>true</EnablePackageValidation>-->
32+
<PackageValidationBaselineVersion>16.0.0</PackageValidationBaselineVersion>
3333
<EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
3434
<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
3535
</PropertyGroup>

‎Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" />
6+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
77
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
8-
<GlobalPackageReference Include="Umbraco.Code" Version="2.2.0" />
8+
<GlobalPackageReference Include="Umbraco.Code" Version="2.3.0" />
99
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
1010
</ItemGroup>
1111
<PropertyGroup>
12-
<UmbracoCmsPackageVersion>[15.0.0, 16)</UmbracoCmsPackageVersion>
12+
<UmbracoCmsPackageVersion>[16.0.0-rc2, 17)</UmbracoCmsPackageVersion>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<PackageVersion Include="Azure.Storage.Blobs" Version="12.23.0" />
16-
<PackageVersion Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="3.1.3" />
15+
<PackageVersion Include="Azure.Storage.Blobs" Version="12.24.0" />
16+
<PackageVersion Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="3.1.5" />
1717
<PackageVersion Include="Umbraco.Cms.Imaging.ImageSharp" Version="$(UmbracoCmsPackageVersion)" />
1818
<PackageVersion Include="Umbraco.Cms.Web.Common" Version="$(UmbracoCmsPackageVersion)" />
1919
</ItemGroup>

‎README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ This repository contains Umbraco storage providers that can replace the default
33

44
> **Note**
55
> Use the following documentation for previous Umbraco CMS versions:
6-
> * [Umbraco CMS 14 - v14](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/14.x/README.md)
7-
> * [Umbraco CMS 13 - v13](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/13.x/README.md)
8-
> * [Umbraco CMS 12 - v12](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/12.0.x/README.md)
9-
> * [Umbraco CMS 11 - v11](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/11.0.x/README.md)
10-
> * [Umbraco CMS 10 - v10](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/10.0.x/README.md)
6+
> * [Umbraco CMS 15](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/15.x/README.md)
7+
> * [Umbraco CMS 14](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/14.x/README.md)
8+
> * [Umbraco CMS 13](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/13.x/README.md)
9+
> * [Umbraco CMS 12](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/12.0.x/README.md)
10+
> * [Umbraco CMS 11](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/11.0.x/README.md)
11+
> * [Umbraco CMS 10 - v10 (aligned with CMS major version from now on)](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/10.0.x/README.md)
1112
> * [Umbraco CMS 9 - v1](https://github.com/umbraco/Umbraco.StorageProviders/blob/support/1.1.x/README.md)
1213
1314
## Umbraco.StorageProviders
@@ -171,12 +172,12 @@ The container name is expected to exist and uses the following folder structure:
171172
> This is different than the behavior of other file system providers, i.e. [UmbracoFileSystemProviders.Azure](https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure) that expect the media contents to be at the root level.
172173
173174
## Using the file system providers
174-
Please refer to our documentation on [using custom file systems](https://our.umbraco.com/documentation/Extending/FileSystemProviders/).
175+
Please refer to our documentation on [using custom file systems](https://docs.umbraco.com/umbraco-cms/extending/filesystemproviders).
175176

176177
## Bugs, issues and Pull Requests
177178
If you encounter a bug when using this client library you are welcome to open an issue in the issue tracker of this repository. We always welcome Pull Request and please feel free to open an issue before submitting a Pull Request to discuss what you want to submit.
178179

179-
Questions about usage should be posted to the forum on [our.umbraco.com](https://our.umbraco.com).
180+
Questions about usage should be posted to the forum on [forum.umbraco.com](https://forum.umbraco.com).
180181

181182
## License
182183
Umbraco Storage Providers is [MIT licensed](LICENSE).

‎examples/Umbraco.StorageProviders.AzureBlob.TestSite/Umbraco.StorageProviders.AzureBlob.TestSite.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Umbraco.Cms" Version="15.0.0" />
10-
<!--<PackageReference Include="Umbraco.TheStarterKit" Version="15.0.0" />-->
9+
<PackageReference Include="Umbraco.Cms" Version="16.0.0-rc2" />
10+
<!--<PackageReference Include="Umbraco.TheStarterKit" Version="16.0.0-rc" />-->
1111
</ItemGroup>
1212

1313
<Import Project="..\..\src\Umbraco.StorageProviders\buildTransitive\Umbraco.StorageProviders.props" />

‎examples/Umbraco.StorageProviders.AzureBlob.TestSite/appsettings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"ConnectionStrings": {
14-
"umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco-15.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
14+
"umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco-16.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
1515
"umbracoDbDSN_ProviderName": "Microsoft.Data.Sqlite"
1616
},
1717
"Umbraco": {
@@ -41,7 +41,7 @@
4141
"AzureBlob": {
4242
"Media": {
4343
"ConnectionString": "UseDevelopmentStorage=true",
44-
"ContainerName": "umbraco-storageproviders-15"
44+
"ContainerName": "umbraco-storageproviders-16"
4545
}
4646
}
4747
}

‎src/Umbraco.StorageProviders/CdnMediaUrlProvider.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ public sealed class CdnMediaUrlProvider : DefaultMediaUrlProvider
2525
/// <param name="globalSettings">The global settings.</param>
2626
/// <param name="hostingEnvironment">The hosting environment.</param>
2727
/// <param name="mediaPathGenerators">The media path generators.</param>
28-
/// <param name="uriUtility">The URI utility.</param>
2928
/// <param name="urlAssembler">The URL assembler.</param>
30-
public CdnMediaUrlProvider(IOptionsMonitor<CdnMediaUrlProviderOptions> options, IOptionsMonitor<GlobalSettings> globalSettings, IHostingEnvironment hostingEnvironment, MediaUrlGeneratorCollection mediaPathGenerators, UriUtility uriUtility, IUrlAssembler urlAssembler)
31-
: base(mediaPathGenerators, uriUtility, urlAssembler)
29+
public CdnMediaUrlProvider(IOptionsMonitor<CdnMediaUrlProviderOptions> options, IOptionsMonitor<GlobalSettings> globalSettings, IHostingEnvironment hostingEnvironment, MediaUrlGeneratorCollection mediaPathGenerators, IUrlAssembler urlAssembler)
30+
: base(mediaPathGenerators, urlAssembler)
3231
{
3332
ArgumentNullException.ThrowIfNull(options);
3433
ArgumentNullException.ThrowIfNull(globalSettings);

‎src/Umbraco.StorageProviders/DependencyInjection/CdnMediaUrlProviderExtensions.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ internal static IUmbracoBuilder AddInternal(this IUmbracoBuilder builder, Action
8383
// Configure CDN as allowed media host
8484
builder.Services.AddOptions<ContentSettings>().PostConfigure<IOptions<CdnMediaUrlProviderOptions>>((options, cdnMediaUrlProviderOptions) =>
8585
{
86-
string cdnMediaHost = cdnMediaUrlProviderOptions.Value.Url.Host;
87-
if (!options.AllowedMediaHosts.Contains(cdnMediaHost, StringComparer.OrdinalIgnoreCase))
88-
{
89-
options.AllowedMediaHosts = [..options.AllowedMediaHosts, cdnMediaHost];
90-
}
86+
options.AllowedMediaHosts.Add(cdnMediaUrlProviderOptions.Value.Url.Host);
9187
});
9288

9389
return builder;

‎version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "15.0.1-alpha",
3+
"version": "16.0.0-alpha",
44
"assemblyVersion": {
55
"precision": "build"
66
},

0 commit comments

Comments
 (0)