diff --git a/.travis.yml b/.travis.yml index a749d2b7..5e1fa07b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,23 @@ language: csharp -solution: Qiniu.Net40.Travis.sln \ No newline at end of file + +install: + + - sudo apt-get install nunit + +before_script: + + - export QINIU_ACCESS_KEY="QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm" + - export QINIU_SECRET_KEY="Bxckh6FA-Fbs9Yt3i3cbKVK22UPBmAOHJcL95pGz" + - export QINIU_BUCKET_1="csharpsdk" + - export QINIU_BUCKET_2="csharpsdk" + - export FILE_KEY_1="test-file-1" + - export FILE_KEY_2="test-file-2" + - export LOCAL_FILE_1="1.txt" + - export LOCAL_FILE_2="1.jpg" + - export TEST_DOMAIN="csharpsdk.qiniudn.com" + - export TEST_URL1="http://img.ivsky.com/img/tupian/pre/201610/09/beifang_shanlin_xuejing-001.jpg" + - export TEST_URL2="http://DOMAIN/PATH/FILE?QUERY" + +script: + + - make build-and-test \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c13df9d..673701c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +**2017-02-13** + +最新版本v7.2.9,适用于.NET Framework 2.0+ , .NET Core 和 UWP + +新增:单元测试(NUnit) + +修复:部分细节问题修复 + +* * * + **2017-02-08** 最新版本v7.2.8,适用于.NET Framework 2.0+ , .NET Core 和 UWP diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..2dd3aa88 --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ +build-and-test: + + #mkdir bin + + cp tools/net40/Newtonsoft.Json.dll bin + cp tools/net40/nunit.framework.dll bin + cp tools/files/1.txt bin + cp tools/files/1.jpg bin + + xbuild Qiniu.Net40.Travis.sln + + nunit-console bin/Qiniu.UnitTest.dll diff --git a/Qiniu.Net40.Travis.sln b/Qiniu.Net40.Travis.sln index 17a760f4..7bd6074f 100644 --- a/Qiniu.Net40.Travis.sln +++ b/Qiniu.Net40.Travis.sln @@ -3,7 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qiniu.Net40.Travis", "src\Qiniu\Qiniu.Net40.Travis.csproj", "{2F5B0328-DE8B-4B53-A500-3077E340A51B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qiniu.Net40", "src\Qiniu\Qiniu.Net40.Travis.csproj", "{2F5B0328-DE8B-4B53-A500-3077E340A51B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qiniu.UnitTest", "Qiniu.UnitTest\Qiniu.UnitTest.Travis.csproj", "{353CEFE0-58AF-4049-998B-336CE1212F1E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,6 +16,10 @@ Global {2F5B0328-DE8B-4B53-A500-3077E340A51B}.Debug|Any CPU.Build.0 = Debug|Any CPU {2F5B0328-DE8B-4B53-A500-3077E340A51B}.Release|Any CPU.ActiveCfg = Release|Any CPU {2F5B0328-DE8B-4B53-A500-3077E340A51B}.Release|Any CPU.Build.0 = Release|Any CPU + {353CEFE0-58AF-4049-998B-336CE1212F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {353CEFE0-58AF-4049-998B-336CE1212F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {353CEFE0-58AF-4049-998B-336CE1212F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {353CEFE0-58AF-4049-998B-336CE1212F1E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/README.en-US.md b/README.en-US.md index 243893e2..0fdfe4f0 100644 --- a/README.en-US.md +++ b/README.en-US.md @@ -1,7 +1,5 @@ #Qiniu (Cloud) C# SDK -[](https://travis-ci.org/qiniu/csharp-sdk) - ##About This C# SDK is built based on Qiniu Cloud API (see below), and it can be used on .NET Framework 2.0+, .NET Core and UWP (Windows 10 Universal Platforms). It will help you to build an application easily and quickly. @@ -10,19 +8,15 @@ This C# SDK is built based on Qiniu Cloud API (see below), and it can be used on You can have a better view of this SDK by checking the documnets given below: -* [SDK-reference HTML Online](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.8/index.html) +* [SDK-reference HTML Online](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.9/index.html) -* [SDK-reference CHM Offline](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.8.chm) +* [SDK-reference CHM Offline](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.9.chm) Want to know more about how to using this SDK? Are you trying to find some code examples based on this SDK? These documents or links below will be helpful: * [github/csharp-sdk-shared-examples](https://github.com/fengyhack/csharp-sdk-shared-examples) -* [SDK manual | examples](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.8/index.html) - -Or if you want to develop **UWP apps**, the demo given below will do some help: - -* [github | csharp-sdk-example-uwp](https://github.com/fengyhack/csharp-sdk-example-uwp) +* [SDK manual | examples](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.97/index.html) ##How-to-install @@ -52,6 +46,7 @@ Suppose you are using Visual Studio(VS2013 and higher versions are strongly reco | .NET Core | Qiniu.NetCore.sln | | Windows10 UWP | Qiniu.UWP.sln | | All the above | Qiniu.ALL_VER.sln | +| UnitTest(NUnit) | Qiniu.UnitTest.sln | **Some details about building NetCore/UWP projects** @@ -112,9 +107,11 @@ www.opensource.org/licenses/MIT ##Appendix -###Quick start on .NET Core +###Quick start on .NET Coree -**How-to-use** Here is a step-by-step guide. +### How-to-use + +Here is a step-by-step guide. To get ready, if you need `dotnet` tool, see https://github.com/dotnet/cli/ @@ -201,9 +198,11 @@ In this case, you should have `dotnet` tool installed at the very begin. Or if you want to run the *published app* `Example`, just double-click it. -### Quick start on UWP +######Quick start on .NET Coree + +**What is UWP** -**What is UWP** UWP means (Windows 10) Universal Windows Platform. +UWP means (Windows 10) Universal Windows Platform. UWP project also contains a file called `project.json`, here is an example: diff --git a/README.md b/README.md index b8b62311..a27db720 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ #Qiniu (Cloud) C# SDK -[](https://travis-ci.org/qiniu/csharp-sdk) - ##关于 此 C# SDK 适用于.NET Framework 2.0+ , .NET Core 以及UWP(Windows 10 通用应用),基于七牛云API参考手册构建。使用此 SDK 构建您的网络应用程序,能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序,还是包括从云端(服务端程序)到终端(手持设备应用)的架构的服务或应用,通过七牛云存储及其 SDK,都能让您应用程序的终端用户高速上传和下载,同时也让您的服务端更加轻盈。 @@ -10,19 +8,15 @@ 以下文档用于检索SDK接口、属性说明,它将有助于您理解SDK的结构。 -* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.8/index.html) +* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.9/index.html) -* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.8.chm) +* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.9.chm) 以下文档/链接提供一些基本示例,参考这些示例可以帮助您更快熟悉如何使用这套SDK。 * [github | csharp-sdk-examples](https://github.com/fengyhack/csharp-sdk-examples) -* [C# SDK使用指南 | 代码示例](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.8/index.html) - -如果您想开发**UWP应用**,您也可以参考如下示例: - -* [github | csharp-sdk-example-uwp](https://github.com/fengyhack/csharp-sdk-example-uwp) +* [C# SDK使用指南 | 代码示例](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.9/index.html) ##如何安装 @@ -68,6 +62,7 @@ git clone https://github.com/qiniu/csharp-sdk | .NET Core | Qiniu.Core.sln | | Win10 UWP| Qiniu.UWP.sln | | 以上全部 | Qiniu.ALL_VER.sln | +| 单元测试(NUnit) | Qiniu.UnitTest.sln | **注意** diff --git a/bin/qiniu-csharp-sdk-v7.2.8.zip b/bin/qiniu-csharp-sdk-v7.2.8.zip deleted file mode 100644 index b8c84488..00000000 Binary files a/bin/qiniu-csharp-sdk-v7.2.8.zip and /dev/null differ diff --git a/bin/qiniu-csharp-sdk-v7.2.9.zip b/bin/qiniu-csharp-sdk-v7.2.9.zip new file mode 100644 index 00000000..87ae9ff9 Binary files /dev/null and b/bin/qiniu-csharp-sdk-v7.2.9.zip differ diff --git a/doc/README.html b/doc/README.html index 72d90062..a40d8804 100644 --- a/doc/README.html +++ b/doc/README.html @@ -21,14 +21,14 @@
以下文档用于检索SDK接口、属性说明,它将有助于您理解SDK的结构。
-以下文档/链接提供一些基本示例,参考这些示例可以帮助您更快熟悉如何使用这套SDK。
@@ -108,6 +108,10 @@