Permalink
Browse files

Update solution to depend on Couchbase Client 1.2.7.

After the recent update to the Couchbase Client which merges in
a forked Enyim.Caching, the Couchbase.AspNet had dangling
references to an incompatible Enyim.Caching.  The solution is to
update the Solution to the latest.
  • Loading branch information...
1 parent aee2977 commit 5b3f876a222b19a69872a463659244e7fc1806d2 @ingenthr ingenthr committed Aug 27, 2013
Showing with 4,595 additions and 5,765 deletions.
  1. +6 −8 Couchbase.AspNet/Couchbase.AspNet.csproj
  2. BIN Couchbase.AspNet/Couchbase.snk
  3. +5 −5 Couchbase.AspNet/Properties/AssemblyInfo.cs
  4. +1 −2 Couchbase.AspNet/packages.config
  5. BIN packages/CouchbaseNetClient.1.2.4/CouchbaseNetClient.1.2.4.nupkg
  6. BIN packages/CouchbaseNetClient.1.2.4/lib/net40/Couchbase.dll
  7. BIN packages/CouchbaseNetClient.1.2.4/lib/net40/Enyim.Caching.Log4NetAdapter.dll
  8. BIN packages/CouchbaseNetClient.1.2.4/lib/net40/Enyim.Caching.Log4NetAdapter.pdb
  9. BIN packages/CouchbaseNetClient.1.2.4/lib/net40/Enyim.Caching.NLogAdapter.dll
  10. BIN packages/CouchbaseNetClient.1.2.4/lib/net40/Enyim.Caching.NLogAdapter.pdb
  11. BIN packages/CouchbaseNetClient.1.2.4/lib/net40/Enyim.Caching.dll
  12. BIN packages/CouchbaseNetClient.1.2.4/lib/net40/Enyim.Caching.pdb
  13. BIN packages/CouchbaseNetClient.1.2.4/lib/net40/NLog.dll
  14. BIN packages/CouchbaseNetClient.1.2.4/lib/net40/RestSharp.dll
  15. BIN packages/CouchbaseNetClient.1.2.4/lib/net40/log4net.dll
  16. BIN packages/CouchbaseNetClient.1.2.7/CouchbaseNetClient.1.2.7.nupkg
  17. +4 −5 ...1.2.4/CouchbaseNetClient.1.2.4.nuspec → CouchbaseNetClient.1.2.7/CouchbaseNetClient.1.2.7.nuspec}
  18. BIN packages/CouchbaseNetClient.1.2.7/lib/net35/Couchbase.dll
  19. +469 −471 packages/{CouchbaseNetClient.1.2.4/lib/net40 → CouchbaseNetClient.1.2.7/lib/net35}/Couchbase.xml
  20. BIN packages/CouchbaseNetClient.1.2.7/lib/net35/Enyim.Caching.dll
  21. packages/{CouchbaseNetClient.1.2.4/lib/net40 → CouchbaseNetClient.1.2.7/lib/net35}/Enyim.Caching.xml
  22. BIN packages/CouchbaseNetClient.1.2.7/lib/net40/Couchbase.dll
  23. +1,056 −0 packages/CouchbaseNetClient.1.2.7/lib/net40/Couchbase.xml
  24. BIN packages/CouchbaseNetClient.1.2.7/lib/net40/Enyim.Caching.dll
  25. +2,058 −0 packages/CouchbaseNetClient.1.2.7/lib/net40/Enyim.Caching.xml
  26. BIN packages/Hammock.1.2.9/Hammock.1.2.9.nupkg
  27. +0 −16 packages/Hammock.1.2.9/Hammock.1.2.9.nuspec
  28. +0 −23 packages/Hammock.1.2.9/LICENSE
  29. BIN packages/Hammock.1.2.9/lib/2.0/Hammock.dll
  30. BIN packages/Hammock.1.2.9/lib/2.0/Hammock.pdb
  31. BIN packages/Hammock.1.2.9/lib/2.0/LinqBridge.dll
  32. BIN packages/Hammock.1.2.9/lib/3.5/Hammock.ClientProfile.dll
  33. BIN packages/Hammock.1.2.9/lib/3.5/Hammock.ClientProfile.pdb
  34. BIN packages/Hammock.1.2.9/lib/3.5/Hammock.dll
  35. BIN packages/Hammock.1.2.9/lib/3.5/Hammock.pdb
  36. BIN packages/Hammock.1.2.9/lib/4.0/Hammock.ClientProfile.dll
  37. BIN packages/Hammock.1.2.9/lib/4.0/Hammock.ClientProfile.pdb
  38. BIN packages/Hammock.1.2.9/lib/4.0/Hammock.dll
  39. BIN packages/Hammock.1.2.9/lib/4.0/Hammock.pdb
  40. BIN packages/Hammock.1.2.9/lib/SL3/Hammock.Silverlight.dll
  41. BIN packages/Hammock.1.2.9/lib/SL3/Hammock.Silverlight.pdb
  42. BIN packages/Hammock.1.2.9/lib/SL3/ICSharpCode.SharpZipLib.Silverlight.dll
  43. BIN packages/Hammock.1.2.9/lib/SL3/ICSharpCode.SharpZipLib.Silverlight.pdb
  44. BIN packages/Hammock.1.2.9/lib/SL3/System.Runtime.Serialization.Json.dll
  45. +0 −65 packages/Hammock.1.2.9/lib/SL3/System.Runtime.Serialization.Json.xml
  46. BIN packages/Hammock.1.2.9/lib/SL3/System.Xml.Linq.dll
  47. +0 −1,632 packages/Hammock.1.2.9/lib/SL3/System.Xml.Linq.xml
  48. BIN packages/Hammock.1.2.9/lib/SL3/de/System.Runtime.Serialization.Json.resources.dll
  49. BIN packages/Hammock.1.2.9/lib/SL3/de/System.Xml.Linq.resources.dll
  50. BIN packages/Hammock.1.2.9/lib/SL3/es/System.Runtime.Serialization.Json.resources.dll
  51. BIN packages/Hammock.1.2.9/lib/SL3/es/System.Xml.Linq.resources.dll
  52. BIN packages/Hammock.1.2.9/lib/SL3/fr/System.Runtime.Serialization.Json.resources.dll
  53. BIN packages/Hammock.1.2.9/lib/SL3/fr/System.Xml.Linq.resources.dll
  54. BIN packages/Hammock.1.2.9/lib/SL3/it/System.Runtime.Serialization.Json.resources.dll
  55. BIN packages/Hammock.1.2.9/lib/SL3/it/System.Xml.Linq.resources.dll
  56. BIN packages/Hammock.1.2.9/lib/SL3/ja/System.Runtime.Serialization.Json.resources.dll
  57. BIN packages/Hammock.1.2.9/lib/SL3/ja/System.Xml.Linq.resources.dll
  58. BIN packages/Hammock.1.2.9/lib/SL3/ko/System.Runtime.Serialization.Json.resources.dll
  59. BIN packages/Hammock.1.2.9/lib/SL3/ko/System.Xml.Linq.resources.dll
  60. BIN packages/Hammock.1.2.9/lib/SL3/zh-Hans/System.Runtime.Serialization.Json.resources.dll
  61. BIN packages/Hammock.1.2.9/lib/SL3/zh-Hans/System.Xml.Linq.resources.dll
  62. BIN packages/Hammock.1.2.9/lib/SL3/zh-Hant/System.Runtime.Serialization.Json.resources.dll
  63. BIN packages/Hammock.1.2.9/lib/SL3/zh-Hant/System.Xml.Linq.resources.dll
  64. BIN packages/Hammock.1.2.9/lib/SL4/Hammock.Silverlight.dll
  65. BIN packages/Hammock.1.2.9/lib/SL4/Hammock.Silverlight.pdb
  66. BIN packages/Hammock.1.2.9/lib/SL4/ICSharpCode.SharpZipLib.Silverlight.dll
  67. BIN packages/Hammock.1.2.9/lib/SL4/ICSharpCode.SharpZipLib.Silverlight.pdb
  68. BIN packages/Hammock.1.2.9/lib/SL4/Microsoft.CSharp.dll
  69. +0 −190 packages/Hammock.1.2.9/lib/SL4/Microsoft.CSharp.xml
  70. BIN packages/Hammock.1.2.9/lib/SL4/System.Json.dll
  71. +0 −632 packages/Hammock.1.2.9/lib/SL4/System.Json.xml
  72. BIN packages/Hammock.1.2.9/lib/SL4/System.Runtime.Serialization.Json.dll
  73. +0 −65 packages/Hammock.1.2.9/lib/SL4/System.Runtime.Serialization.Json.xml
  74. BIN packages/Hammock.1.2.9/lib/SL4/System.Xml.Linq.dll
  75. +0 −1,655 packages/Hammock.1.2.9/lib/SL4/System.Xml.Linq.xml
  76. BIN packages/Hammock.1.2.9/lib/SL4/de/Microsoft.CSharp.resources.dll
  77. BIN packages/Hammock.1.2.9/lib/SL4/de/System.Json.resources.dll
  78. BIN packages/Hammock.1.2.9/lib/SL4/de/System.Runtime.Serialization.Json.resources.dll
  79. BIN packages/Hammock.1.2.9/lib/SL4/de/System.Xml.Linq.resources.dll
  80. BIN packages/Hammock.1.2.9/lib/SL4/es/Microsoft.CSharp.resources.dll
  81. BIN packages/Hammock.1.2.9/lib/SL4/es/System.Json.resources.dll
  82. BIN packages/Hammock.1.2.9/lib/SL4/es/System.Runtime.Serialization.Json.resources.dll
  83. BIN packages/Hammock.1.2.9/lib/SL4/es/System.Xml.Linq.resources.dll
  84. BIN packages/Hammock.1.2.9/lib/SL4/fr/Microsoft.CSharp.resources.dll
  85. BIN packages/Hammock.1.2.9/lib/SL4/fr/System.Json.resources.dll
  86. BIN packages/Hammock.1.2.9/lib/SL4/fr/System.Runtime.Serialization.Json.resources.dll
  87. BIN packages/Hammock.1.2.9/lib/SL4/fr/System.Xml.Linq.resources.dll
  88. BIN packages/Hammock.1.2.9/lib/SL4/it/Microsoft.CSharp.resources.dll
  89. BIN packages/Hammock.1.2.9/lib/SL4/it/System.Json.resources.dll
  90. BIN packages/Hammock.1.2.9/lib/SL4/it/System.Runtime.Serialization.Json.resources.dll
  91. BIN packages/Hammock.1.2.9/lib/SL4/it/System.Xml.Linq.resources.dll
  92. BIN packages/Hammock.1.2.9/lib/SL4/ja/Microsoft.CSharp.resources.dll
  93. BIN packages/Hammock.1.2.9/lib/SL4/ja/System.Json.resources.dll
  94. BIN packages/Hammock.1.2.9/lib/SL4/ja/System.Runtime.Serialization.Json.resources.dll
  95. BIN packages/Hammock.1.2.9/lib/SL4/ja/System.Xml.Linq.resources.dll
  96. BIN packages/Hammock.1.2.9/lib/SL4/ko/Microsoft.CSharp.resources.dll
  97. BIN packages/Hammock.1.2.9/lib/SL4/ko/System.Json.resources.dll
  98. BIN packages/Hammock.1.2.9/lib/SL4/ko/System.Runtime.Serialization.Json.resources.dll
  99. BIN packages/Hammock.1.2.9/lib/SL4/ko/System.Xml.Linq.resources.dll
  100. BIN packages/Hammock.1.2.9/lib/SL4/ru/Microsoft.CSharp.resources.dll
  101. BIN packages/Hammock.1.2.9/lib/SL4/ru/System.Json.resources.dll
  102. BIN packages/Hammock.1.2.9/lib/SL4/ru/System.Runtime.Serialization.Json.resources.dll
  103. BIN packages/Hammock.1.2.9/lib/SL4/ru/System.Xml.Linq.resources.dll
  104. BIN packages/Hammock.1.2.9/lib/SL4/zh-Hans/Microsoft.CSharp.resources.dll
  105. BIN packages/Hammock.1.2.9/lib/SL4/zh-Hans/System.Json.resources.dll
  106. BIN packages/Hammock.1.2.9/lib/SL4/zh-Hans/System.Runtime.Serialization.Json.resources.dll
  107. BIN packages/Hammock.1.2.9/lib/SL4/zh-Hans/System.Xml.Linq.resources.dll
  108. BIN packages/Hammock.1.2.9/lib/SL4/zh-Hant/Microsoft.CSharp.resources.dll
  109. BIN packages/Hammock.1.2.9/lib/SL4/zh-Hant/System.Json.resources.dll
  110. BIN packages/Hammock.1.2.9/lib/SL4/zh-Hant/System.Runtime.Serialization.Json.resources.dll
  111. BIN packages/Hammock.1.2.9/lib/SL4/zh-Hant/System.Xml.Linq.resources.dll
  112. BIN packages/Hammock.1.2.9/lib/WP7/Hammock.WindowsPhone.dll
  113. BIN packages/Hammock.1.2.9/lib/WP7/Hammock.WindowsPhone.pdb
  114. BIN packages/Hammock.1.2.9/lib/WP7/ICSharpCode.SharpZipLib.WindowsPhone.dll
  115. BIN packages/Hammock.1.2.9/lib/WP7/ICSharpCode.SharpZipLib.WindowsPhone.pdb
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -37,13 +37,11 @@
<AssemblyOriginatorKeyFile>Couchbase.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Couchbase, Version=1.1.4635.18746, Culture=neutral, PublicKeyToken=269b55efb37646d0, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\CouchbaseNetClient.1.1.6\lib\net35\Couchbase.dll</HintPath>
+ <Reference Include="Couchbase, Version=1.2.7.0, Culture=neutral, PublicKeyToken=05e9c6b5a9ec94c2, processorArchitecture=MSIL">
+ <HintPath>..\packages\CouchbaseNetClient.1.2.7\lib\net40\Couchbase.dll</HintPath>
</Reference>
- <Reference Include="Enyim.Caching, Version=1.0.0.0, Culture=neutral, PublicKeyToken=269b55efb37646d0, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\CouchbaseNetClient.1.1.6\lib\net35\Enyim.Caching.dll</HintPath>
+ <Reference Include="Enyim.Caching, Version=1.2.7.0, Culture=neutral, PublicKeyToken=05e9c6b5a9ec94c2, processorArchitecture=MSIL">
+ <HintPath>..\packages\CouchbaseNetClient.1.2.7\lib\net40\Enyim.Caching.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
@@ -75,5 +73,5 @@
</Target>
<Target Name="AfterBuild">
</Target>
- -->
+ -->
</Project>
Binary file not shown.
@@ -6,11 +6,11 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("CouchbaseAspNet")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Couchbase ASP.NET SessionState and OutputCache Providers.")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Couchbase, Inc.")]
[assembly: AssemblyProduct("CouchbaseAspNet")]
-[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyCopyright("Copyright © 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="CouchbaseNetClient" version="1.2.4" targetFramework="net40" />
- <package id="Hammock" version="1.2.9" targetFramework="net40" />
+ <package id="CouchbaseNetClient" version="1.2.7" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
</packages>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -2,17 +2,16 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>CouchbaseNetClient</id>
- <version>1.2.4</version>
- <authors>Couchbase, Inc.</authors>
- <owners>Couchbase, Inc.</owners>
+ <version>1.2.7</version>
+ <authors>Couchbase, Inc.</authors>
+ <owners>Couchbase, Inc.</owners>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://github.com/couchbase/couchbase-net-client</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Couchbase client library for .NET based languages.</description>
<tags>Couchbase nosql</tags>
<dependencies>
- <dependency id="Hammock" version="1.2.9" />
- <dependency id="Newtonsoft.Json" version="4.5.1" />
+ <dependency id="Newtonsoft.Json" version="4.5.11" />
</dependencies>
</metadata>
</package>
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 5b3f876

Please sign in to comment.