Skip to content

Commit c121de4

Browse files
fengyhackfengyhack
authored
Merge pull request #156 from fengyhack/master
版本更新v7.2.13
2 parents 56292f4 + 5caccae commit c121de4

33 files changed

+193
-141
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
**2017-02-24**
22

3+
最新版本v7.2.13，适用于.NET Framework 2.0+ , .NET Core 和 UWP
4+
5+
修复：`Qiniu.CDN.Model`模块下`XXRequest.ctor(IList_string)`函数传入null参数导致的错误
6+
7+
* * *
8+
9+
**2017-02-24**
10+
311
最新版本v7.2.12，适用于.NET Framework 2.0+ , .NET Core 和 UWP
412

513
新增：MD5哈希函数的3rdParty实现(避免FIPS问题)

‎README.en-US.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ This C# SDK is built based on Qiniu Cloud API (see below), and it can be used on
1010

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

13-
* [SDK-reference HTML Online](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.12/index.html)
13+
* [SDK-reference HTML Online](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.13/index.html)
1414

15-
* [SDK-reference CHM Offline](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.12.chm)
15+
* [SDK-reference CHM Offline](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.13.chm)
1616

1717
Want to know more about how to using this SDK? Are you trying to find some code examples based on this SDK? These examples (**UWP app** example included) or links below will be helpful:
1818

1919
* [github/csharp-sdk-shared-examples](https://github.com/qiniu/csharp-sdk/tree/master/examples)
2020

21-
* [SDK manual | examples](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.11/index.html)
21+
* [SDK manual | examples](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.13/index.html)
2222

2323
##How-to-install
2424

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

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

13-
* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.12/index.html)
13+
* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.13/index.html)
1414

15-
* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.12.chm)
15+
* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.13.chm)
1616

1717
以下链接提供了一些示例(包含**UWP应用**示例)，参考这些示例可以帮助您更快熟悉如何使用这套SDK。
1818

1919
* [github | csharp-sdk-examples](https://github.com/qiniu/csharp-sdk/tree/master/examples)
2020

21-
* [C# SDK使用指南 | 代码示例](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.12/index.html)
21+
* [C# SDK使用指南 | 代码示例](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.13/index.html)
2222

2323
##如何安装
2424

‎bin/qiniu-csharp-sdk-v7.2.12.zip‎

-307 KB
Binary file not shown.

‎bin/qiniu-csharp-sdk-v7.2.13.zip‎

307 KB
Binary file not shown.

‎doc/README.html‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
<!DOCTYPE html><html><head><title>Qiniu (Cloud) C# SDK</title><meta charset='utf-8'><link href='https://dn-maxiang.qbox.me/res-min/themes/marxico.css' rel='stylesheet'><style>
1+
<!DOCTYPE html><html><head><title>关于</title><meta charset='utf-8'><link href='https://dn-maxiang.qbox.me/res-min/themes/marxico.css' rel='stylesheet'><style>
22
.note-content {font-family: 'Helvetica Neue', Arial, 'Hiragino Sans GB', STHeiti, 'Microsoft YaHei', 'WenQuanYi Micro Hei', SimSun, Song, sans-serif;}
33

44
</style></head><body><div id='preview-contents' class='note-content'>
55

66

77

8-
9-
10-
<h1 id="qiniu-cloud-c-sdk">Qiniu (Cloud) C# SDK</h1>
8+
<h1>Qiniu (Cloud) C# SDK</h1>
119

1210
<div><div class="toc"><div class="toc">
1311
<ul>
12+
<li><ul>
1413
<li><a href="#关于">关于</a></li>
1514
<li><a href="#sdk文档">SDK文档</a></li>
1615
<li><a href="#如何安装">如何安装</a></li>
@@ -36,8 +35,6 @@ <h1 id="qiniu-cloud-c-sdk">Qiniu (Cloud) C# SDK</h1>
3635
</div>
3736
</div>
3837

39-
40-
4138
<h2 id="关于">关于</h2>
4239

4340
<p>此 C# SDK 适用于.NET Framework 2.0+ , .NET Core 以及UWP(Windows 10 通用应用)，基于七牛云API参考手册构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。</p>
@@ -48,16 +45,18 @@ <h2 id="sdk文档">SDK文档</h2>
4845

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

51-
<ul><li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.12/index.html" target="_blank">HTML在线浏览</a></p></li>
52-
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.12.chm" target="_blank">CHM文件下载</a></p></li>
48+
<ul><li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.13/index.html" target="_blank">HTML在线浏览</a></p></li>
49+
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.13.chm" target="_blank">CHM文件下载</a></p></li>
5350
</ul>
5451

55-
<p>以下链接提供一些示例(包含<strong>UWP</strong>示例)，参考这些示例可以帮助您更快熟悉如何使用这套SDK。</p>
52+
<p>以下链接提供了一些示例(包含<strong>UWP应用</strong>示例)，参考这些示例可以帮助您更快熟悉如何使用这套SDK。</p>
5653

5754
<ul><li><p><a href="https://github.com/qiniu/csharp-sdk/tree/master/examples" target="_blank">github | csharp-sdk-examples</a></p></li>
58-
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.12/index.html" target="_blank">C# SDK使用指南 | 代码示例</a></p></li>
55+
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.13/index.html" target="_blank">C# SDK使用指南 | 代码示例</a></p></li>
5956
</ul>
6057

58+
59+
6160
<h2 id="如何安装">如何安装</h2>
6261

6362
<p>当前最新版本及最新改动同步在master分支。</p>
@@ -137,6 +136,10 @@ <h2 id="如何编译">如何编译</h2>
137136
<td>单元测试(NUnit)</td>
138137
<td>Qiniu.UnitTest.sln</td>
139138
</tr>
139+
<tr>
140+
<td>单元测试(for UWP)</td>
141+
<td>Qiniu.MSTest.sln</td>
142+
</tr>
140143
</tbody></table>
141144

142145

‎doc/README.pdf‎

546 Bytes
Binary file not shown.

‎examples/Examples.UWP/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
// You can specify all the values or you can default the Build and Revision Numbers
2525
// by using the '*' as shown below:
2626
// [assembly: AssemblyVersion("1.0.*")]
27-
[assembly: AssemblyVersion("7.2.12")]
28-
[assembly: AssemblyFileVersion("7.2.12")]
27+
[assembly: AssemblyVersion("7.2.13")]
28+
[assembly: AssemblyFileVersion("7.2.13")]
2929
[assembly: ComVisible(false)]

‎examples/Examples.UWP/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"dependencies": {
33
"Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
44
"newtonsoft.json": "9.0.1",
5-
"qiniu.shared": "7.2.12",
5+
"qiniu.shared": "7.2.13",
66
"System.Runtime": "4.0.20"
77
},
88
"frameworks": {

‎examples/Examples/Examples.Net40.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="Qiniu, Version=7.2.7.0, Culture=neutral, processorArchitecture=MSIL">
45-
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\..\..\csharp-sdk\bin\net40\Qiniu.dll</HintPath>
44+
<Reference Include="Qiniu, Version=7.2.12.0, Culture=neutral, PublicKeyToken=2894d75bb9f220bf, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Qiniu.Shared.7.2.12\lib\net40\Qiniu.dll</HintPath>
46+
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="System" />
4949
<Reference Include="System.Xml.Linq" />
@@ -64,6 +64,7 @@
6464
<ItemGroup>
6565
<None Include="app.config" />
6666
<None Include="..\Packages.Net40.config" />
67+
<None Include="packages.config" />
6768
</ItemGroup>
6869
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6970
<PropertyGroup>

0 commit comments

Comments
 (0)