Update dependency versions and fix nullability issues

ronaldbarendse · ronaldbarendse · commit fd349a48b3e8 · 2022-05-09T13:52:33.000+02:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -17,7 +17,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.3" PrivateAssets="All" />
-        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="All" />
+        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -41,8 +41,5 @@
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
         <GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
     </PropertyGroup>
-    <ItemGroup>
-        <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="All" />
-    </ItemGroup>
 </Project>
 
diff --git a/src/Umbraco.StorageProviders.AzureBlob/IO/AzureBlobFileSystem.cs b/src/Umbraco.StorageProviders.AzureBlob/IO/AzureBlobFileSystem.cs
@@ -297,7 +297,7 @@ public string GetFullPath(string path)
 
         /// <inheritdoc />
         /// <exception cref="System.ArgumentNullException"><paramref name="path" /> is <c>null</c>.</exception>
-        public string GetUrl(string path)
+        public string GetUrl(string? path)
         {
             ArgumentNullException.ThrowIfNull(path);
 
diff --git a/src/Umbraco.StorageProviders.AzureBlob/PublicAPI.Shipped.txt b/src/Umbraco.StorageProviders.AzureBlob/PublicAPI.Shipped.txt
@@ -68,7 +68,7 @@ Umbraco.StorageProviders.AzureBlob.IO.AzureBlobFileSystem.GetFullPath(string! pa
 Umbraco.StorageProviders.AzureBlob.IO.AzureBlobFileSystem.GetLastModified(string! path) -> System.DateTimeOffset
 Umbraco.StorageProviders.AzureBlob.IO.AzureBlobFileSystem.GetRelativePath(string! fullPathOrUrl) -> string!
 Umbraco.StorageProviders.AzureBlob.IO.AzureBlobFileSystem.GetSize(string! path) -> long
-Umbraco.StorageProviders.AzureBlob.IO.AzureBlobFileSystem.GetUrl(string! path) -> string!
+Umbraco.StorageProviders.AzureBlob.IO.AzureBlobFileSystem.GetUrl(string? path) -> string!
 Umbraco.StorageProviders.AzureBlob.IO.AzureBlobFileSystem.OpenFile(string! path) -> System.IO.Stream!
 Umbraco.StorageProviders.AzureBlob.IO.AzureBlobFileSystemOptions
 Umbraco.StorageProviders.AzureBlob.IO.AzureBlobFileSystemOptions.AzureBlobFileSystemOptions() -> void
diff --git a/src/Umbraco.StorageProviders.AzureBlob/Umbraco.StorageProviders.AzureBlob.csproj b/src/Umbraco.StorageProviders.AzureBlob/Umbraco.StorageProviders.AzureBlob.csproj
@@ -8,9 +8,9 @@
         <PackageTags>umbraco storage azure blob</PackageTags>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Umbraco.Cms.Web.Common" Version="10.0.0-preview20220405.88864" />
-        <PackageReference Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="1.0.5" />
-        <PackageReference Include="Azure.Storage.Blobs" Version="12.11.0" />
+        <PackageReference Include="Umbraco.Cms.Web.Common" Version="10.0.0-rc1" />
+        <PackageReference Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="2.0.0" />
+        <PackageReference Include="Azure.Storage.Blobs" Version="12.12.0" />
 		<ProjectReference Include="..\Umbraco.StorageProviders\Umbraco.StorageProviders.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/src/Umbraco.StorageProviders.AzureBlob/packages.lock.json b/src/Umbraco.StorageProviders.AzureBlob/packages.lock.json
diff --git a/src/Umbraco.StorageProviders/CdnMediaUrlProvider.cs b/src/Umbraco.StorageProviders/CdnMediaUrlProvider.cs
@@ -59,7 +59,7 @@ public CdnMediaUrlProvider(IOptionsMonitor<CdnMediaUrlProviderOptions> options,
         }
 
         /// <inheritdoc />
-        public override UrlInfo? GetMediaUrl(IPublishedContent content, string propertyAlias, UrlMode mode, string culture, Uri current)
+        public override UrlInfo? GetMediaUrl(IPublishedContent content, string propertyAlias, UrlMode mode, string? culture, Uri current)
         {
             var mediaUrl = base.GetMediaUrl(content, propertyAlias, UrlMode.Relative, culture, current);
             if (mediaUrl?.IsUrl == true)
diff --git a/src/Umbraco.StorageProviders/DependencyInjection/CdnMediaUrlProviderExtensions.cs b/src/Umbraco.StorageProviders/DependencyInjection/CdnMediaUrlProviderExtensions.cs
@@ -72,7 +72,7 @@ internal static IUmbracoBuilder AddInternal(this IUmbracoBuilder builder, Action
         {
             ArgumentNullException.ThrowIfNull(builder);
 
-            builder.MediaUrlProviders().Insert<CdnMediaUrlProvider>();
+            builder.MediaUrlProviders()?.Insert<CdnMediaUrlProvider>();
 
             var optionsBuilder = builder.Services.AddOptions<CdnMediaUrlProviderOptions>()
                 .BindConfiguration("Umbraco:Storage:Cdn")
diff --git a/src/Umbraco.StorageProviders/PublicAPI.Shipped.txt b/src/Umbraco.StorageProviders/PublicAPI.Shipped.txt
@@ -1,5 +1,5 @@
 ﻿#nullable enable
-override Umbraco.StorageProviders.CdnMediaUrlProvider.GetMediaUrl(Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent! content, string! propertyAlias, Umbraco.Cms.Core.Models.PublishedContent.UrlMode mode, string! culture, System.Uri! current) -> Umbraco.Cms.Core.Routing.UrlInfo?
+override Umbraco.StorageProviders.CdnMediaUrlProvider.GetMediaUrl(Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent! content, string! propertyAlias, Umbraco.Cms.Core.Models.PublishedContent.UrlMode mode, string? culture, System.Uri! current) -> Umbraco.Cms.Core.Routing.UrlInfo?
 static Umbraco.Cms.Core.DependencyInjection.CdnMediaUrlProviderExtensions.AddCdnMediaUrlProvider(this Umbraco.Cms.Core.DependencyInjection.IUmbracoBuilder! builder) -> Umbraco.Cms.Core.DependencyInjection.IUmbracoBuilder!
 static Umbraco.Cms.Core.DependencyInjection.CdnMediaUrlProviderExtensions.AddCdnMediaUrlProvider(this Umbraco.Cms.Core.DependencyInjection.IUmbracoBuilder! builder, System.Action<Umbraco.StorageProviders.CdnMediaUrlProviderOptions!, System.IServiceProvider!>! configure) -> Umbraco.Cms.Core.DependencyInjection.IUmbracoBuilder!
 static Umbraco.Cms.Core.DependencyInjection.CdnMediaUrlProviderExtensions.AddCdnMediaUrlProvider(this Umbraco.Cms.Core.DependencyInjection.IUmbracoBuilder! builder, System.Action<Umbraco.StorageProviders.CdnMediaUrlProviderOptions!>! configure) -> Umbraco.Cms.Core.DependencyInjection.IUmbracoBuilder!
diff --git a/src/Umbraco.StorageProviders/Umbraco.StorageProviders.csproj b/src/Umbraco.StorageProviders/Umbraco.StorageProviders.csproj
@@ -7,6 +7,6 @@
         <Description>Shared storage providers infrastructure for Umbraco CMS</Description>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Umbraco.Cms.Web.Common" Version="10.0.0-preview20220405.88864" />
+        <PackageReference Include="Umbraco.Cms.Web.Common" Version="10.0.0-rc1" />
     </ItemGroup>
 </Project>
diff --git a/src/Umbraco.StorageProviders/packages.lock.json b/src/Umbraco.StorageProviders/packages.lock.json

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public string GetFullPath(string path)`
`297`	`297`
`298`	`298`	`/// <inheritdoc />`
`299`	`299`	`/// <exception cref="System.ArgumentNullException"><paramref name="path" /> is <c>null</c>.</exception>`
`300`		`- public string GetUrl(string path)`
	`300`	`+ public string GetUrl(string? path)`
`301`	`301`	`{`
`302`	`302`	`ArgumentNullException.ThrowIfNull(path);`
`303`	`303`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public CdnMediaUrlProvider(IOptionsMonitor<CdnMediaUrlProviderOptions> options,`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/// <inheritdoc />`
`62`		`- public override UrlInfo? GetMediaUrl(IPublishedContent content, string propertyAlias, UrlMode mode, string culture, Uri current)`
	`62`	`+ public override UrlInfo? GetMediaUrl(IPublishedContent content, string propertyAlias, UrlMode mode, string? culture, Uri current)`
`63`	`63`	`{`
`64`	`64`	`var mediaUrl = base.GetMediaUrl(content, propertyAlias, UrlMode.Relative, culture, current);`
`65`	`65`	`if (mediaUrl?.IsUrl == true)`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ internal static IUmbracoBuilder AddInternal(this IUmbracoBuilder builder, Action`
`72`	`72`	`{`
`73`	`73`	`ArgumentNullException.ThrowIfNull(builder);`
`74`	`74`
`75`		`- builder.MediaUrlProviders().Insert<CdnMediaUrlProvider>();`
	`75`	`+ builder.MediaUrlProviders()?.Insert<CdnMediaUrlProvider>();`
`76`	`76`
`77`	`77`	`var optionsBuilder = builder.Services.AddOptions<CdnMediaUrlProviderOptions>()`
`78`	`78`	`.BindConfiguration("Umbraco:Storage:Cdn")`