Skip to content

Commit 12ac807

Browse files
jeffrymorrisjeffrymorris
committed
Merge pull request couchbaselabs#9 from couchbaselabs/update-2.2.6
update to dependencies to SDK 2.2.6 and JSON.NET 8.0.3
2 parents 2ebc321 + 0c3f261 commit 12ac807

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

‎Couchbase.AspNet.UnitTests/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<packages>
33
<package id="Common.Logging" version="3.3.1" targetFramework="net452" />
44
<package id="Common.Logging.Core" version="3.3.1" targetFramework="net452" />
5-
<package id="CouchbaseNetClient" version="2.2.5" targetFramework="net452" />
5+
<package id="CouchbaseNetClient" version="2.2.6" targetFramework="net452" />
66
<package id="Moq" version="4.2.1510.2205" targetFramework="net452" />
7-
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
8-
<package id="NUnit" version="3.0.1" targetFramework="net452" />
7+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
8+
<package id="NUnit" version="3.2.0" targetFramework="net452" />
99
</packages>

‎Couchbase.AspNet/Couchbase.AspNet.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@
4949
<HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
52-
<Reference Include="Couchbase.NetClient, Version=2.2.5.0, Culture=neutral, PublicKeyToken=05e9c6b5a9ec94c2, processorArchitecture=MSIL">
53-
<HintPath>..\packages\CouchbaseNetClient.2.2.5\lib\net45\Couchbase.NetClient.dll</HintPath>
52+
<Reference Include="Couchbase.NetClient, Version=2.2.6.0, Culture=neutral, PublicKeyToken=05e9c6b5a9ec94c2, processorArchitecture=MSIL">
53+
<HintPath>..\packages\CouchbaseNetClient.2.2.6\lib\net45\Couchbase.NetClient.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
5656
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
57+
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
6060
<Reference Include="System" />

‎Couchbase.AspNet/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<packages>
33
<package id="Common.Logging" version="3.3.1" targetFramework="net45" />
44
<package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
5-
<package id="CouchbaseNetClient" version="2.2.5" targetFramework="net45" />
6-
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
5+
<package id="CouchbaseNetClient" version="2.2.6" targetFramework="net45" />
6+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
77
</packages>

‎CouchbaseAspNetSample/CouchbaseAspNetSample.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<HintPath>..\packages\Common.Logging.Log4Net1213.3.3.1\lib\net40\Common.Logging.Log4Net1213.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
64-
<Reference Include="Couchbase.NetClient, Version=2.2.5.0, Culture=neutral, PublicKeyToken=05e9c6b5a9ec94c2, processorArchitecture=MSIL">
65-
<HintPath>..\packages\CouchbaseNetClient.2.2.5\lib\net45\Couchbase.NetClient.dll</HintPath>
64+
<Reference Include="Couchbase.NetClient, Version=2.2.6.0, Culture=neutral, PublicKeyToken=05e9c6b5a9ec94c2, processorArchitecture=MSIL">
65+
<HintPath>..\packages\CouchbaseNetClient.2.2.6\lib\net45\Couchbase.NetClient.dll</HintPath>
6666
<Private>True</Private>
6767
</Reference>
6868
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
@@ -74,7 +74,7 @@
7474
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
7575
</Reference>
7676
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
77-
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
77+
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
7878
<Private>True</Private>
7979
</Reference>
8080
<Reference Include="System.Data.DataSetExtensions" />

‎CouchbaseAspNetSample/Web.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<couchbase-caching>
2020
<servers>
2121
<!-- changes in appSettings section should also be reflected here -->
22-
<add uri="http://127.0.0.1:8091"></add>
22+
<add uri="http://10.141.150.101:8091/"></add>
2323
</servers>
2424
<buckets>
25-
<add name="default"></add>
25+
<add name="memcached"></add>
2626
</buckets>
2727
</couchbase-caching>
2828
<common>
@@ -83,7 +83,7 @@
8383
</pages>
8484
<sessionState customProvider="Couchbase" mode="Custom">
8585
<providers>
86-
<add name="Couchbase" type="Couchbase.AspNet.SessionState.CouchbaseSessionStateProvider, Couchbase.AspNet" bucket="default" headerPrefix="header-" dataPrefix="data-" factory="Couchbase.AspNet.CouchbaseBucketFactory" exclusiveAccess="false" />
86+
<add name="Couchbase" type="Couchbase.AspNet.SessionState.CouchbaseSessionStateProvider, Couchbase.AspNet" bucket="memcached" headerPrefix="header-" dataPrefix="data-" factory="Couchbase.AspNet.CouchbaseBucketFactory" exclusiveAccess="false" />
8787
</providers>
8888
</sessionState>
8989
<caching>

‎CouchbaseAspNetSample/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Common.Logging" version="3.3.1" targetFramework="net45" />
44
<package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
55
<package id="Common.Logging.Log4Net1213" version="3.3.1" targetFramework="net45" />
6-
<package id="CouchbaseNetClient" version="2.2.5" targetFramework="net45" />
6+
<package id="CouchbaseNetClient" version="2.2.6" targetFramework="net45" />
77
<package id="EntityFramework" version="4.1.10331.0" />
88
<package id="jQuery" version="1.5.1" />
99
<package id="jQuery.UI.Combined" version="1.8.11" />
@@ -15,5 +15,5 @@
1515
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
1616
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
1717
<package id="Modernizr" version="1.7" />
18-
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
18+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
1919
</packages>

0 commit comments

Comments
 (0)