Merge pull request #2 from aliyun/features/update_dotnetzip

Update `DotNetZip` to `Iconic.Zlib.NetStandard`.
aliyun · Jul 10, 2018 · f6c424c · f6c424c
2 parents e83e4d9 + 5bfaa75
commit f6c424c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/Aliyun.Api.LogService/Aliyun.Api.LogService.csproj b/Aliyun.Api.LogService/Aliyun.Api.LogService.csproj
@@ -12,7 +12,7 @@
     <PackageTags>Aliyun </PackageTags>
     <Title>Aliyun LogService .Net Core SDK</Title>
     <PackOnBuild>true</PackOnBuild>
-    <PackageVersion>1.0.0</PackageVersion>
+    <PackageVersion>1.0.1</PackageVersion>
     <Description>Aliyun LogService SDK for .NET Core.</Description>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(OS)' == 'Release|Windows_NT' ">
@@ -21,8 +21,8 @@
     <AssemblyOriginatorKeyFile>$(SolutionDir)\aliyun-log-dotnetcore-sdk.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DotNetZip" Version="1.10.1" />
     <PackageReference Include="Google.Protobuf" Version="3.5.1" />
+    <PackageReference Include="Iconic.Zlib.Netstandard" Version="1.0.0" />
     <PackageReference Include="JetBrains.Annotations" Version="11.1.0" />
     <PackageReference Include="lz4net" Version="1.0.15.93" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.4" />

diff --git a/Aliyun.Api.LogService/Properties/AssemblyInfo.cs b/Aliyun.Api.LogService/Properties/AssemblyInfo.cs
@@ -45,7 +45,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.1")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Aliyun LogServie SDK for .NET Core
 
+## 1.0.1
+
+### 变更内容
+
+- 依赖变更： [DotNetZip &bull; 1.10.1](https://www.nuget.org/packages/DotNetZip/1.10.1) -> [Iconic.Zlib.NetStandard &bull; 1.0.0](https://www.nuget.org/packages/Iconic.Zlib.Netstandard/1.0.0) （ Iconic.Zlib.NetStandard 为 DotNetZip 的 Zlib 功能的 NetStandard 编译版本）
+
 ## 1.0.0
 
 ### 变更内容

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@
 | Http | [Microsoft.AspNet.WebApi.Client &bull; 5.2.4](https://www.nuget.org/packages/Microsoft.AspNet.WebApi.Client/5.2.4) |
 | Json | [Json.Net &bull; 11.0.2](https://www.nuget.org/packages/Newtonsoft.Json/11.0.2) |
 | Protobuf | [Google.Protobuf &bull; 3.5.1](https://www.nuget.org/packages/Google.Protobuf/3.5.1) |
-| Zlib | [DotNetZip &bull; 1.10.1](https://www.nuget.org/packages/DotNetZip/1.10.1) |
+| Zlib | [Iconic.Zlib.NetStandard &bull; 1.0.0](https://www.nuget.org/packages/Iconic.Zlib.Netstandard/1.0.0) |
 | Lz4 | [lz4net &bull; 1.0.15.93](https://www.nuget.org/packages/lz4net/1.0.15.93) |
 
 ## 快速开始

diff --git a/aliyun-log-dotnetcore-sdk.sln b/aliyun-log-dotnetcore-sdk.sln
@@ -10,6 +10,12 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aliyun.Api.LogService.Benchmark", "Aliyun.Api.LogService.Benchmark\Aliyun.Api.LogService.Benchmark.csproj", "{B3E40B38-F2A8-4E2D-8B14-EC1E3BC6078B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B52B50AC-86D8-46D7-B023-5FE2C4505EB5}"
+ProjectSection(SolutionItems) = preProject
+	CHANGELOG.md = CHANGELOG.md
+	CONTRIBUTE.md = CONTRIBUTE.md
+	LICENSE = LICENSE
+	README.md = README.md
+EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution