diff --git a/CHANGELOG.md b/CHANGELOG.md index 9274ea8..c6fac89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +## [v5.4.22](https://github.com/tencentyun/qcloud-sdk-dotnet/compare/v5.4.21...v5.4.22) - 2021-08-13 + +support Append, fix resumable download + +### Commits + +- support AppendObject, fix resumable download problem, add SetRegion check [`19baca5`](https://github.com/tencentyun/qcloud-sdk-dotnet/commit/19baca5f31756ef2952361ed5937f09186518664) +- restore some unitTest setting [`da9290d`](https://github.com/tencentyun/qcloud-sdk-dotnet/commit/da9290d576721736a174a34937f6afb85e312f62) +- Updated CHANGELOG.md [`8522c42`](https://github.com/tencentyun/qcloud-sdk-dotnet/commit/8522c42fb65fa1d73937445deca581cd23b95ae2) + ## [v5.4.21](https://github.com/tencentyun/qcloud-sdk-dotnet/compare/v5.4.19...v5.4.21) - 2021-07-01 修复部分请求签名错误问题 diff --git a/QCloudCSharpSDK/COSXML/COSXML.csproj b/QCloudCSharpSDK/COSXML/COSXML.csproj index 0314ea5..fb21fab 100644 --- a/QCloudCSharpSDK/COSXML/COSXML.csproj +++ b/QCloudCSharpSDK/COSXML/COSXML.csproj @@ -519,4 +519,5 @@ --> - \ No newline at end of file + + diff --git a/QCloudCSharpSDK/COSXML/Common/CosVersion.cs b/QCloudCSharpSDK/COSXML/Common/CosVersion.cs index dd5d09c..a0323b0 100644 --- a/QCloudCSharpSDK/COSXML/Common/CosVersion.cs +++ b/QCloudCSharpSDK/COSXML/Common/CosVersion.cs @@ -9,7 +9,11 @@ namespace COSXML.Common { public sealed class CosVersion { +<<<<<<< HEAD private static string SDKVersion = "5.4.24.0"; +======= + private static string SDKVersion = "5.4.23.0"; +>>>>>>> upstream/master public static string GetUserAgent() {