Skip to content

Commit 9b392b4

Browse files
fengyhackfengyhack
authored
Merge pull request #127 from fengyhack/master
travis-ci
2 parents fda61bb + 5dffb2a commit 9b392b4

File tree

5 files changed

+173
-2
lines changed

5 files changed

+173
-2
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
language: csharp
2+
solution: Qiniu.Net40.Travis.sln

‎Qiniu.Net40.Travis.sln‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qiniu.Net40", "src\Qiniu\Qiniu.Net40.Travis.csproj", "{2F5B0328-DE8B-4B53-A500-3077E340A51B}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{2F5B0328-DE8B-4B53-A500-3077E340A51B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{2F5B0328-DE8B-4B53-A500-3077E340A51B}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{2F5B0328-DE8B-4B53-A500-3077E340A51B}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{2F5B0328-DE8B-4B53-A500-3077E340A51B}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
EndGlobal

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
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+
35
##关于
46

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

‎src/Qiniu/Qiniu.Net40.Travis.csproj‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{2F5B0328-DE8B-4B53-A500-3077E340A51B}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Qiniu</RootNamespace>
11+
<AssemblyName>Qiniu</AssemblyName>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<BaseIntermediateOutputPath>..\..\bin\net40\obj</BaseIntermediateOutputPath>
21+
<OutputPath>..\..\bin\net40\</OutputPath>
22+
<DefineConstants>DEBUG;TRACE;Net40</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
26+
<DocumentationFile>..\..\bin\net40\Qiniu.xml</DocumentationFile>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<DebugType>pdbonly</DebugType>
30+
<Optimize>true</Optimize>
31+
<BaseIntermediateOutputPath>..\..\bin\net40\obj</BaseIntermediateOutputPath>
32+
<OutputPath>..\..\bin\net40\</OutputPath>
33+
<DefineConstants>TRACE;Net40</DefineConstants>
34+
<ErrorReport>prompt</ErrorReport>
35+
<WarningLevel>4</WarningLevel>
36+
<Prefer32Bit>false</Prefer32Bit>
37+
<DocumentationFile>..\..\bin\net40\Qiniu.xml</DocumentationFile>
38+
</PropertyGroup>
39+
<PropertyGroup>
40+
<SignAssembly>true</SignAssembly>
41+
</PropertyGroup>
42+
<PropertyGroup>
43+
<AssemblyOriginatorKeyFile>
44+
</AssemblyOriginatorKeyFile>
45+
</PropertyGroup>
46+
<ItemGroup>
47+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
49+
<Private>True</Private>
50+
</Reference>
51+
<Reference Include="System" />
52+
<Reference Include="System.Core" />
53+
<!--
54+
<Reference Include="System.Net.Http">
55+
<HintPath>..\packages\System.Net.Http.dll</HintPath>
56+
</Reference>
57+
-->
58+
<Reference Include="System.Xml.Linq" />
59+
<Reference Include="System.Data.DataSetExtensions" />
60+
<Reference Include="System.Data" />
61+
<Reference Include="System.Xml" />
62+
</ItemGroup>
63+
<ItemGroup>
64+
<Compile Include="IO\SimpleUploader.cs" />
65+
<Compile Include="QiniuCSharpSDK.cs" />
66+
<Compile Include="Properties\AssemblyInfo.cs" />
67+
<Compile Include="Common\Config.cs" />
68+
<Compile Include="Common\Zone.cs" />
69+
<Compile Include="Common\ZoneHelper.cs" />
70+
<Compile Include="Common\ZoneInfo.cs" />
71+
<Compile Include="CDN\Model\RefreshRequest.cs" />
72+
<Compile Include="CDN\Model\RefreshInfo.cs" />
73+
<Compile Include="CDN\Model\RefreshResult.cs" />
74+
<Compile Include="CDN\Model\PrefetchRequest.cs" />
75+
<Compile Include="CDN\Model\PrefetchInfo.cs" />
76+
<Compile Include="CDN\Model\PrefetchResult.cs" />
77+
<Compile Include="CDN\Model\BandwidthRequest.cs" />
78+
<Compile Include="CDN\Model\BandwidthInfo.cs" />
79+
<Compile Include="CDN\Model\BandwidthResult.cs" />
80+
<Compile Include="CDN\Model\FluxRequest.cs" />
81+
<Compile Include="CDN\Model\FluxInfo.cs" />
82+
<Compile Include="CDN\Model\FluxResult.cs" />
83+
<Compile Include="CDN\Model\LogListRequest.cs" />
84+
<Compile Include="CDN\Model\LogListInfo.cs" />
85+
<Compile Include="CDN\Model\LogListResult.cs" />
86+
<Compile Include="CDN\Model\HotLinkRequest.cs" />
87+
<Compile Include="CDN\CdnManager.cs" />
88+
<Compile Include="Util\Auth.cs" />
89+
<Compile Include="Util\Mac.cs" />
90+
<Compile Include="Util\Signature.cs" />
91+
<Compile Include="Util\UrlHelper.cs" />
92+
<Compile Include="Util\Base64.cs" />
93+
<Compile Include="Util\CRC32.cs" />
94+
<Compile Include="Util\ETag.cs" />
95+
<Compile Include="Util\Hashing.cs" />
96+
<Compile Include="Util\StringHelper.cs" />
97+
<Compile Include="Util\UserEnv.cs" />
98+
<Compile Include="Http\HttpCode.cs" />
99+
<Compile Include="Http\ContentType.cs" />
100+
<Compile Include="Http\HttpResult.cs" />
101+
<Compile Include="Http\HttpManager.cs" />
102+
<Compile Include="IO\Model\ChunkUnit.cs" />
103+
<Compile Include="IO\Model\PutPolicy.cs" />
104+
<Compile Include="IO\Model\ResumeContext.cs" />
105+
<Compile Include="IO\Model\ResumeHelper.cs" />
106+
<Compile Include="IO\Model\ResumeInfo.cs" />
107+
<Compile Include="IO\Model\UploadController.cs" />
108+
<Compile Include="IO\Model\UploadProgressHandler.cs" />
109+
<Compile Include="IO\ResumableUploader.cs" />
110+
<Compile Include="IO\FormUploader.cs" />
111+
<Compile Include="IO\UploadManager.cs" />
112+
<Compile Include="IO\DownloadManager.cs" />
113+
<Compile Include="RS\Model\BatchResult.cs" />
114+
<Compile Include="RS\BucketManager.cs" />
115+
<Compile Include="RS\Model\BatchInfo.cs" />
116+
<Compile Include="RS\Model\BucketsResult.cs" />
117+
<Compile Include="RS\Model\DomainsResult.cs" />
118+
<Compile Include="RS\Model\FileDesc.cs" />
119+
<Compile Include="RS\Model\ListInfo.cs" />
120+
<Compile Include="RS\Model\ListResult.cs" />
121+
<Compile Include="RS\Model\StatInfo.cs" />
122+
<Compile Include="RS\Model\StatResult.cs" />
123+
<Compile Include="RS\Model\BucketInfo.cs" />
124+
<Compile Include="RS\Model\BucketResult.cs" />
125+
<Compile Include="RSF\Model\PfopResult.cs" />
126+
<Compile Include="RSF\OperationManager.cs" />
127+
</ItemGroup>
128+
<ItemGroup>
129+
<None Include="..\Packages.Net40.config" />
130+
</ItemGroup>
131+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
132+
<!--
133+
<PropertyGroup>
134+
<PostBuildEvent>
135+
del /q /s Qiniu.pdb
136+
rd /q /s .\obj\
137+
</PostBuildEvent>
138+
</PropertyGroup>
139+
-->
140+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
141+
Other similar extension points exist, see Microsoft.Common.targets.
142+
<Target Name="BeforeBuild">
143+
</Target>
144+
<Target Name="AfterBuild">
145+
</Target>
146+
-->
147+
</Project>

‎src/Qiniu/RSF/OperationManager.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,6 @@ public HttpResult dfopData(string fop, string localFile)
272272
try
273273
{
274274
string dfopUrl = string.Format("{0}/dfop?fop={1}", Config.DFOP_API_HOST, fop);
275-
string key = Path.GetFileName(localFile);
276-
byte[] data = File.ReadAllBytes(localFile);
277275
string token = auth.createManageToken(dfopUrl);
278276
string boundary = HttpManager.createFormDataBoundary();
279277
string sep = "--" + boundary;

0 commit comments

Comments
 (0)