From 79ad9a4b0b0b57424784e4c45ea738755df14a13 Mon Sep 17 00:00:00 2001 From: ramtinak Date: Tue, 16 Jul 2019 05:56:46 -0700 Subject: [PATCH 1/5] UWP Support --- Iconic.Zlib.Netstandard.sln | 21 +++++++------ .../Iconic.Zlib.Netstandard.csproj | 31 ++++++++++++++++--- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/Iconic.Zlib.Netstandard.sln b/Iconic.Zlib.Netstandard.sln index 50fb355..06b40f6 100644 --- a/Iconic.Zlib.Netstandard.sln +++ b/Iconic.Zlib.Netstandard.sln @@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7691CB4F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{90F10B3F-5F02-4C4E-B11D-683BC9BA2C80}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Iconic.Zlib.Netstandard", "src\Iconic.Zlib.Netstandard\Iconic.Zlib.Netstandard.csproj", "{0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Iconic.Zlib.Netstandard", "src\Iconic.Zlib.Netstandard\Iconic.Zlib.Netstandard.csproj", "{0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Iconic.Zlib.Netstandard.Tests", "tests\Iconic.Zlib.Netstandard.Tests\Iconic.Zlib.Netstandard.Tests.csproj", "{E2326229-F498-4BB2-8768-6559B3BF119A}" EndProject @@ -23,16 +23,16 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Debug|x64.ActiveCfg = Debug|x64 - {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Debug|x64.Build.0 = Debug|x64 - {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Debug|x86.ActiveCfg = Debug|x86 - {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Debug|x86.Build.0 = Debug|x86 + {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Debug|x64.ActiveCfg = Debug|Any CPU + {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Debug|x64.Build.0 = Debug|Any CPU + {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Debug|x86.ActiveCfg = Debug|Any CPU + {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Debug|x86.Build.0 = Debug|Any CPU {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|Any CPU.ActiveCfg = Release|Any CPU {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|Any CPU.Build.0 = Release|Any CPU - {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|x64.ActiveCfg = Release|x64 - {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|x64.Build.0 = Release|x64 - {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|x86.ActiveCfg = Release|x86 - {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|x86.Build.0 = Release|x86 + {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|x64.ActiveCfg = Release|Any CPU + {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|x64.Build.0 = Release|Any CPU + {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|x86.ActiveCfg = Release|Any CPU + {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|x86.Build.0 = Release|Any CPU {E2326229-F498-4BB2-8768-6559B3BF119A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E2326229-F498-4BB2-8768-6559B3BF119A}.Debug|Any CPU.Build.0 = Debug|Any CPU {E2326229-F498-4BB2-8768-6559B3BF119A}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -53,4 +53,7 @@ Global {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD} = {90F10B3F-5F02-4C4E-B11D-683BC9BA2C80} {E2326229-F498-4BB2-8768-6559B3BF119A} = {7691CB4F-D19B-471D-B55B-633FF904C353} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {7E8BAB44-033E-402F-AFC5-A6FB58232352} + EndGlobalSection EndGlobal diff --git a/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj b/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj index 55ddf45..d148984 100644 --- a/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj +++ b/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj @@ -1,17 +1,40 @@  - netstandard1.3 + netstandard1.3;uap10.0 https://github.com/HelloKitty https://github.com/HelloKitty/Iconic.Zlib.Netstandard https://github.com/HelloKitty/Iconic.Zlib.Netstandard - A .NETStandard port of Iconic.Zlib from DotNetZip project. + A .NETStandard and UWP port of Iconic.Zlib from DotNetZip project. Git https://github.com/HelloKitty/Iconic.Zlib.Netstandard + + en-US + false + UAP,Version=v10.0 + UAP + 10.0.18362.0 + 10.0.14393.0 + .NETCore + v5.0 + $(DefineConstants);WINDOWS_UWP + $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets + None + - - bin\Release\netstandard1.3\Iconic.Zlib.Netstandard.xml + + netstandard1.3 + + netstandard1.3;uap10.0 + + + + + + \ No newline at end of file From 714c01bb5f67ee8a659b8f7d87fbecb23b166311 Mon Sep 17 00:00:00 2001 From: ramtinak Date: Tue, 16 Jul 2019 06:11:08 -0700 Subject: [PATCH 2/5] Add License to nuget package --- Iconic.Zlib.Netstandard.sln | 1 - .../Iconic.Zlib.Netstandard.csproj | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Iconic.Zlib.Netstandard.sln b/Iconic.Zlib.Netstandard.sln index 06b40f6..9d0bff5 100644 --- a/Iconic.Zlib.Netstandard.sln +++ b/Iconic.Zlib.Netstandard.sln @@ -34,7 +34,6 @@ Global {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|x86.ActiveCfg = Release|Any CPU {0CA7B3C9-E43A-4F69-BB17-1A6D65359BCD}.Release|x86.Build.0 = Release|Any CPU {E2326229-F498-4BB2-8768-6559B3BF119A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2326229-F498-4BB2-8768-6559B3BF119A}.Debug|Any CPU.Build.0 = Debug|Any CPU {E2326229-F498-4BB2-8768-6559B3BF119A}.Debug|x64.ActiveCfg = Debug|Any CPU {E2326229-F498-4BB2-8768-6559B3BF119A}.Debug|x64.Build.0 = Debug|Any CPU {E2326229-F498-4BB2-8768-6559B3BF119A}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj b/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj index d148984..8c98a8b 100644 --- a/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj +++ b/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj @@ -3,12 +3,18 @@ netstandard1.3;uap10.0 https://github.com/HelloKitty - https://github.com/HelloKitty/Iconic.Zlib.Netstandard - https://github.com/HelloKitty/Iconic.Zlib.Netstandard + https://github.com/ramtinak/Iconic.Zlib.Netstandard + false + A .NETStandard and UWP port of Iconic.Zlib from DotNetZip project. Git https://github.com/HelloKitty/Iconic.Zlib.Netstandard + LICENSE.jzlib.txt + true + + + en-US false From 748d8120752080332f1bb109e57e2aaf6f01d341 Mon Sep 17 00:00:00 2001 From: ramtinak Date: Tue, 16 Jul 2019 06:16:54 -0700 Subject: [PATCH 3/5] Update readme --- README.md | 2 +- src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3f99c35..68f0895 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Iconic.Zlib.Netstandard -Iconic.Zlib.Netstandard is an open-source .NETSTANDARD, .NETCORE, and .NETFRAMEWORK compatible port of the Iconic.Zlib library. +Iconic.Zlib.Netstandard is an open-source .NETSTANDARD, .NETCORE, UWP and .NETFRAMEWORK compatible port of the Iconic.Zlib library. It does not contain a multithreaded decompression stream due to netstandard1.3 not having the Threadpool. diff --git a/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj b/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj index 8c98a8b..4b14b35 100644 --- a/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj +++ b/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj @@ -11,9 +11,11 @@ https://github.com/HelloKitty/Iconic.Zlib.Netstandard LICENSE.jzlib.txt true + Iconic.Zlib.Netstandard + Iconic.Zlib.Netstandard - + en-US From 6d72da74fbdcb02efb8d7744cf4ef716107f9018 Mon Sep 17 00:00:00 2001 From: ramtinak Date: Tue, 16 Jul 2019 06:55:52 -0700 Subject: [PATCH 4/5] Add .net 4.5.2 and .netstandard 2.0 support --- .../Iconic.Zlib.Netstandard.csproj | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj b/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj index 4b14b35..d84b83b 100644 --- a/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj +++ b/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj @@ -1,7 +1,7 @@  - netstandard1.3;uap10.0 + netstandard2.0;net452;netstandard1.3;uap10.0 https://github.com/HelloKitty https://github.com/ramtinak/Iconic.Zlib.Netstandard false @@ -11,8 +11,9 @@ https://github.com/HelloKitty/Iconic.Zlib.Netstandard LICENSE.jzlib.txt true - Iconic.Zlib.Netstandard - Iconic.Zlib.Netstandard + Iconic.Zlib.NetstandardUwp + Iconic.Zlib.NetstandardUwp + 1.0.1 @@ -32,10 +33,10 @@ - netstandard1.3 + netstandard2.0;netstandard1.3 - netstandard1.3;uap10.0 + netstandard2.0;net452;netstandard1.3;uap10.0 From b9fdd59d81faad266f33447a1b03b8a713730e3e Mon Sep 17 00:00:00 2001 From: ramtin Date: Thu, 18 Feb 2021 07:27:25 +0330 Subject: [PATCH 5/5] v1.0.2 - NET 5 and NET Core support --- .../Iconic.Zlib.Netstandard.csproj | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj b/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj index d84b83b..db7b33b 100644 --- a/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj +++ b/src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj @@ -1,19 +1,22 @@  - netstandard2.0;net452;netstandard1.3;uap10.0 + netstandard2.0;net452;netstandard1.3;uap10.0;netcoreapp1.0;netcoreapp3.1;net5.0 https://github.com/HelloKitty https://github.com/ramtinak/Iconic.Zlib.Netstandard false - A .NETStandard and UWP port of Iconic.Zlib from DotNetZip project. + A .NET5, .NETCore, .NETStandard and UWP port of Iconic.Zlib from DotNetZip project. Git https://github.com/HelloKitty/Iconic.Zlib.Netstandard LICENSE.jzlib.txt true Iconic.Zlib.NetstandardUwp Iconic.Zlib.NetstandardUwp - 1.0.1 + 1.0.2 + v1.0.2 +- NET 5 and NET Core support + Zlib Iconic net5 netcore netstandard zip gzip deflate inflate @@ -33,10 +36,10 @@ - netstandard2.0;netstandard1.3 + netstandard2.0;netstandard1.3;netcoreapp1.0;netcoreapp3.1;net5.0 - netstandard2.0;net452;netstandard1.3;uap10.0 + netstandard2.0;net452;netstandard1.3;uap10.0;netcoreapp1.0;netcoreapp3.1;net5.0