Adding conditional compilation for C# Clipper2lib to change the namespace from Clipper2Lib to Clipper2ZLib when USINGZ. This prepares to allow both variants to be packaged and deployed via Nuget. (#1023)

SebastianDirks · web-flow · commit 53915c050057 · 2025-10-09T09:45:28.000+10:00
diff --git a/CSharp/Clipper2Lib.Benchmark/Benchmarks.cs b/CSharp/Clipper2Lib.Benchmark/Benchmarks.cs
@@ -3,7 +3,11 @@
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Jobs;
 
+#if USINGZ
+namespace Clipper2ZLib.Benchmark
+#else
 namespace Clipper2Lib.Benchmark
+#endif
 {
   public class FastConfig : ManualConfig
     {
diff --git a/CSharp/Clipper2Lib.Benchmark/Program.cs b/CSharp/Clipper2Lib.Benchmark/Program.cs
@@ -1,8 +1,12 @@
 using BenchmarkDotNet.Running;
 
+#if USINGZ
+namespace Clipper2ZLib.Benchmark
+#else
 namespace Clipper2Lib.Benchmark
+#endif
 {
-    public static class Program
+  public static class Program
     {        
         public static void Main()
         {
diff --git a/CSharp/Clipper2Lib.Examples/ConsoleDemo/Main.cs b/CSharp/Clipper2Lib.Examples/ConsoleDemo/Main.cs
@@ -8,7 +8,11 @@
 
 using System.Reflection;
 using System.IO;
+#if USINGZ
+using Clipper2ZLib;
+#else
 using Clipper2Lib;
+#endif
 using System;
 
 namespace ClipperDemo1
diff --git a/CSharp/Clipper2Lib.Examples/InflateDemo/Main.cs b/CSharp/Clipper2Lib.Examples/InflateDemo/Main.cs
@@ -8,7 +8,11 @@
 
 using System.IO;
 using System.Reflection;
+#if USINGZ
+using Clipper2ZLib;
+#else
 using Clipper2Lib;
+#endif
 
 namespace ClipperDemo1
 {
diff --git a/CSharp/Clipper2Lib.Tests/Tests2/Tests/TestZCallback1.cs b/CSharp/Clipper2Lib.Tests/Tests2/Tests/TestZCallback1.cs
@@ -2,7 +2,7 @@
 
 // USINGZ compiler directive should have been set in project properties
 
-namespace Clipper2Lib.UnitTests
+namespace Clipper2ZLib.UnitTests
 {
 
   [TestClass]
diff --git a/CSharp/Clipper2Lib/Clipper.Core.cs b/CSharp/Clipper2Lib/Clipper.Core.cs
@@ -12,7 +12,11 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
+#if USINGZ
+namespace Clipper2ZLib
+#else
 namespace Clipper2Lib
+#endif
 {
   public struct Point64
   {
diff --git a/CSharp/Clipper2Lib/Clipper.Engine.cs b/CSharp/Clipper2Lib/Clipper.Engine.cs
@@ -15,7 +15,11 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
+#if USINGZ
+namespace Clipper2ZLib
+#else
 namespace Clipper2Lib
+#endif
 {
 
   // Vertex: a pre-clipping data structure. It is used to separate polygons
diff --git a/CSharp/Clipper2Lib/Clipper.Minkowski.cs b/CSharp/Clipper2Lib/Clipper.Minkowski.cs
@@ -10,7 +10,11 @@
 #nullable enable
 using System;
 
+#if USINGZ
+namespace Clipper2ZLib
+#else
 namespace Clipper2Lib
+#endif
 {
   public static class Minkowski
   {
diff --git a/CSharp/Clipper2Lib/Clipper.Offset.cs b/CSharp/Clipper2Lib/Clipper.Offset.cs
@@ -11,7 +11,11 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
+#if USINGZ
+namespace Clipper2ZLib
+#else
 namespace Clipper2Lib
+#endif
 {
   public enum JoinType
   {
diff --git a/CSharp/Clipper2Lib/Clipper.RectClip.cs b/CSharp/Clipper2Lib/Clipper.RectClip.cs
@@ -12,7 +12,11 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
+#if USINGZ
+namespace Clipper2ZLib
+#else
 namespace Clipper2Lib
+#endif
 {
   public class OutPt2
   {
diff --git a/CSharp/Clipper2Lib/Clipper.cs b/CSharp/Clipper2Lib/Clipper.cs
@@ -16,7 +16,11 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
+#if USINGZ
+namespace Clipper2ZLib
+#else
 namespace Clipper2Lib
+#endif
 {
 
   // PRE-COMPILER CONDITIONAL ...
diff --git a/CSharp/Clipper2Lib/HashCode.cs b/CSharp/Clipper2Lib/HashCode.cs
@@ -3,7 +3,11 @@
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 
+#if USINGZ
+namespace Clipper2ZLib
+#else
 namespace Clipper2Lib
+#endif
 {
   /*
 
diff --git a/CSharp/Clipper2Lib/PooledList.cs b/CSharp/Clipper2Lib/PooledList.cs
@@ -1,8 +1,8 @@
 ﻿/*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  10 October 2024                                                 *
+* Date      :  7 October 2025                                                 *
 * Website   :  http://www.angusj.com                                           *
-* Copyright :  Angus Johnson 2010-2024                                         *
+* Copyright :  Angus Johnson 2010-2025                                         *
 * Purpose   :  A pool of reusable vertex objects.                    *
 * Thanks    :  Special thanks to Thong Nguyen, Guus Kuiper, Phil Stopford,     *
 *           :  and Daniel Gosnell for their invaluable assistance with C#.     *
@@ -14,7 +14,11 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
+#if USINGZ
+namespace Clipper2ZLib
+#else
 namespace Clipper2Lib
+#endif
 {
   /// <summary>
   /// A pool of reusable vertex objects
diff --git a/CSharp/Utils/ClipFileIO/Clipper.FileIO.cs b/CSharp/Utils/ClipFileIO/Clipper.FileIO.cs
@@ -10,7 +10,11 @@
 using System.IO;
 using System.Diagnostics;
 
+#if USINGZ
+namespace Clipper2ZLib
+#else
 namespace Clipper2Lib
+#endif
 {
 
   public static class ClipperFileIO
diff --git a/CSharp/Utils/SVG/Clipper.SVG.Utils.cs b/CSharp/Utils/SVG/Clipper.SVG.Utils.cs
@@ -8,7 +8,11 @@
 
 using System.IO;
 
+#if USINGZ
+namespace Clipper2ZLib
+#else
 namespace Clipper2Lib
+#endif
 {
   public static class SvgUtils
   {
diff --git a/CSharp/Utils/SVG/Clipper.SVG.cs b/CSharp/Utils/SVG/Clipper.SVG.cs
@@ -11,7 +11,11 @@
 using System.Globalization;
 using System.IO;
 
+#if USINGZ
+namespace Clipper2ZLib
+#else
 namespace Clipper2Lib
+#endif
 {
   public class SvgWriter
   {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,11 @@`
`3`	`3`	`using BenchmarkDotNet.Configs;`
`4`	`4`	`using BenchmarkDotNet.Jobs;`
`5`	`5`
	`6`	`+#if USINGZ`
	`7`	`+namespace Clipper2ZLib.Benchmark`
	`8`	`+#else`
`6`	`9`	`namespace Clipper2Lib.Benchmark`
	`10`	`+#endif`
`7`	`11`	`{`
`8`	`12`	`public class FastConfig : ManualConfig`
`9`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,12 @@`
`1`	`1`	`using BenchmarkDotNet.Running;`
`2`	`2`
	`3`	`+#if USINGZ`
	`4`	`+namespace Clipper2ZLib.Benchmark`
	`5`	`+#else`
`3`	`6`	`namespace Clipper2Lib.Benchmark`
	`7`	`+#endif`
`4`	`8`	`{`
`5`		`- public static class Program`
	`9`	`+ public static class Program`
`6`	`10`	`{`
`7`	`11`	`public static void Main()`
`8`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`// USINGZ compiler directive should have been set in project properties`
`4`	`4`
`5`		`-namespace Clipper2Lib.UnitTests`
	`5`	`+namespace Clipper2ZLib.UnitTests`
`6`	`6`	`{`
`7`	`7`
`8`	`8`	`[TestClass]`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,11 @@`
`12`	`12`	`using System.Collections.Generic;`
`13`	`13`	`using System.Runtime.CompilerServices;`
`14`	`14`
	`15`	`+#if USINGZ`
	`16`	`+namespace Clipper2ZLib`
	`17`	`+#else`
`15`	`18`	`namespace Clipper2Lib`
	`19`	`+#endif`
`16`	`20`	`{`
`17`	`21`	`public struct Point64`
`18`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,11 @@`
`10`	`10`	`#nullable enable`
`11`	`11`	`using System;`
`12`	`12`
	`13`	`+#if USINGZ`
	`14`	`+namespace Clipper2ZLib`
	`15`	`+#else`
`13`	`16`	`namespace Clipper2Lib`
	`17`	`+#endif`
`14`	`18`	`{`
`15`	`19`	`public static class Minkowski`
`16`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,11 @@`
`11`	`11`	`using System.Collections.Generic;`
`12`	`12`	`using System.Runtime.CompilerServices;`
`13`	`13`
	`14`	`+#if USINGZ`
	`15`	`+namespace Clipper2ZLib`
	`16`	`+#else`
`14`	`17`	`namespace Clipper2Lib`
	`18`	`+#endif`
`15`	`19`	`{`
`16`	`20`	`public enum JoinType`
`17`	`21`	`{`