Skip to content

Commit bea3132

Browse files
authored
Merge pull request #160 from fengyhack/master
v7.2.15 修复“生成时间戳防盗链”错误,弱化Json.NET依赖
2 parents 0cee38b + 8965405 commit bea3132

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+555
-15696
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
**2017-03-08**
2+
3+
最新版本v7.2.15,适用于.NET Framework 2.0+ , .NET Core 和 UWP
4+
5+
修复:时间戳防盗链(位于`Qiniu.CDN.Model`)函数中的一个已知问题
6+
7+
优化:JSON序列化/反序列化,弱化Json.NET依赖,可由用户自行定义
8+
9+
* * *
10+
111
**2017-03-02**
212

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

README.en-US.md

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

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

15-
* [SDK-reference HTML Online](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.14/index.html)
15+
* [SDK-reference HTML Online](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.15/index.html)
1616

17-
* [SDK-reference CHM Offline](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.14.chm)
17+
* [SDK-reference CHM Offline](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.15.chm)
1818

1919
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:
2020

2121
* [qiniu/csharp-sdk/examples](https://github.com/qiniu/csharp-sdk/tree/master/examples)
2222

23-
* [SDK manual | examples](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.14/index.html)
23+
* [SDK manual | examples](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.15/index.html)
2424

2525

2626
##How-to-install

README.md

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

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

15-
* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.14/index.html)
15+
* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.15/index.html)
1616

17-
* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.14.chm)
17+
* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.15.chm)
1818

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

2121
* [qiniu/csharp-sdk/examples](https://github.com/qiniu/csharp-sdk/tree/master/examples)
2222

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

2525
##如何安装
2626

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

-312 KB
Binary file not shown.

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

313 KB
Binary file not shown.

doc/README.html

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
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>
2+
<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>
23
.note-content {font-family: 'Helvetica Neue', Arial, 'Hiragino Sans GB', STHeiti, 'Microsoft YaHei', 'WenQuanYi Micro Hei', SimSun, Song, sans-serif;}
34

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

67

78

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

1211
<div><div class="toc"><div class="toc">
1312
<ul>
13+
<li><ul>
1414
<li><a href="#关于">关于</a></li>
1515
<li><a href="#sdk文档">SDK文档</a></li>
1616
<li><a href="#如何安装">如何安装</a></li>
@@ -19,7 +19,18 @@ <h1 id="qiniu-cloud-c-sdk">Qiniu (Cloud) C# SDK</h1>
1919
<li><a href="#相关资源">相关资源</a></li>
2020
<li><a href="#贡献代码">贡献代码</a></li>
2121
<li><a href="#许可证">许可证</a></li>
22-
<li><a href="#附录">附录(速览.NET Core、UWP)</a></li>
22+
<li><a href="#附录">附录</a><ul>
23+
<li><a href="#速览net-core">速览.NET Core</a><ul>
24+
<li><a href="#1-创建">1. 创建</a></li>
25+
<li><a href="#2-发布">2. 发布</a></li>
26+
<li><a href="#3-执行">3. 执行</a></li>
27+
</ul>
28+
</li>
29+
<li><a href="#速览win10-uwp">速览Win10 UWP</a></li>
30+
</ul>
31+
</li>
32+
</ul>
33+
</li>
2334
</ul>
2435
</div>
2536
</div>
@@ -35,14 +46,14 @@ <h2 id="sdk文档">SDK文档</h2>
3546

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

38-
<ul><li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.14/index.html" target="_blank">HTML在线浏览</a></p></li>
39-
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.14.chm" target="_blank">CHM文件下载</a></p></li>
49+
<ul><li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.15/index.html" target="_blank">HTML在线浏览</a></p></li>
50+
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.15.chm" target="_blank">CHM文件下载</a></p></li>
4051
</ul>
4152

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

4455
<ul><li><p><a href="https://github.com/qiniu/csharp-sdk/tree/master/examples" target="_blank">qiniu/csharp-sdk/examples</a></p></li>
45-
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.14/index.html" target="_blank">C# SDK使用指南 | 代码示例</a></p></li>
56+
<li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.15/index.html" target="_blank">C# SDK使用指南 | 代码示例</a></p></li>
4657
</ul>
4758

4859

@@ -63,11 +74,11 @@ <h2 id="如何安装">如何安装</h2>
6374

6475
<p><strong>2. 包管理器(NuGet)安装</strong> </p>
6576

66-
<p>或者从NuGet来安装,以Visual Studio 2013/2015为例,打开NuGet程序包管理器搜索<code>Qiniu</code>或者在控制台中键入以下命令:</p>
77+
<p>或者从NuGet来安装,以Visual Studio 2013/2015为例,打开NuGet程序包管理器搜索<code>Qiniu.Shared</code>或者在控制台中键入以下命令:</p>
6778

6879

6980

70-
<pre class="prettyprint hljs-light"><code class="hljs sql"><span class="hljs-operator"><span class="hljs-keyword">Install</span>-<span class="hljs-keyword">Package</span> Qiniu</span><br></code></pre>
81+
<pre class="prettyprint hljs-light"><code class="hljs sql"><span class="hljs-operator"><span class="hljs-keyword">Install</span>-<span class="hljs-keyword">Package</span> Qiniu.<span class="hljs-keyword">Shared</span></span><br></code></pre>
7182

7283
<p><strong>3. 从源码编译</strong></p>
7384

@@ -263,4 +274,6 @@ <h3 id="速览win10-uwp">速览Win10 UWP</h3>
263274

264275
<p>同样的,UWP解决方案中也包含一个project.json文件,以下是一个简单的示例:</p>
265276

277+
278+
266279
<pre class="prettyprint hljs-light"><code class="language-json hljs">{<br> "<span class="hljs-attribute">dependencies</span>": <span class="hljs-value">{<br> "<span class="hljs-attribute">Microsoft.NETCore.UniversalWindowsPlatform</span>": <span class="hljs-value"><span class="hljs-string">"5.1.0"</span><br> </span>}</span>,<br> "<span class="hljs-attribute">frameworks</span>": <span class="hljs-value">{<br> "<span class="hljs-attribute">uap10.0</span>": <span class="hljs-value">{}<br> </span>}</span>,<br> "<span class="hljs-attribute">runtimes</span>": <span class="hljs-value">{<br> "<span class="hljs-attribute">win10-arm</span>": <span class="hljs-value">{}</span>,<br> "<span class="hljs-attribute">win10-arm-aot</span>": <span class="hljs-value">{}</span>,<br> "<span class="hljs-attribute">win10-x86</span>": <span class="hljs-value">{}</span>,<br> "<span class="hljs-attribute">win10-x86-aot</span>": <span class="hljs-value">{}</span>,<br> "<span class="hljs-attribute">win10-x64</span>": <span class="hljs-value">{}</span>,<br> "<span class="hljs-attribute">win10-x64-aot</span>": <span class="hljs-value">{}<br> </span>}<br></span>}<br></code></pre></div></body></html>

doc/README.pdf

16 KB
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.13")]
28-
[assembly: AssemblyFileVersion("7.2.13")]
27+
[assembly: AssemblyVersion("7.2.15")]
28+
[assembly: AssemblyFileVersion("7.2.15")]
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": "7.2.14",
5+
"Qiniu.Shared": "7.2.15",
66
"System.Runtime": "4.0.20"
77
},
88
"frameworks": {

0 commit comments

Comments
 (0)