Browse Source

baseUri can be null.

pull/7179/head
Steven Kirk 4 years ago
parent
commit
e4b19743ca
  1. 2
      src/Avalonia.Base/Platform/IAssetLoader.cs
  2. 2
      src/Shared/PlatformSupport/AssetLoader.cs

2
src/Avalonia.Base/Platform/IAssetLoader.cs

@ -74,6 +74,6 @@ namespace Avalonia.Platform
/// <param name="uri">The URI.</param>
/// <param name="baseUri">The base URI.</param>
/// <returns>All matching assets as a tuple of the absolute path to the asset and the assembly containing the asset</returns>
IEnumerable<Uri> GetAssets(Uri uri, Uri baseUri);
IEnumerable<Uri> GetAssets(Uri uri, Uri? baseUri);
}
}

2
src/Shared/PlatformSupport/AssetLoader.cs

@ -109,7 +109,7 @@ namespace Avalonia.Shared.PlatformSupport
/// <param name="uri">The URI.</param>
/// <param name="baseUri">Base URI that is used if <paramref name="uri"/> is relative.</param>
/// <returns>All matching assets as a tuple of the absolute path to the asset and the assembly containing the asset</returns>
public IEnumerable<Uri> GetAssets(Uri uri, Uri baseUri)
public IEnumerable<Uri> GetAssets(Uri uri, Uri? baseUri)
{
if (uri.IsAbsoluteUri && uri.Scheme == "resm")
{

Loading…
Cancel
Save