Re-added csredis submodule.

bonesoul · Sep 2, 2014 · 6ea52ed · 6ea52ed
1 parent 79a5a31
commit 6ea52ed
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,4 +3,7 @@
 	url = https://github.com/CoiniumServ/Gibbed.IO.git
 [submodule "deps/jsonconfig"]
 	path = deps/jsonconfig
-	url = https://github.com/CoiniumServ/JsonConfig.git
+	url = https://github.com/CoiniumServ/JsonConfig.git
+[submodule "deps/csredis"]
+	path = deps/csredis
+	url = https://github.com/CoiniumServ/csredis.git
diff --git a/deps/csredis b/deps/csredis
diff --git a/src/CoiniumServ/packages.config b/src/CoiniumServ/packages.config
@@ -3,7 +3,6 @@
   <package id="AustinHarris.JsonRpc" version="1.0.4.18" targetFramework="net45" />
   <package id="BouncyCastle" version="1.7.0" targetFramework="net45" />
   <package id="CryptSharpOfficial" version="2.0.0.0" targetFramework="net45" />
-  <package id="csredis" version="3.2.1" targetFramework="net45" />
   <package id="Dapper" version="1.34" targetFramework="net45" />
   <package id="FluentMigrator" version="1.3.0.0" targetFramework="net45" />
   <package id="FluentMigrator.Runner" version="1.3.0.0" targetFramework="net45" />

diff --git a/src/CoiniumServGui/app.config b/src/CoiniumServGui/app.config
@@ -3,4 +3,12 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>