Skip to content

Commit 715b418

Browse files
authored
Merge pull request #145 from fengyhack/master
版本更新v7.2.9,新增单元测试
2 parents 388e750 + 8407885 commit 715b418

38 files changed

+16894
-81
lines changed

.travis.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,23 @@
11
language: csharp
2-
solution: Qiniu.Net40.Travis.sln
2+
3+
install:
4+
5+
- sudo apt-get install nunit
6+
7+
before_script:
8+
9+
- export QINIU_ACCESS_KEY="QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm"
10+
- export QINIU_SECRET_KEY="Bxckh6FA-Fbs9Yt3i3cbKVK22UPBmAOHJcL95pGz"
11+
- export QINIU_BUCKET_1="csharpsdk"
12+
- export QINIU_BUCKET_2="csharpsdk"
13+
- export FILE_KEY_1="test-file-1"
14+
- export FILE_KEY_2="test-file-2"
15+
- export LOCAL_FILE_1="1.txt"
16+
- export LOCAL_FILE_2="1.jpg"
17+
- export TEST_DOMAIN="csharpsdk.qiniudn.com"
18+
- export TEST_URL1="http://img.ivsky.com/img/tupian/pre/201610/09/beifang_shanlin_xuejing-001.jpg"
19+
- export TEST_URL2="http://DOMAIN/PATH/FILE?QUERY"
20+
21+
script:
22+
23+
- make build-and-test

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
**2017-02-13**
2+
3+
最新版本v7.2.9,适用于.NET Framework 2.0+ , .NET Core 和 UWP
4+
5+
新增:单元测试(NUnit)
6+
7+
修复:部分细节问题修复
8+
9+
* * *
10+
111
**2017-02-08**
212

313
最新版本v7.2.8,适用于.NET Framework 2.0+ , .NET Core 和 UWP

Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
build-and-test:
2+
3+
#mkdir bin
4+
5+
cp tools/net40/Newtonsoft.Json.dll bin
6+
cp tools/net40/nunit.framework.dll bin
7+
cp tools/files/1.txt bin
8+
cp tools/files/1.jpg bin
9+
10+
xbuild Qiniu.Net40.Travis.sln
11+
12+
nunit-console bin/Qiniu.UnitTest.dll

Qiniu.Net40.Travis.sln

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qiniu.Net40.Travis", "src\Qiniu\Qiniu.Net40.Travis.csproj", "{2F5B0328-DE8B-4B53-A500-3077E340A51B}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qiniu.Net40", "src\Qiniu\Qiniu.Net40.Travis.csproj", "{2F5B0328-DE8B-4B53-A500-3077E340A51B}"
7+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qiniu.UnitTest", "Qiniu.UnitTest\Qiniu.UnitTest.Travis.csproj", "{353CEFE0-58AF-4049-998B-336CE1212F1E}"
78
EndProject
89
Global
910
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +16,10 @@ Global
1516
{2F5B0328-DE8B-4B53-A500-3077E340A51B}.Debug|Any CPU.Build.0 = Debug|Any CPU
1617
{2F5B0328-DE8B-4B53-A500-3077E340A51B}.Release|Any CPU.ActiveCfg = Release|Any CPU
1718
{2F5B0328-DE8B-4B53-A500-3077E340A51B}.Release|Any CPU.Build.0 = Release|Any CPU
19+
{353CEFE0-58AF-4049-998B-336CE1212F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20+
{353CEFE0-58AF-4049-998B-336CE1212F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
21+
{353CEFE0-58AF-4049-998B-336CE1212F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
22+
{353CEFE0-58AF-4049-998B-336CE1212F1E}.Release|Any CPU.Build.0 = Release|Any CPU
1823
EndGlobalSection
1924
GlobalSection(SolutionProperties) = preSolution
2025
HideSolutionNode = FALSE

README.en-US.md

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#Qiniu (Cloud) C# SDK
22

3-
[![Build Status](https://api.travis-ci.org/qiniu/csharp-sdk.png?branch=master)](https://travis-ci.org/qiniu/csharp-sdk)
4-
53
##About
64

75
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
108

119
You can have a better view of this SDK by checking the documnets given below:
1210

13-
* [SDK-reference HTML Online](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.8/index.html)
11+
* [SDK-reference HTML Online](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.9/index.html)
1412

15-
* [SDK-reference CHM Offline](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.8.chm)
13+
* [SDK-reference CHM Offline](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.9.chm)
1614

1715
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:
1816

1917
* [github/csharp-sdk-shared-examples](https://github.com/fengyhack/csharp-sdk-shared-examples)
2018

21-
* [SDK manual | examples](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.8/index.html)
22-
23-
Or if you want to develop **UWP apps**, the demo given below will do some help:
24-
25-
* [github | csharp-sdk-example-uwp](https://github.com/fengyhack/csharp-sdk-example-uwp)
19+
* [SDK manual | examples](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.97/index.html)
2620

2721
##How-to-install
2822

@@ -52,6 +46,7 @@ Suppose you are using Visual Studio(VS2013 and higher versions are strongly reco
5246
| .NET Core | Qiniu.NetCore.sln |
5347
| Windows10 UWP | Qiniu.UWP.sln |
5448
| All the above | Qiniu.ALL_VER.sln |
49+
| UnitTest(NUnit) | Qiniu.UnitTest.sln |
5550

5651
**Some details about building NetCore/UWP projects**
5752

@@ -112,9 +107,11 @@ www.opensource.org/licenses/MIT
112107

113108
##Appendix
114109

115-
###Quick start on .NET Core
110+
###Quick start on .NET Coree
116111

117-
**How-to-use** Here is a step-by-step guide.
112+
### How-to-use
113+
114+
Here is a step-by-step guide.
118115

119116
To get ready, if you need `dotnet` tool, see https://github.com/dotnet/cli/
120117

@@ -201,9 +198,11 @@ In this case, you should have `dotnet` tool installed at the very begin.
201198

202199
Or if you want to run the *published app* `Example`, just double-click it.
203200

204-
### Quick start on UWP
201+
######Quick start on .NET Coree
202+
203+
**What is UWP**
205204

206-
**What is UWP** UWP means (Windows 10) Universal Windows Platform.
205+
UWP means (Windows 10) Universal Windows Platform.
207206

208207
UWP project also contains a file called `project.json`, here is an example:
209208

README.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#Qiniu (Cloud) C# SDK
22

3-
[![Build Status](https://api.travis-ci.org/qiniu/csharp-sdk.png?branch=master)](https://travis-ci.org/qiniu/csharp-sdk)
4-
53
##关于
64

75
此 C# SDK 适用于.NET Framework 2.0+ , .NET Core 以及UWP(Windows 10 通用应用),基于七牛云API参考手册构建。使用此 SDK 构建您的网络应用程序,能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序,还是包括从云端(服务端程序)到终端(手持设备应用)的架构的服务或应用,通过七牛云存储及其 SDK,都能让您应用程序的终端用户高速上传和下载,同时也让您的服务端更加轻盈。
@@ -10,19 +8,15 @@
108

119
以下文档用于检索SDK接口、属性说明,它将有助于您理解SDK的结构。
1210

13-
* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.8/index.html)
11+
* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.9/index.html)
1412

15-
* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.8.chm)
13+
* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.9.chm)
1614

1715
以下文档/链接提供一些基本示例,参考这些示例可以帮助您更快熟悉如何使用这套SDK。
1816

1917
* [github | csharp-sdk-examples](https://github.com/fengyhack/csharp-sdk-examples)
2018

21-
* [C# SDK使用指南 | 代码示例](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.8/index.html)
22-
23-
如果您想开发**UWP应用**,您也可以参考如下示例:
24-
25-
* [github | csharp-sdk-example-uwp](https://github.com/fengyhack/csharp-sdk-example-uwp)
19+
* [C# SDK使用指南 | 代码示例](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.9/index.html)
2620

2721
##如何安装
2822

@@ -68,6 +62,7 @@ git clone https://github.com/qiniu/csharp-sdk
6862
| .NET Core | Qiniu.Core.sln |
6963
| Win10 UWP| Qiniu.UWP.sln |
7064
| 以上全部 | Qiniu.ALL_VER.sln |
65+
| 单元测试(NUnit) | Qiniu.UnitTest.sln |
7166

7267
**注意**
7368

bin/qiniu-csharp-sdk-v7.2.8.zip

-288 KB
Binary file not shown.

bin/qiniu-csharp-sdk-v7.2.9.zip

288 KB
Binary file not shown.

doc/README.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ <h2 id="sdk文档">SDK文档</h2>
2121

2222
<p>以下文档用于检索SDK接口、属性说明,它将有助于您理解SDK的结构。</p>
2323

24-
<ul><li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.7/index.html" target="_blank">HTML在线浏览</a></p></li>
25-
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.7.chm" target="_blank">CHM文件下载</a></p></li>
24+
<ul><li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.9/index.html" target="_blank">HTML在线浏览</a></p></li>
25+
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.9.chm" target="_blank">CHM文件下载</a></p></li>
2626
</ul>
2727

2828
<p>以下文档/链接提供一些基本示例,参考这些示例可以帮助您更快熟悉如何使用这套SDK。</p>
2929

3030
<ul><li><p><a href="https://github.com/fengyhack/csharp-sdk-examples" target="_blank">github | csharp-sdk-examples</a></p></li>
31-
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.7/index.html" target="_blank">C# SDK使用指南 | 代码示例</a></p></li>
31+
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.9/index.html" target="_blank">C# SDK使用指南 | 代码示例</a></p></li>
3232
</ul>
3333

3434

@@ -108,6 +108,10 @@ <h2 id="如何编译">如何编译</h2>
108108
<td>以上全部</td>
109109
<td>Qiniu.ALL_VER.sln</td>
110110
</tr>
111+
<tr>
112+
<td>单元测试(NUnit)</td>
113+
<td>Qiniu.UnitTest.sln</td>
114+
</tr>
111115
</tbody></table>
112116

113117

doc/README.pdf

1.33 KB
Binary file not shown.

0 commit comments

Comments
 (0)