Skip to content

Commit

Permalink
Merge pull request #130 from SixLabors/js/update-is
Browse files Browse the repository at this point in the history
Update ImageSharp
  • Loading branch information
JimBobSquarePants committed Nov 13, 2020
2 parents afff0fe + 09325e1 commit b72064b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PackageReference Update="Microsoft.IO.RecyclableMemoryStream" Version="1.3.5" />
<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.1" />
<PackageReference Update="SixLabors.ImageSharp" Version="1.0.2" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
Expand Down
13 changes: 11 additions & 2 deletions src/ImageSharp.Web/Caching/PhysicalFileSystemCacheOptions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Six Labors.
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0.

namespace SixLabors.ImageSharp.Web.Caching
Expand All @@ -14,7 +14,16 @@ public class PhysicalFileSystemCacheOptions
public string CacheFolder { get; set; } = "is-cache";

/// <summary>
/// Gets or sets the cache root folder.
/// Gets or sets the optional cache root folder.
/// <para>
/// This value can be <see langword="null"/>, a fully qualified absolute path,
/// or a path relative to the directory that contains the application
/// content files.
/// </para>
/// <para>
/// If not set, this will default to the directory that contains the web-servable
/// application content files; commonly 'wwwroot'.
/// </para>
/// </summary>
public string CacheRoot { get; set; }
}
Expand Down

0 comments on commit b72064b

Please sign in to comment.