Merge pull request #9 from couchbaselabs/update-2.2.6

update to dependencies to SDK 2.2.6 and JSON.NET 8.0.3
couchbaselabs · Mar 15, 2016 · 12ac807 · 12ac807
2 parents 2ebc321 + 0c3f261
commit 12ac807
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/Couchbase.AspNet.UnitTests/packages.config b/Couchbase.AspNet.UnitTests/packages.config
@@ -2,8 +2,8 @@
 <packages>
   <package id="Common.Logging" version="3.3.1" targetFramework="net452" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net452" />
-  <package id="CouchbaseNetClient" version="2.2.5" targetFramework="net452" />
+  <package id="CouchbaseNetClient" version="2.2.6" targetFramework="net452" />
   <package id="Moq" version="4.2.1510.2205" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
-  <package id="NUnit" version="3.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
+  <package id="NUnit" version="3.2.0" targetFramework="net452" />
 </packages>
diff --git a/Couchbase.AspNet/Couchbase.AspNet.csproj b/Couchbase.AspNet/Couchbase.AspNet.csproj
@@ -49,12 +49,12 @@
       <HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Couchbase.NetClient, Version=2.2.5.0, Culture=neutral, PublicKeyToken=05e9c6b5a9ec94c2, processorArchitecture=MSIL">
-      <HintPath>..\packages\CouchbaseNetClient.2.2.5\lib\net45\Couchbase.NetClient.dll</HintPath>
+    <Reference Include="Couchbase.NetClient, Version=2.2.6.0, Culture=neutral, PublicKeyToken=05e9c6b5a9ec94c2, processorArchitecture=MSIL">
+      <HintPath>..\packages\CouchbaseNetClient.2.2.6\lib\net45\Couchbase.NetClient.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/Couchbase.AspNet/packages.config b/Couchbase.AspNet/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Common.Logging" version="3.3.1" targetFramework="net45" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
-  <package id="CouchbaseNetClient" version="2.2.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
+  <package id="CouchbaseNetClient" version="2.2.6" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
 </packages>
diff --git a/CouchbaseAspNetSample/CouchbaseAspNetSample.csproj b/CouchbaseAspNetSample/CouchbaseAspNetSample.csproj
@@ -61,8 +61,8 @@
       <HintPath>..\packages\Common.Logging.Log4Net1213.3.3.1\lib\net40\Common.Logging.Log4Net1213.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Couchbase.NetClient, Version=2.2.5.0, Culture=neutral, PublicKeyToken=05e9c6b5a9ec94c2, processorArchitecture=MSIL">
-      <HintPath>..\packages\CouchbaseNetClient.2.2.5\lib\net45\Couchbase.NetClient.dll</HintPath>
+    <Reference Include="Couchbase.NetClient, Version=2.2.6.0, Culture=neutral, PublicKeyToken=05e9c6b5a9ec94c2, processorArchitecture=MSIL">
+      <HintPath>..\packages\CouchbaseNetClient.2.2.6\lib\net45\Couchbase.NetClient.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
@@ -74,7 +74,7 @@
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.DataSetExtensions" />

diff --git a/CouchbaseAspNetSample/Web.config b/CouchbaseAspNetSample/Web.config
@@ -19,10 +19,10 @@
   <couchbase-caching>
     <servers>
       <!-- changes in appSettings section should also be reflected here -->
-      <add uri="http://127.0.0.1:8091"></add>
+      <add uri="http://10.141.150.101:8091/"></add>
     </servers>
     <buckets>
-      <add name="default"></add>
+      <add name="memcached"></add>
     </buckets>
   </couchbase-caching>
   <common>
@@ -83,7 +83,7 @@
     </pages>
     <sessionState customProvider="Couchbase" mode="Custom">
       <providers>
-        <add name="Couchbase" type="Couchbase.AspNet.SessionState.CouchbaseSessionStateProvider, Couchbase.AspNet" bucket="default" headerPrefix="header-" dataPrefix="data-" factory="Couchbase.AspNet.CouchbaseBucketFactory" exclusiveAccess="false" />
+        <add name="Couchbase" type="Couchbase.AspNet.SessionState.CouchbaseSessionStateProvider, Couchbase.AspNet" bucket="memcached" headerPrefix="header-" dataPrefix="data-" factory="Couchbase.AspNet.CouchbaseBucketFactory" exclusiveAccess="false" />
       </providers>
     </sessionState>
     <caching>

diff --git a/CouchbaseAspNetSample/packages.config b/CouchbaseAspNetSample/packages.config
@@ -3,7 +3,7 @@
   <package id="Common.Logging" version="3.3.1" targetFramework="net45" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
   <package id="Common.Logging.Log4Net1213" version="3.3.1" targetFramework="net45" />
-  <package id="CouchbaseNetClient" version="2.2.5" targetFramework="net45" />
+  <package id="CouchbaseNetClient" version="2.2.6" targetFramework="net45" />
   <package id="EntityFramework" version="4.1.10331.0" />
   <package id="jQuery" version="1.5.1" />
   <package id="jQuery.UI.Combined" version="1.8.11" />
@@ -15,5 +15,5 @@
   <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
   <package id="Modernizr" version="1.7" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
 </packages>