fix

Author: icattlecoder

.gitignore

@@ -4,7 +4,7 @@
 
 test-results
 Qiniu.LocalTest
-csharp-sdk.userprefs
+*.userprefs
 
 bin
 obj

Makefile

@@ -9,12 +9,12 @@ test:
 	#for Linux
 	#3.5
 	xbuild csharp-sdk.3.5.sln;
-	cp Qiniu/bin/Debug/3.5/Qiniu.dll bin
-	cp Qiniu.Test/bin/Debug/Qiniu.Test.dll bin
-	nunit-console -framework="3.5" bin/Qiniu.Test.dll
+	cp Qiniu/bin/Debug/3.5/Qiniu.dll bin/Qiniu.3.5.dll
+	cp Qiniu.Test/bin/Debug/3.5/Qiniu.Test.dll bin/Qiniu.3.5.Test.dll
+	nunit-console bin/Qiniu.3.5.Test.dll
 
 	#4.0
 	xbuild csharp-sdk.4.0.sln;
-	cp Qiniu/bin/Debug/4.0/Qiniu.dll bin
-	cp Qiniu.Test/bin/Debug/Qiniu.Test.dll bin
-	nunit-console -framework="4.0" bin/Qiniu.Test.dll
+	cp Qiniu/bin/Debug/4.0/Qiniu.dll bin/Qiniu.4.0.dll
+	cp Qiniu.Test/bin/Debug/4.0/Qiniu.Test.dll bin/Qiniu.4.0.Test.dll
+	nunit-console bin/Qiniu.4.0.Test.dll

Qiniu.Test/Qiniu.3.5.Test.csproj

@@ -9,12 +9,13 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Qiniu.Test</RootNamespace>
     <AssemblyName>Qiniu.Test</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
+    <OutputPath>bin\Debug\3.5\</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -23,7 +24,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <OutputPath>bin\Release\3.5\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>

Qiniu.Test/Qiniu.4.0.Test.csproj

@@ -14,7 +14,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
+    <OutputPath>bin\Debug\4.0\</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -23,7 +23,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <OutputPath>bin\Release\4.0\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>

Qiniu/Qiniu.3.5.csproj

@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Qiniu</RootNamespace>
-    <AssemblyName>Qiniu</AssemblyName>
+    <AssemblyName>Qiniu.3.5</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile />

Qiniu/Qiniu.4.0.csproj

@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Qiniu</RootNamespace>
-    <AssemblyName>Qiniu</AssemblyName>
+    <AssemblyName>Qiniu.4.0</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />