Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/nopSolutions/nopCommerce
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
skoshelev committed Dec 7, 2022
2 parents 90e9ad3 + 06772be commit cf6cbb9
Show file tree
Hide file tree
Showing 26 changed files with 1,751 additions and 2,297 deletions.
5 changes: 5 additions & 0 deletions src/Libraries/Nop.Core/Infrastructure/INopFileProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -336,5 +336,10 @@ public interface INopFileProvider : IFileProvider
/// <param name="contents">The string to write to the file</param>
/// <param name="encoding">The encoding to apply to the string</param>
void WriteAllText(string path, string contents, Encoding encoding);

/// <summary>
/// Gets or sets the absolute path to the directory that contains the web-servable application content files.
/// </summary>
string WebRootPath { get; }
}
}
9 changes: 8 additions & 1 deletion src/Libraries/Nop.Core/Infrastructure/NopFileProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,13 @@ public virtual void WriteAllText(string path, string contents, Encoding encoding

#endregion

protected string WebRootPath { get; }
#region Properties

/// <summary>
/// Gets or sets the absolute path to the directory that contains the web-servable application content files.
/// </summary>
public string WebRootPath { get; }

#endregion
}
}
5 changes: 5 additions & 0 deletions src/Libraries/Nop.Core/MimeTypes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ public static class MimeTypes
/// </summary>
public static string ApplicationXWwwFormUrlencoded => "application/x-www-form-urlencoded";

/// <summary>
/// Type
/// </summary>
public static string ApplicationZip => "application/zip";

/// <summary>
/// Type
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Nop.Services/Media/PictureService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ protected virtual async Task<PictureBinary> UpdatePictureBinaryAsync(Picture pic
/// <summary>
/// Get image format by mime type
/// </summary>
/// <param name="mimetype">Mime type</param>
/// <param name="mimeType">Mime type</param>
/// <returns>SKEncodedImageFormat</returns>
protected virtual SKEncodedImageFormat GetImageFormatByMimeType(string mimeType)
{
Expand Down
Loading

0 comments on commit cf6cbb9

Please sign in to comment.