Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove Microsoft.AspNetCore.StaticFiles and System.Web dependencies #964

Merged
merged 2 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Set default behaviour to automatically normalize line endings.
* text=auto
*.cs text eol=crlf
1 change: 0 additions & 1 deletion Box.V2.Core/Box.V2.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
Expand Down
5 changes: 2 additions & 3 deletions Box.V2/Box.V2.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -97,7 +97,6 @@
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down Expand Up @@ -376,4 +375,4 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
41 changes: 34 additions & 7 deletions Box.V2/Utility/ContentTypeMapper.cs
Original file line number Diff line number Diff line change
@@ -1,24 +1,51 @@
using System.Collections.Generic;
using System.IO;

namespace Box.V2.Utility
{
/// <summary>
/// Utility class for determining Content-Type header. Should only be used internally by the SDK.
/// </summary>
public static class ContentTypeMapper
{
private static readonly Dictionary<string, string> _mimeMapping = new Dictionary<string, string>()
{
{ ".jpe", "image/jpeg" },
{ ".jpeg", "image/jpeg" },
{ ".jpg", "image/jpeg" },
{ ".bmp", "image/bmp" },
{ ".png", "image/png" },
{ ".gif", "image/gif" },
{ ".webp", "image/webp" },
};

/// <summary>
/// Get Content-Type header from a filename. Supports most common image formats. Should only be used internally by the SDK.
/// </summary>
/// <param name="filename">full filename with extension</param>
/// <returns>Content-Type header as a string</returns>
public static string GetContentTypeFromFilename(string filename)
{
const string DefaultContentType = "application/octet-stream";
var contentType = DefaultContentType;

#if NETSTANDARD2_0
var provider = new Microsoft.AspNetCore.StaticFiles.FileExtensionContentTypeProvider();

if (provider.TryGetContentType(filename, out var contentTypeFromFile))
if (TryGetContentType(filename, out var contentTypeFromFile))
{
contentType = contentTypeFromFile;
}
#else
contentType = System.Web.MimeMapping.GetMimeMapping(filename);
#endif

return contentType;
}

private static bool TryGetContentType(string path, out string contentType)
{
var extension = Path.GetExtension(path);
if (extension == null)
{
contentType = null;
return false;
}
return _mimeMapping.TryGetValue(extension, out contentType);
}
}
}
Loading