Skip to content

Commit 451da15

Browse files
JimBobSquarePantsJimBobSquarePants
authored
Merge pull request #141 from ThisNetWorks/dm/lru
Fix missing cache lookups
2 parents b72064b + 29a3331 commit 451da15

19 files changed

+522
-693
lines changed

‎.editorconfig‎

Lines changed: 404 additions & 341 deletions
Large diffs are not rendered by default.

‎.gitattributes‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# normalize to Unix-style line endings
55
###############################################################################
66
* text eol=lf
7-
87
###############################################################################
98
# Set explicit file behavior to:
109
# treat as text and
@@ -54,15 +53,13 @@
5453
*.txt text eol=lf
5554
*.vb text eol=lf
5655
*.yml text eol=lf
57-
5856
###############################################################################
5957
# Set explicit file behavior to:
6058
# treat as text
6159
# normalize to Unix-style line endings and
6260
# diff as csharp
6361
###############################################################################
6462
*.cs text eol=lf diff=csharp
65-
6663
###############################################################################
6764
# Set explicit file behavior to:
6865
# treat as text
@@ -74,45 +71,36 @@
7471
*.fsproj text eol=lf merge=union
7572
*.ncrunchproject text eol=lf merge=union
7673
*.vbproj text eol=lf merge=union
77-
7874
###############################################################################
7975
# Set explicit file behavior to:
8076
# treat as text
8177
# normalize to Windows-style line endings and
8278
# use a union merge when resoling conflicts
8379
###############################################################################
8480
*.sln text eol=crlf merge=union
85-
8681
###############################################################################
8782
# Set explicit file behavior to:
8883
# treat as binary
8984
###############################################################################
9085
*.basis binary
91-
*.bmp binary
92-
*.dds binary
9386
*.dll binary
9487
*.eot binary
9588
*.exe binary
96-
*.gif binary
97-
*.jpg binary
9889
*.ktx binary
9990
*.otf binary
10091
*.pbm binary
10192
*.pdf binary
102-
*.png binary
10393
*.ppt binary
10494
*.pptx binary
10595
*.pvr binary
10696
*.snk binary
107-
*.tga binary
10897
*.ttc binary
10998
*.ttf binary
110-
*.webp binary
99+
*.wbmp binary
111100
*.woff binary
112101
*.woff2 binary
113102
*.xls binary
114103
*.xlsx binary
115-
116104
###############################################################################
117105
# Set explicit file behavior to:
118106
# diff as plain text
@@ -124,3 +112,16 @@
124112
*.pptx diff=astextplain
125113
*.rtf diff=astextplain
126114
*.svg diff=astextplain
115+
###############################################################################
116+
# Handle image files by git lfs
117+
###############################################################################
118+
*.jpg filter=lfs diff=lfs merge=lfs -text
119+
*.jpeg filter=lfs diff=lfs merge=lfs -text
120+
*.bmp filter=lfs diff=lfs merge=lfs -text
121+
*.gif filter=lfs diff=lfs merge=lfs -text
122+
*.png filter=lfs diff=lfs merge=lfs -text
123+
*.tif filter=lfs diff=lfs merge=lfs -text
124+
*.tiff filter=lfs diff=lfs merge=lfs -text
125+
*.tga filter=lfs diff=lfs merge=lfs -text
126+
*.webp filter=lfs diff=lfs merge=lfs -text
127+
*.dds filter=lfs diff=lfs merge=lfs -text

‎Directory.Build.props‎

Lines changed: 4 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -10,100 +10,12 @@
1010
that is done by the file that imports us.
1111
-->
1212

13-
<!-- Default settings that are used by other settings -->
1413
<PropertyGroup>
15-
<BaseArtifactsPath>$(MSBuildThisFileDirectory)artifacts/</BaseArtifactsPath>
16-
<BaseArtifactsPathSuffix>$(SixLaborsProjectCategory)/$(MSBuildProjectName)</BaseArtifactsPathSuffix>
17-
<RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/SixLabors/ImageSharp.Web/</RepositoryUrl>
14+
<!-- This MUST be defined before importing props. -->
15+
<SixLaborsSolutionDirectory>$(MSBuildThisFileDirectory)</SixLaborsSolutionDirectory>
1816
</PropertyGroup>
1917

20-
<!-- Default settings that explicitly differ from the Sdk.props defaults -->
21-
<PropertyGroup>
22-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
23-
<BaseIntermediateOutputPath>$(BaseArtifactsPath)obj/$(BaseArtifactsPathSuffix)/</BaseIntermediateOutputPath>
24-
<DebugType>portable</DebugType>
25-
<DebugType Condition="'$(codecov)' != ''">full</DebugType>
26-
<NullableContextOptions>disable</NullableContextOptions>
27-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
28-
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
29-
</PropertyGroup>
30-
31-
<!--
32-
https://apisof.net/
33-
+===================+=======+==========+=====================+=============+=================+====================+==============+
34-
| SUPPORTS | MATHF | HASHCODE | EXTENDED_INTRINSICS | SPAN_STREAM | ENCODING_STRING | RUNTIME_INTRINSICS | CODECOVERAGE |
35-
+===================+=======+==========+=====================+=============+=================+====================+==============+
36-
| netcoreapp3.1 | Y | Y | Y | Y | Y | Y | Y |
37-
| netcoreapp2.1 | Y | Y | Y | Y | Y | N | Y |
38-
+===================+=======+==========+=====================+=============+=================+====================+==============+
39-
-->
40-
41-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
42-
<DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>
43-
<DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
44-
<DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
45-
<DefineConstants>$(DefineConstants);SUPPORTS_SPAN_STREAM</DefineConstants>
46-
<DefineConstants>$(DefineConstants);SUPPORTS_ENCODING_STRING</DefineConstants>
47-
<DefineConstants>$(DefineConstants);SUPPORTS_RUNTIME_INTRINSICS</DefineConstants>
48-
<DefineConstants>$(DefineConstants);SUPPORTS_CODECOVERAGE</DefineConstants>
49-
</PropertyGroup>
50-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
51-
<DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>
52-
<DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
53-
<DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
54-
<DefineConstants>$(DefineConstants);SUPPORTS_SPAN_STREAM</DefineConstants>
55-
<DefineConstants>$(DefineConstants);SUPPORTS_ENCODING_STRING</DefineConstants>
56-
<DefineConstants>$(DefineConstants);SUPPORTS_CODECOVERAGE</DefineConstants>
57-
</PropertyGroup>
58-
59-
<!-- Default settings that explicitly differ from the Sdk.targets defaults-->
60-
<PropertyGroup>
61-
<Authors>Six Labors and contributors</Authors>
62-
<BaseOutputPath>$(BaseArtifactsPath)bin/$(BaseArtifactsPathSuffix)/</BaseOutputPath>
63-
<Company>Six Labors</Company>
64-
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(BaseArtifactsPathSuffix)/$(Configuration)/</PackageOutputPath>
65-
<Product>SixLabors.ImageSharp.Web</Product>
66-
<VersionPrefix>0.0.1</VersionPrefix>
67-
<VersionPrefix Condition="'$(packageversion)' != ''">$(PackageVersion)</VersionPrefix>
68-
<VersionSuffix></VersionSuffix>
69-
</PropertyGroup>
70-
71-
<!--MinVer Properties for versioning-->
72-
<PropertyGroup>
73-
<MinVerTagPrefix>v</MinVerTagPrefix>
74-
<MinVerVerbosity>normal</MinVerVerbosity>
75-
</PropertyGroup>
76-
77-
<!-- Default settings that are otherwise undefined -->
78-
<PropertyGroup>
79-
<Copyright>Copyright © Six Labors</Copyright>
80-
<Features>strict;IOperation</Features>
81-
<HighEntropyVA>true</HighEntropyVA>
82-
<LangVersion>8.0</LangVersion>
83-
<NeutralLanguage>en</NeutralLanguage>
84-
<OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
85-
<PackageIcon>sixlabors.imagesharp.web.128.png</PackageIcon>
86-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
87-
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
88-
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
89-
<RepositoryType>git</RepositoryType>
90-
<RestoreSources>
91-
https://www.myget.org/F/sixlabors/api/v3/index.json;
92-
https://api.nuget.org/v3/index.json;
93-
</RestoreSources>
94-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)shared-infrastructure/SixLabors.snk</AssemblyOriginatorKeyFile>
95-
<SixLaborsPublicKey>00240000048000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey>
96-
<UseSharedCompilation>true</UseSharedCompilation>
97-
<SignAssembly>true</SignAssembly>
98-
</PropertyGroup>
99-
100-
<!-- Package references and additional files which are consumed by all projects -->
101-
<ItemGroup>
102-
<PackageReference Include="Microsoft.Net.Compilers.Toolset" IsImplicitlyDefined="true" PrivateAssets="All"/>
103-
<PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true" />
104-
<AdditionalFiles Include="$(MSBuildThisFileDirectory)shared-infrastructure\stylecop.json" />
105-
<!--NuGet package icon source-->
106-
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
107-
</ItemGroup>
18+
<!-- Import the shared global .props file -->
19+
<Import Project="$(MSBuildThisFileDirectory)shared-infrastructure\msbuild\props\SixLabors.Global.props" />
10820

10921
</Project>

‎Directory.Build.targets‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,12 @@
55
Directory.Build.targets is automatically picked up and imported by
66
Microsoft.Common.targets. This file needs to exist, even if empty so that
77
files in the parent directory tree, with the same name, are not imported
8-
instead. The import fairly late and most other props/targets will have been
8+
instead. They import fairly late and most other props/targets will have been
99
imported beforehand. We also don't need to add ourselves to
1010
MSBuildAllProjects, as that is done by the file that imports us.
1111
-->
1212

13-
<!-- Settings that append the existing setting value -->
14-
<PropertyGroup>
15-
<DefineConstants>$(DefineConstants);$(OS)</DefineConstants>
16-
</PropertyGroup>
13+
<!-- Import the shared global .props file -->
14+
<Import Project="$(MSBuildThisFileDirectory)shared-infrastructure\msbuild\targets\SixLabors.Global.targets"/>
1715

18-
<!-- Package versions for package references across all projects -->
19-
<ItemGroup>
20-
<!--Global Dependencies-->
21-
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.3.1" />
22-
<PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
23-
24-
<!--Src Dependencies-->
25-
<PackageReference Update="Azure.Storage.Blobs" Version="12.4.0" />
26-
<PackageReference Update="Microsoft.IO.RecyclableMemoryStream" Version="1.3.5" />
27-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
28-
<PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" />
29-
<PackageReference Update="SixLabors.ImageSharp" Version="1.0.2" />
30-
</ItemGroup>
31-
32-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
33-
<FrameworkReference Update="Microsoft.AspNetCore.App" />
34-
</ItemGroup>
35-
36-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
37-
<PackageReference Update="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
38-
<PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.0" />
39-
<PackageReference Update="Microsoft.AspNetCore.Http.Extensions" Version="2.0.0" />
40-
<PackageReference Update="Microsoft.AspNetCore.WebUtilities" Version="2.0.0" />
41-
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="2.0.0" />
42-
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
43-
<PackageReference Update="Microsoft.Extensions.FileProviders.Physical" Version="2.0.0"/>
44-
</ItemGroup>
45-
4616
</Project>

‎before.ImageSharp.Web.sln.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ See https://t.co/0A4WzeGMZS
99
<ItemGroup>
1010
<ProjectReference
1111
Remove="$(MSBuildThisFileDirectory)samples\ImageSharp.Web.Sample\ImageSharp.Web.Sample.csproj"
12-
Condition="'$(GITHUB_ACTIONS)' == 'true'"/>
12+
Condition="'$(CI)' == 'true'"/>
1313
</ItemGroup>
1414
</Target>
1515
</Project>

‎samples/Directory.Build.props‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,19 @@
55
Directory.Build.props is automatically picked up and imported by
66
Microsoft.Common.props. This file needs to exist, even if empty so that
77
files in the parent directory tree, with the same name, are not imported
8-
instead. The import fairly early and only Sdk.props will have been
8+
instead. They import fairly early and only Sdk.props will have been
99
imported beforehand. We also don't need to add ourselves to
1010
MSBuildAllProjects, as that is done by the file that imports us.
1111
-->
1212

1313
<PropertyGroup>
14-
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props</MSBuildAllProjects>
1514
<SixLaborsProjectCategory>samples</SixLaborsProjectCategory>
1615
<IsPackable>false</IsPackable>
1716
<IsTestProject>false</IsTestProject>
17+
<GenerateDocumentationFile>True</GenerateDocumentationFile>
1818
</PropertyGroup>
1919

20-
<PropertyGroup>
21-
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\shared-infrastructure\SixLabors.Tests.ruleset</CodeAnalysisRuleSet>
22-
</PropertyGroup>
23-
24-
<PropertyGroup>
25-
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\shared-infrastructure\SixLabors.Tests.ruleset</CodeAnalysisRuleSet>
26-
<NoWarn>$(NoWarn);</NoWarn>
27-
</PropertyGroup>
28-
20+
<!-- Import the solution .props file. -->
2921
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
30-
22+
3123
</Project>

‎samples/Directory.Build.targets‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@
55
Directory.Build.targets is automatically picked up and imported by
66
Microsoft.Common.targets. This file needs to exist, even if empty so that
77
files in the parent directory tree, with the same name, are not imported
8-
instead. The import fairly late and most other props/targets will have
8+
instead. They import fairly late and most other props/targets will have
99
been imported beforehand. We also don't need to add ourselves to
1010
MSBuildAllProjects, as that is done by the file that imports us.
1111
-->
1212

13-
<PropertyGroup>
14-
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.targets</MSBuildAllProjects>
15-
</PropertyGroup>
16-
13+
<!-- Import the solution .targets file. -->
1714
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
1815

1916
</Project>

‎shared-infrastructure‎

Submodule shared-infrastructure updated 39 files

‎src/Directory.Build.props‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,27 @@
55
Directory.Build.props is automatically picked up and imported by
66
Microsoft.Common.props. This file needs to exist, even if empty so that
77
files in the parent directory tree, with the same name, are not imported
8-
instead. The import fairly early and only Sdk.props will have been
8+
instead. They import fairly early and only Sdk.props will have been
99
imported beforehand. We also don't need to add ourselves to
1010
MSBuildAllProjects, as that is done by the file that imports us.
1111
-->
1212

13-
<PropertyGroup>
14-
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props</MSBuildAllProjects>
15-
<SixLaborsProjectCategory>src</SixLaborsProjectCategory>
16-
</PropertyGroup>
13+
<!-- Import the shared src .props file -->
14+
<Import Project="$(MSBuildThisFileDirectory)..\shared-infrastructure\msbuild\props\SixLabors.Src.props" />
1715

16+
<!-- Import the solution .props file. -->
1817
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
1918

20-
<PropertyGroup>
21-
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\shared-infrastructure\SixLabors.ruleset</CodeAnalysisRuleSet>
22-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
23-
</PropertyGroup>
24-
19+
<!-- Compilation properties. -->
2520
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
2621
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2722
</PropertyGroup>
2823

29-
<!--Add deterministic builds in CI-->
30-
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
31-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
32-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
33-
</PropertyGroup>
34-
35-
<PropertyGroup>
36-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
37-
<!-- Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
38-
<IncludeSymbols>true</IncludeSymbols>
39-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
40-
</PropertyGroup>
41-
4224
<ItemGroup>
4325
<!-- DynamicProxyGenAssembly2 is needed so Moq can use our internals -->
4426
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
45-
<InternalsVisibleTo Include="SixLabors.ImageSharp.Web.Tests" Key="$(SixLaborsPublicKey)" />
46-
<InternalsVisibleTo Include="ImageSharp.Web.Benchmarks" Key="$(SixLaborsPublicKey)" />
27+
<InternalsVisibleTo Include="ImageSharp.Web.Benchmarks" Key="$(SixLaborsPublicKey)" />
28+
<InternalsVisibleTo Include="SixLabors.ImageSharp.Web.Tests" Key="$(SixLaborsPublicKey)" />
4729
</ItemGroup>
4830

4931
</Project>

0 commit comments

Comments
 (0)