Skip to content

Commit a7c05ac

Browse files
authored
Merge pull request #1 from SixLabors/af/cleanup
Minor cleanup and fix failing tests
2 parents 1bc67e5 + dd0af47 commit a7c05ac

3 files changed

Lines changed: 5 additions & 21 deletions

File tree

ImageSharp.Drawing.sln

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -352,37 +352,17 @@ EndProject
352352
Global
353353
GlobalSection(SolutionConfigurationPlatforms) = preSolution
354354
Debug|Any CPU = Debug|Any CPU
355-
Debug|x64 = Debug|x64
356-
Debug|x86 = Debug|x86
357355
Release|Any CPU = Release|Any CPU
358-
Release|x64 = Release|x64
359-
Release|x86 = Release|x86
360356
EndGlobalSection
361357
GlobalSection(ProjectConfigurationPlatforms) = postSolution
362358
{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
363359
{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|Any CPU.Build.0 = Debug|Any CPU
364-
{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x64.ActiveCfg = Debug|Any CPU
365-
{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x64.Build.0 = Debug|Any CPU
366-
{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x86.ActiveCfg = Debug|Any CPU
367-
{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x86.Build.0 = Debug|Any CPU
368360
{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|Any CPU.ActiveCfg = Release|Any CPU
369361
{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|Any CPU.Build.0 = Release|Any CPU
370-
{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x64.ActiveCfg = Release|Any CPU
371-
{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x64.Build.0 = Release|Any CPU
372-
{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x86.ActiveCfg = Release|Any CPU
373-
{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x86.Build.0 = Release|Any CPU
374362
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
375363
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
376-
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x64.ActiveCfg = Debug|Any CPU
377-
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x64.Build.0 = Debug|Any CPU
378-
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x86.ActiveCfg = Debug|Any CPU
379-
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x86.Build.0 = Debug|Any CPU
380364
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
381365
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|Any CPU.Build.0 = Release|Any CPU
382-
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x64.ActiveCfg = Release|Any CPU
383-
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x64.Build.0 = Release|Any CPU
384-
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x86.ActiveCfg = Release|Any CPU
385-
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x86.Build.0 = Release|Any CPU
386366
EndGlobalSection
387367
GlobalSection(SolutionProperties) = preSolution
388368
HideSolutionNode = FALSE

tests/ImageSharp.Tests/ImageSharp.Drawing.Tests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
<None Update="TestFonts\*.ttf">
3030
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3131
</None>
32+
<None Update="TestFonts\SixLaborsSampleAB.woff">
33+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
34+
</None>
3235
<None Update="xunit.runner.json">
3336
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3437
</None>

tests/ImageSharp.Tests/Shapes/ComplexPolygonTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ public void SmallRingAtLargeCoords_HorizontalScansShouldFind4IntersectionPoints(
190190

191191
if (badPositions.Count > 0)
192192
{
193-
string badPoz = string.Join(',', badPositions);
193+
// The char overload is causing mysterious build failures in Visual Studio
194+
string badPoz = string.Join(",", badPositions);
194195
this.Output.WriteLine($"BAD: {badPositions.Count} of {yMax - yMin}: {badPoz}");
195196

196197
Assert.True(false);

0 commit comments

Comments
 (0)