Merge branch 'newproj' into next

ra0o0f · Jan 6, 2018 · 46ff92c · 46ff92c
2 parents 57d2cdb + d6c07a1
commit 46ff92c
Show file tree

Hide file tree

Showing 78 changed files with 1,983 additions and 2,339 deletions.
diff --git a/src/ArangoDB.Client.Dotnet.sln b/src/ArangoDB.Client.Dotnet.sln
diff --git a/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.Net45.csproj b/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.Net45.csproj
diff --git a/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.Net45.project.json b/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.Net45.project.json
diff --git a/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.Portable.csproj b/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.Portable.csproj
diff --git a/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.Portable.project.json b/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.Portable.project.json
diff --git a/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.csproj b/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.0;net46;netcoreapp1.1</TargetFrameworks>
+    <NoWarn>1701;1702;1705,1591,1573,1572,1570,1711</NoWarn>
+    <!--<IsPackable>false</IsPackable>-->
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Moq" Version="4.8.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170427-09" />
+    <ProjectReference Include="..\ArangoDB.Client\ArangoDB.Client.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'=='net46'">
+  </ItemGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='net46'">
+    <DefineConstants>NET46</DefineConstants>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.xproj b/src/ArangoDB.Client.Examples/ArangoDB.Client.Examples.xproj
diff --git a/src/ArangoDB.Client.Examples/DatabaseSetup.cs b/src/ArangoDB.Client.Examples/DatabaseSetup.cs
@@ -20,8 +20,10 @@ static NetworkCredential GetCredential()
 
         static Lazy<DatabaseSharedSetting> SharedSetting = new Lazy<DatabaseSharedSetting>(() =>
         {
+#if NET46
             // Uncomment if you want your requests goes through proxy
-            //ArangoDatabase.ClientSetting.Proxy = new System.Net.WebProxy("http://localhost:8888");
+            ArangoDatabase.ClientSetting.Proxy = new System.Net.WebProxy("http://localhost:19777");
+#endif
 
             var sharedSetting = new DatabaseSharedSetting();
             sharedSetting.Database = "ExampleDB";