Skip to content

Commit 1570a31

Browse files
authored
Merge pull request #1 from qiniu/master
update from source
2 parents 1ae01f6 + c716430 commit 1570a31

File tree

85 files changed

+47538
-305
lines changed

Some content is hidden

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

85 files changed

+47538
-305
lines changed

Docs/imgs/BucketManager.png

30.5 KB
Loading
File renamed without changes.
File renamed without changes.
File renamed without changes.

QiniuTest/Properties/AssemblyInfo.cs renamed to Qiniu.Test/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("QiniuTest")]
9-
[assembly: AssemblyDescription("")]
8+
[assembly: AssemblyTitle("Qiniu Cloud Storage C# SDK Test")]
9+
[assembly: AssemblyDescription("Qiniu Cloud Storage C# SDK Test")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("QiniuTest")]
11+
[assembly: AssemblyCompany("QINIU")]
12+
[assembly: AssemblyProduct("Qiniu.Test")]
1313
[assembly: AssemblyCopyright("Copyright © 2016")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]

QiniuTest/QiniuTest.csproj renamed to Qiniu.Test/Qiniu.Test.csproj

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<ProjectGuid>{353CEFE0-58AF-4049-998B-336CE1212F1E}</ProjectGuid>
77
<OutputType>Library</OutputType>
88
<AppDesignerFolder>Properties</AppDesignerFolder>
9-
<RootNamespace>QiniuTest</RootNamespace>
10-
<AssemblyName>QiniuTest</AssemblyName>
11-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
9+
<RootNamespace>Qiniu.Test</RootNamespace>
10+
<AssemblyName>Qiniu.Test</AssemblyName>
11+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -21,44 +21,26 @@
2121
<DebugSymbols>true</DebugSymbols>
2222
<DebugType>full</DebugType>
2323
<Optimize>false</Optimize>
24-
<OutputPath>bin\Debug\</OutputPath>
24+
<OutputPath>..\bin\</OutputPath>
2525
<DefineConstants>DEBUG;TRACE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3030
<DebugType>pdbonly</DebugType>
3131
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
32+
<OutputPath>..\bin\</OutputPath>
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
37-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
38-
<DebugSymbols>true</DebugSymbols>
39-
<OutputPath>bin\x86\Debug\</OutputPath>
40-
<DefineConstants>DEBUG;TRACE</DefineConstants>
41-
<DebugType>full</DebugType>
42-
<PlatformTarget>x86</PlatformTarget>
43-
<ErrorReport>prompt</ErrorReport>
44-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
45-
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
47-
<OutputPath>bin\x86\Release\</OutputPath>
48-
<DefineConstants>TRACE</DefineConstants>
49-
<Optimize>true</Optimize>
50-
<DebugType>pdbonly</DebugType>
51-
<PlatformTarget>x86</PlatformTarget>
52-
<ErrorReport>prompt</ErrorReport>
53-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
54-
</PropertyGroup>
5537
<ItemGroup>
5638
<Reference Include="Newtonsoft.Json">
57-
<HintPath>..\Qiniu\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
39+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
5840
</Reference>
5941
<Reference Include="System" />
6042
<Reference Include="System.Core">
61-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
43+
<RequiredTargetFramework>4.0</RequiredTargetFramework>
6244
</Reference>
6345
<Reference Include="System.Data" />
6446
<Reference Include="System.Data.DataSetExtensions" />
@@ -88,7 +70,7 @@
8870
<Compile Include="UploadManagerTest.cs" />
8971
</ItemGroup>
9072
<ItemGroup>
91-
<ProjectReference Include="..\Qiniu\Qiniu\Qiniu.csproj">
73+
<ProjectReference Include="..\Qiniu\Qiniu.csproj">
9274
<Project>{E5A764FD-FC95-4B51-BB10-9A807ED25652}</Project>
9375
<Name>Qiniu</Name>
9476
</ProjectReference>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)