diff --git a/Spark.Api.Server.sln b/Spark.Api.Server.sln index 580d34086..1daf24b75 100644 --- a/Spark.Api.Server.sln +++ b/Spark.Api.Server.sln @@ -49,6 +49,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cs", "cs", "{385C4948-E080- EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Net", "src\cs\Bts.Net\Bts.Net.csproj", "{43FB297B-7A4D-4835-A878-E6DF345B580C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.IO.Compression", "src\cs\Bts.IO.Compression\Bts.IO.Compression.csproj", "{BC277499-8215-4F9F-B9AB-07B6391110BF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -545,6 +547,30 @@ Global {43FB297B-7A4D-4835-A878-E6DF345B580C}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU {43FB297B-7A4D-4835-A878-E6DF345B580C}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU {43FB297B-7A4D-4835-A878-E6DF345B580C}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|x64.ActiveCfg = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|x64.Build.0 = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|x86.ActiveCfg = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Debug|x86.Build.0 = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.MinSizeRel|x86.Build.0 = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|x64.ActiveCfg = Release|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|x64.Build.0 = Release|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|Any CPU.Build.0 = Release|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|x86.ActiveCfg = Release|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.Release|x86.Build.0 = Release|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU + {BC277499-8215-4F9F-B9AB-07B6391110BF}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -565,6 +591,7 @@ Global {39AEA075-6457-46C0-8821-1158BE6EFA57} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6} {385C4948-E080-56A6-E29E-8B0F4913175C} = {267F81EF-A8AB-49FD-9F56-D7EC3C1F7C7C} {43FB297B-7A4D-4835-A878-E6DF345B580C} = {385C4948-E080-56A6-E29E-8B0F4913175C} + {BC277499-8215-4F9F-B9AB-07B6391110BF} = {385C4948-E080-56A6-E29E-8B0F4913175C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58} diff --git a/spark_client.sln b/spark_client.sln index f9551201f..32bcb5c2c 100644 --- a/spark_client.sln +++ b/spark_client.sln @@ -35,6 +35,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Net", "src\cs\Bts.Net\B EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\cs\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{90A48718-F6A7-4747-97EA-89632B451008}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cs", "cs", "{1A5B8C5D-BADC-457E-819F-0050C44FE4D3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.IO.Compression", "src\cs\Bts.IO.Compression\Bts.IO.Compression.csproj", "{2A0FBDE0-D870-4567-85BD-F7793A5862C6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -387,12 +391,38 @@ Global {90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU {90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU {90A48718-F6A7-4747-97EA-89632B451008}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Debug|x64.ActiveCfg = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Debug|x64.Build.0 = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Debug|x86.ActiveCfg = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Debug|x86.Build.0 = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.MinSizeRel|x86.Build.0 = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Release|x64.ActiveCfg = Release|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Release|x64.Build.0 = Release|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Release|Any CPU.Build.0 = Release|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Release|x86.ActiveCfg = Release|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.Release|x86.Build.0 = Release|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU + {2A0FBDE0-D870-4567-85BD-F7793A5862C6}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {60E0D592-FFB3-0D0A-C4AA-E88919B48F9D} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {1A5B8C5D-BADC-457E-819F-0050C44FE4D3} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {2A0FBDE0-D870-4567-85BD-F7793A5862C6} = {1A5B8C5D-BADC-457E-819F-0050C44FE4D3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58} diff --git a/src/DataStreamSuite/DataStreamSuite.sln b/src/DataStreamSuite/DataStreamSuite.sln index 93868b2b7..caa78099b 100644 --- a/src/DataStreamSuite/DataStreamSuite.sln +++ b/src/DataStreamSuite/DataStreamSuite.sln @@ -41,6 +41,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", ". EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Net", "..\cs\Bts.Net\Bts.Net.csproj", "{496333E0-E11D-45EE-B0D6-BBAA824A120D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.IO.Compression", "..\cs\Bts.IO.Compression\Bts.IO.Compression.csproj", "{3BF059B0-51C0-44A8-8297-9B7464DC5BA3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -279,6 +281,18 @@ Global {496333E0-E11D-45EE-B0D6-BBAA824A120D}.Release|x64.Build.0 = Release|Any CPU {496333E0-E11D-45EE-B0D6-BBAA824A120D}.Release|x86.ActiveCfg = Release|Any CPU {496333E0-E11D-45EE-B0D6-BBAA824A120D}.Release|x86.Build.0 = Release|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|x64.ActiveCfg = Debug|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|x64.Build.0 = Debug|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|x86.ActiveCfg = Debug|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Debug|x86.Build.0 = Debug|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|Any CPU.Build.0 = Release|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|x64.ActiveCfg = Release|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|x64.Build.0 = Release|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|x86.ActiveCfg = Release|Any CPU + {3BF059B0-51C0-44A8-8297-9B7464DC5BA3}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/CompressionUtilities.csproj b/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/CompressionUtilities.csproj deleted file mode 100644 index a8b390cd9..000000000 --- a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/CompressionUtilities.csproj +++ /dev/null @@ -1,273 +0,0 @@ - - - - Local - 9.0.30729 - 2.0 - {41DBB1A3-1A4E-457D-BB2C-BFDE486E328B} - Debug - x64 - - - - - CompressionUtilities - ..\..\StrongNameKeys\Builder.snk - JScript - Grid - IE50 - false - Library - CompressionUtilities - OnBuildSuccess - - - false - v4.0 - 0 - 1.0.0.%2a - - - false - 285212672 - false - - - DEBUG;TRACE - - - true - 4096 - false - - - false - false - false - true - 4 - full - prompt - AllRules.ruleset - - - false - 285212672 - false - - - DEBUG;TRACE - - - true - 4096 - false - - - false - false - false - true - 4 - full - prompt - true - AllRules.ruleset - - - true - DEBUG;TRACE - 285212672 - full - x64 - prompt - AllRules.ruleset - - - true - DEBUG;TRACE - 285212672 - 4096 - full - x64 - prompt - AllRules.ruleset - - - true - true - DEBUG;TRACE - 285212672 - 4096 - full - x64 - prompt - AllRules.ruleset - - - true - DEBUG;TRACE - 285212672 - full - x64 - prompt - AllRules.ruleset - - - - System - - - 4.0 - - - System.Data - - - System.XML - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - False - .NET Framework 3.5 SP1 Client Profile - - - False - .NET Framework 3.5 SP1 - - - False - Windows Installer 3.1 - - - - - - - - - - diff --git a/src/DataStreamSuite/PubSub/PubSub.csproj b/src/DataStreamSuite/PubSub/PubSub.csproj index eb05928ef..8640d0831 100644 --- a/src/DataStreamSuite/PubSub/PubSub.csproj +++ b/src/DataStreamSuite/PubSub/PubSub.csproj @@ -10,12 +10,14 @@ + + diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/BlueCompressUtilities/IBlueCompressor.cs b/src/cs/Bts.IO.Compression/BlueCompressUtilities/IBlueCompressor.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/BlueCompressUtilities/IBlueCompressor.cs rename to src/cs/Bts.IO.Compression/BlueCompressUtilities/IBlueCompressor.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/BlueCompressUtilities/SharpZipCompressor.cs b/src/cs/Bts.IO.Compression/BlueCompressUtilities/SharpZipCompressor.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/BlueCompressUtilities/SharpZipCompressor.cs rename to src/cs/Bts.IO.Compression/BlueCompressUtilities/SharpZipCompressor.cs diff --git a/src/cs/Bts.IO.Compression/Bts.IO.Compression.csproj b/src/cs/Bts.IO.Compression/Bts.IO.Compression.csproj new file mode 100644 index 000000000..30402ac0e --- /dev/null +++ b/src/cs/Bts.IO.Compression/Bts.IO.Compression.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/BZip2/BZip2.cs b/src/cs/Bts.IO.Compression/SharpZipLib/BZip2/BZip2.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/BZip2/BZip2.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/BZip2/BZip2.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/BZip2/BZip2Constants.cs b/src/cs/Bts.IO.Compression/SharpZipLib/BZip2/BZip2Constants.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/BZip2/BZip2Constants.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/BZip2/BZip2Constants.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/BZip2/BZip2InputStream.cs b/src/cs/Bts.IO.Compression/SharpZipLib/BZip2/BZip2InputStream.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/BZip2/BZip2InputStream.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/BZip2/BZip2InputStream.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/BZip2/BZip2OutputStream.cs b/src/cs/Bts.IO.Compression/SharpZipLib/BZip2/BZip2OutputStream.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/BZip2/BZip2OutputStream.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/BZip2/BZip2OutputStream.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Checksums/Adler32.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Checksums/Adler32.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Checksums/Adler32.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Checksums/Adler32.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Checksums/Crc32.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Checksums/Crc32.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Checksums/Crc32.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Checksums/Crc32.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Checksums/IChecksum.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Checksums/IChecksum.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Checksums/IChecksum.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Checksums/IChecksum.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Checksums/StrangeCrc.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Checksums/StrangeCrc.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Checksums/StrangeCrc.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Checksums/StrangeCrc.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/GZip/GZipConstants.cs b/src/cs/Bts.IO.Compression/SharpZipLib/GZip/GZipConstants.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/GZip/GZipConstants.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/GZip/GZipConstants.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/GZip/GZipInputStream.cs b/src/cs/Bts.IO.Compression/SharpZipLib/GZip/GZipInputStream.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/GZip/GZipInputStream.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/GZip/GZipInputStream.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/GZip/GZipOutputStream.cs b/src/cs/Bts.IO.Compression/SharpZipLib/GZip/GZipOutputStream.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/GZip/GZipOutputStream.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/GZip/GZipOutputStream.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/InvalidHeaderException.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Tar/InvalidHeaderException.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/InvalidHeaderException.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Tar/InvalidHeaderException.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarArchive.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarArchive.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarArchive.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarArchive.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarBuffer.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarBuffer.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarBuffer.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarBuffer.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarEntry.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarEntry.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarEntry.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarEntry.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarHeader.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarHeader.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarHeader.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarHeader.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarInputStream.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarInputStream.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarInputStream.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarInputStream.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarOutputStream.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarOutputStream.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Tar/TarOutputStream.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Tar/TarOutputStream.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Deflater.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Deflater.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Deflater.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Deflater.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/DeflaterConstants.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/DeflaterConstants.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/DeflaterConstants.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/DeflaterConstants.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/DeflaterEngine.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/DeflaterEngine.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/DeflaterEngine.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/DeflaterEngine.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/DeflaterHuffman.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/DeflaterHuffman.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/DeflaterHuffman.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/DeflaterHuffman.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/DeflaterPending.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/DeflaterPending.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/DeflaterPending.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/DeflaterPending.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Inflater.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Inflater.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Inflater.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Inflater.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/InflaterDynHeader.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/InflaterDynHeader.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/InflaterDynHeader.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/InflaterDynHeader.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/InflaterHuffmanTree.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/InflaterHuffmanTree.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/InflaterHuffmanTree.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/InflaterHuffmanTree.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/PendingBuffer.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/PendingBuffer.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/PendingBuffer.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/PendingBuffer.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Streams/DeflaterOutputStream.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Streams/DeflaterOutputStream.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Streams/DeflaterOutputStream.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Streams/DeflaterOutputStream.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Streams/InflaterInputStream.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Streams/InflaterInputStream.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Streams/InflaterInputStream.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Streams/InflaterInputStream.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Streams/OutputWindow.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Streams/OutputWindow.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Streams/OutputWindow.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Streams/OutputWindow.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Streams/StreamManipulator.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Streams/StreamManipulator.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/Compression/Streams/StreamManipulator.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/Compression/Streams/StreamManipulator.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/ZipConstants.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/ZipConstants.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/ZipConstants.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/ZipConstants.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/ZipEntry.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/ZipEntry.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/ZipEntry.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/ZipEntry.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/ZipFile.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/ZipFile.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/ZipFile.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/ZipFile.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/ZipInputStream.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/ZipInputStream.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/ZipInputStream.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/ZipInputStream.cs diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/ZipOutputStream.cs b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/ZipOutputStream.cs similarity index 98% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/ZipOutputStream.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/Zip/ZipOutputStream.cs index 26712b88e..592f8f869 100644 --- a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/Zip/ZipOutputStream.cs +++ b/src/cs/Bts.IO.Compression/SharpZipLib/Zip/ZipOutputStream.cs @@ -44,8 +44,6 @@ using BCG.Utilities.SharpZipLib.Checksums; using BCG.Utilities.SharpZipLib.Zip.Compression; using BCG.Utilities.SharpZipLib.Zip.Compression.Streams; -using Spark.Core.Diagnostics; - namespace BCG.Utilities.SharpZipLib.Zip { /// @@ -396,7 +394,10 @@ namespace BCG.Utilities.SharpZipLib.Zip { } } - ExceptionAssert.MemberNotNull(entries).Add(curEntry); + if (entries is null) { + throw new InvalidOperationException("Unable to add entry (entries array is null)"); + } + entries.Add(curEntry); curEntry = null; } diff --git a/src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/ZipException.cs b/src/cs/Bts.IO.Compression/SharpZipLib/ZipException.cs similarity index 100% rename from src/DataStreamSuite/PubSub/Misc/CompressionUtilities/SharpZipLib/ZipException.cs rename to src/cs/Bts.IO.Compression/SharpZipLib/ZipException.cs