UWP Support

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,18 +23,17 @@ 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
 		{E2326229-F498-4BB2-8768-6559B3BF119A}.Debug|x64.Build.0 = Debug|Any CPU
 		{E2326229-F498-4BB2-8768-6559B3BF119A}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -53,4 +52,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

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.
 

src/Iconic.Zlib.Netstandard/Iconic.Zlib.Netstandard.csproj

@@ -1,17 +1,52 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0;net452;netstandard1.3;uap10.0;netcoreapp1.0;netcoreapp3.1;net5.0</TargetFramework>
     <Authors>https://github.com/HelloKitty</Authors>
-    <PackageProjectUrl>https://github.com/HelloKitty/Iconic.Zlib.Netstandard</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/HelloKitty/Iconic.Zlib.Netstandard</PackageLicenseUrl>
-    <Description>A .NETStandard port of Iconic.Zlib from DotNetZip project.</Description>
+    <PackageProjectUrl>https://github.com/ramtinak/Iconic.Zlib.Netstandard</PackageProjectUrl>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <!--<PackageLicenseUrl>https://github.com/HelloKitty/Iconic.Zlib.Netstandard</PackageLicenseUrl>-->
+    <Description>A .NET5, .NETCore, .NETStandard and UWP port of Iconic.Zlib from DotNetZip project.</Description>
     <RepositoryType>Git</RepositoryType>
     <RepositoryUrl>https://github.com/HelloKitty/Iconic.Zlib.Netstandard</RepositoryUrl>
+    <PackageLicenseFile>LICENSE.jzlib.txt</PackageLicenseFile>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageId>Iconic.Zlib.NetstandardUwp</PackageId>
+    <Product>Iconic.Zlib.NetstandardUwp</Product>
+    <Version>1.0.2</Version>
+    <PackageReleaseNotes>v1.0.2
+- NET 5 and NET Core support</PackageReleaseNotes>
+    <PackageTags>Zlib Iconic net5 netcore netstandard zip gzip deflate inflate</PackageTags>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="LICENSE.jzlib.txt" Pack="true" Visible="false" PackagePath="" />
+  </ItemGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
+    <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+    <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
+    <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard1.3\Iconic.Zlib.Netstandard.xml</DocumentationFile>
+  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
+    <TargetFramework>netstandard2.0;netstandard1.3;netcoreapp1.0;netcoreapp3.1;net5.0</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>netstandard2.0;net452;netstandard1.3;uap10.0;netcoreapp1.0;netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform " Version="6.2.8" />
+  </ItemGroup>
+
+  <!--<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\netstandard1.3\Iconic.Zlib.Netstandard.xml</DocumentationFile>
+  </PropertyGroup>-->
 
 </Project>