Cleanup and fix tests

Author: JimBobSquarePants

Directory.Build.targets

@@ -25,7 +25,7 @@
     <PackageReference Update="Azure.Storage.Blobs" Version="12.4.0" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     <PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" />
-    <PackageReference Update="SixLabors.ImageSharp" Version="1.0.0" />
+    <PackageReference Update="SixLabors.ImageSharp" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">

src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs

@@ -32,6 +32,16 @@ public async Task<ImageMetadata> GetMetaDataAsync()
 
         /// <inheritdoc/>
         public async Task<Stream> OpenReadAsync()
-            => (await this.blob.DownloadAsync()).Value.Content;
+        {
+            // Copy to a MemoryStream first because RetriableStreamImpl
+            // doesn't support Position.
+            Stream blobStream = (await this.blob.DownloadAsync()).Value.Content;
+            var memoryStream = new ChunkedMemoryStream();
+
+            await blobStream.CopyToAsync(memoryStream);
+            memoryStream.Seek(0, SeekOrigin.Begin);
+
+            return memoryStream;
+        }
     }
 }

src/ImageSharp.Web/Caching/HexEncoder.cs

@@ -23,7 +23,7 @@ internal static class HexEncoder
         private static readonly char[] HexLutLo = Enumerable.Range(0, 256).Select(x => HexLutBase[x % 0x10]).ToArray();
 
         /// <summary>
-        /// Converts a <see cref="T:Span{byte}"/> to a hexidecimal formatted <see cref="string"/> padded to 2 digits.
+        /// Converts a <see cref="ReadOnlySpan{Byte}"/> to a hexidecimal formatted <see cref="string"/> padded to 2 digits.
         /// </summary>
         /// <param name="bytes">The bytes.</param>
         /// <returns>The <see cref="string"/>.</returns>
@@ -35,20 +35,25 @@ public static unsafe string Encode(ReadOnlySpan<byte> bytes)
                 return string.Create(bytes.Length * 2, (Ptr: (IntPtr)bytesPtr, bytes.Length), (chars, args) =>
                 {
                     var ros = new ReadOnlySpan<byte>((byte*)args.Ptr, args.Length);
+                    EncodeToUtf16(ros, chars);
+                });
+            }
+        }
 
-                    ref char charRef = ref MemoryMarshal.GetReference(chars);
-                    ref byte bytesRef = ref MemoryMarshal.GetReference(ros);
-                    ref char hiRef = ref MemoryMarshal.GetReference<char>(HexLutHi);
-                    ref char lowRef = ref MemoryMarshal.GetReference<char>(HexLutLo);
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static void EncodeToUtf16(ReadOnlySpan<byte> bytes, Span<char> chars)
+        {
+            ref byte bytesRef = ref MemoryMarshal.GetReference(bytes);
+            ref char charRef = ref MemoryMarshal.GetReference(chars);
+            ref char hiRef = ref MemoryMarshal.GetReference<char>(HexLutHi);
+            ref char lowRef = ref MemoryMarshal.GetReference<char>(HexLutLo);
 
-                    int index = 0;
-                    for (int i = 0; i < ros.Length; i++)
-                    {
-                        byte byteIndex = Unsafe.Add(ref bytesRef, i);
-                        Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref hiRef, byteIndex);
-                        Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref lowRef, byteIndex);
-                    }
-                });
+            int index = 0;
+            for (int i = 0; i < bytes.Length; i++)
+            {
+                byte byteIndex = Unsafe.Add(ref bytesRef, i);
+                Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref hiRef, byteIndex);
+                Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref lowRef, byteIndex);
             }
         }
     }

src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs

@@ -70,6 +70,7 @@ public PhysicalFileSystemCache(
             Guard.NotNull(options, nameof(options));
             Guard.NotNullOrWhiteSpace(environment.WebRootPath, nameof(environment.WebRootPath));
 
+            // Allow configuration of the cache without having to register everything.
             this.cacheOptions = cacheOptions != null ? cacheOptions.Value : new PhysicalFileSystemCacheOptions();
             this.cacheRootPath = Path.Combine(environment.WebRootPath, this.cacheOptions.CacheFolder);
             if (!Directory.Exists(this.cacheRootPath))
@@ -160,14 +161,13 @@ private string ToImageFilePath(string path, in ImageCacheMetadata metaData)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal static unsafe string ToFilePath(string key, int cachedNameLength)
         {
-            const char separator = '/';
-
             // Each key substring char + separator + key
             int length = (cachedNameLength * 2) + key.Length;
             fixed (char* keyPtr = key)
             {
                 return string.Create(length, (Ptr: (IntPtr)keyPtr, key.Length), (chars, args) =>
                 {
+                    const char separator = '/';
                     var keySpan = new ReadOnlySpan<char>((char*)args.Ptr, args.Length);
                     ref char keyRef = ref MemoryMarshal.GetReference(keySpan);
                     ref char charRef = ref MemoryMarshal.GetReference(chars);

tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <RootNamespace>SixLabors.ImageSharp.Web.Tests</RootNamespace>
@@ -15,12 +15,12 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.AspNetCore.TestHost"/>
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <PackageReference Include="Microsoft.AspNetCore.Http" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost"/>
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
 
   <ItemGroup>
@@ -29,6 +29,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="SubFolder\imagesharp-logo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

tests/ImageSharp.Web.Tests/ImageSharpTestServer.cs

@@ -141,7 +141,7 @@ public static TestServer Create(Action<IApplicationBuilder> configureApp, Action
             IConfigurationRoot configuration = new ConfigurationBuilder()
                 .AddInMemoryCollection(new[]
                 {
-                    new KeyValuePair<string, string>("webroot", "../../../")
+                    new KeyValuePair<string, string>("webroot", string.Empty)
                 }).Build();
 
             IWebHostBuilder builder = new WebHostBuilder()