Skip to content

Commit 8011723

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Reenable samples project for debugging.
1 parent a5dd409 commit 8011723

File tree

7 files changed

+76
-10
lines changed

7 files changed

+76
-10
lines changed

‎ImageSharp.Web.sln‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.28803.452
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_root", "_root", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
77
ProjectSection(SolutionItems) = preProject
88
.editorconfig = .editorconfig
99
.gitignore = .gitignore
@@ -55,6 +55,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
5555
.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
5656
EndProjectSection
5757
EndProject
58+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8B4A805D-D780-4A18-9BDA-4D27B4BD11AA}"
59+
ProjectSection(SolutionItems) = preProject
60+
samples\Directory.Build.props = samples\Directory.Build.props
61+
samples\Directory.Build.targets = samples\Directory.Build.targets
62+
EndProjectSection
63+
EndProject
64+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Web.Sample", "samples\ImageSharp.Web.Sample\ImageSharp.Web.Sample.csproj", "{8F40DEC6-A97F-4002-A504-13E188665A98}"
65+
EndProject
5866
Global
5967
GlobalSection(SharedMSBuildProjectFiles) = preSolution
6068
shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{2f1b36e2-5d92-4442-b816-d2a978246435}*SharedItemsImports = 5
@@ -118,6 +126,18 @@ Global
118126
{E2A545EC-B909-4EAD-B95F-397F68588BE3}.Release|x64.Build.0 = Release|Any CPU
119127
{E2A545EC-B909-4EAD-B95F-397F68588BE3}.Release|x86.ActiveCfg = Release|Any CPU
120128
{E2A545EC-B909-4EAD-B95F-397F68588BE3}.Release|x86.Build.0 = Release|Any CPU
129+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
130+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
131+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|x64.ActiveCfg = Debug|Any CPU
132+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|x64.Build.0 = Debug|Any CPU
133+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|x86.ActiveCfg = Debug|Any CPU
134+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Debug|x86.Build.0 = Debug|Any CPU
135+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
136+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|Any CPU.Build.0 = Release|Any CPU
137+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|x64.ActiveCfg = Release|Any CPU
138+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|x64.Build.0 = Release|Any CPU
139+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|x86.ActiveCfg = Release|Any CPU
140+
{8F40DEC6-A97F-4002-A504-13E188665A98}.Release|x86.Build.0 = Release|Any CPU
121141
EndGlobalSection
122142
GlobalSection(SolutionProperties) = preSolution
123143
HideSolutionNode = FALSE
@@ -131,6 +151,7 @@ Global
131151
{68A8CC40-6AED-4E96-B524-31B1158FDEEA} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
132152
{04955CD1-F249-4899-9F61-6C7487BEECE1} = {B8152C86-B657-4967-B297-42F89A10D23A}
133153
{2A5EF4AC-E228-42C1-970B-35630A9AF250} = {B8152C86-B657-4967-B297-42F89A10D23A}
154+
{8F40DEC6-A97F-4002-A504-13E188665A98} = {8B4A805D-D780-4A18-9BDA-4D27B4BD11AA}
134155
EndGlobalSection
135156
GlobalSection(ExtensibilityGlobals) = postSolution
136157
SolutionGuid = {C5B38B65-A19E-4359-859C-5B2205429BD1}

‎samples/Directory.Build.props‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
4+
<!--
5+
Directory.Build.props is automatically picked up and imported by
6+
Microsoft.Common.props. This file needs to exist, even if empty so that
7+
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
9+
imported beforehand. We also don't need to add ourselves to
10+
MSBuildAllProjects, as that is done by the file that imports us.
11+
-->
12+
13+
<PropertyGroup>
14+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props</MSBuildAllProjects>
15+
<SixLaborsProjectCategory>samples</SixLaborsProjectCategory>
16+
<IsPackable>false</IsPackable>
17+
<IsTestProject>false</IsTestProject>
18+
</PropertyGroup>
19+
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+
29+
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
30+
31+
</Project>

‎samples/Directory.Build.targets‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
4+
<!--
5+
Directory.Build.targets is automatically picked up and imported by
6+
Microsoft.Common.targets. This file needs to exist, even if empty so that
7+
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
9+
been imported beforehand. We also don't need to add ourselves to
10+
MSBuildAllProjects, as that is done by the file that imports us.
11+
-->
12+
13+
<PropertyGroup>
14+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.targets</MSBuildAllProjects>
15+
</PropertyGroup>
16+
17+
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
18+
19+
</Project>

‎samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
<CodeAnalysisRuleSet>..\..\shared-infrastructure\SixLabors.Tests.ruleset</CodeAnalysisRuleSet>
65
</PropertyGroup>
76

87
<ItemGroup>
9-
<PackageReference Include="SixLabors.ImageSharp.Web" Version="1.0.0-unstable0056" />
8+
<ProjectReference Include="..\..\src\ImageSharp.Web\ImageSharp.Web.csproj" />
109
</ItemGroup>
11-
1210
</Project>

‎samples/ImageSharp.Web.Sample/Startup.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Microsoft.Extensions.DependencyInjection;
88
using Microsoft.Extensions.Hosting;
99
using Microsoft.Extensions.Options;
10-
using SixLabors.ImageSharp.Memory;
1110
using SixLabors.ImageSharp.Web.Caching;
1211
using SixLabors.ImageSharp.Web.Commands;
1312
using SixLabors.ImageSharp.Web.DependencyInjection;
@@ -115,7 +114,6 @@ private void ConfigureCustomServicesAndCustomOptions(IServiceCollection services
115114
options.OnPrepareResponse = _ => { };
116115
})
117116
.SetRequestParser<QueryCollectionRequestParser>()
118-
.SetMemoryAllocator(provider => ArrayPoolMemoryAllocator.CreateWithMinimalPooling())
119117
.Configure<PhysicalFileSystemCacheOptions>(options =>
120118
{
121119
options.CacheFolder = "different-cache";

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<PropertyGroup>
1414
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props</MSBuildAllProjects>
15-
<ImageSharpProjectCategory>src</ImageSharpProjectCategory>
15+
<SixLaborsProjectCategory>src</SixLaborsProjectCategory>
1616
</PropertyGroup>
1717

1818
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />

‎tests/Directory.Build.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<PropertyGroup>
1414
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props</MSBuildAllProjects>
15-
<ImageSharpProjectCategory>tests</ImageSharpProjectCategory>
15+
<SixLaborsProjectCategory>tests</SixLaborsProjectCategory>
1616
<IsPackable>false</IsPackable>
1717
</PropertyGroup>
1818

@@ -22,8 +22,7 @@
2222

2323
<PropertyGroup>
2424
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\shared-infrastructure\SixLabors.Tests.ruleset</CodeAnalysisRuleSet>
25-
<!--TODO: We should remove all obsolete code from the solution-->
26-
<NoWarn>$(NoWarn);CS0618</NoWarn>
25+
<NoWarn>$(NoWarn);</NoWarn>
2726
</PropertyGroup>
2827

2928
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />

0 commit comments

Comments
 (0)