Merge branch 'hotfix/0.1.1'

eouw0o83hf · Mar 9, 2014 · 4eea6c7 · 4eea6c7
2 parents 67800cf + bf93201
commit 4eea6c7
Show file tree

Hide file tree

Showing 43 changed files with 22 additions and 52,728 deletions.
diff --git a/Avalanche/App.config b/Avalanche/App.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
@@ -12,14 +12,6 @@
       <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
     </providers>
   </entityFramework>
-  <system.data>
-    <DbProviderFactories>
-      <remove invariant="System.Data.SQLite" />
-      <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
-      <remove invariant="System.Data.SQLite.EF6" />
-      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".Net Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
-    </DbProviderFactories>
-  </system.data>
   <log4net>
     <appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender">
       <mapping>
@@ -48,7 +40,7 @@
       </layout>
     </appender>
     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
+      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
       <file value="logs\" />
       <datePattern value="yyyy-MM-dd'.log'" />
       <staticLogFileName value="false" />
@@ -66,4 +58,12 @@
       <appender-ref ref="RollingLogFileAppender" />
     </root>
   </log4net>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="System.Data.SQLite" />
+      <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
+      <remove invariant="System.Data.SQLite.EF6" />
+      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".Net Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
+    </DbProviderFactories>
+  </system.data>
 </configuration>
diff --git a/Avalanche/Avalanche.csproj b/Avalanche/Avalanche.csproj
@@ -37,10 +37,12 @@
     <Reference Include="AWSSDK">
       <HintPath>packages\AWSSDK.2.0.9.0\lib\net45\AWSSDK.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework">
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>packages\EntityFramework.6.0.2\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework.SqlServer">
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>packages\EntityFramework.6.0.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="log4net">
@@ -57,13 +59,15 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SQLite, Version=1.0.91.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>packages\System.Data.SQLite.1.0.91.3\lib\net45\System.Data.SQLite.dll</HintPath>
+      <HintPath>packages\System.Data.SQLite.x64.1.0.91.3\lib\net45\System.Data.SQLite.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SQLite.EF6">
-      <HintPath>packages\System.Data.SQLite.1.0.91.3\lib\net45\System.Data.SQLite.EF6.dll</HintPath>
+    <Reference Include="System.Data.SQLite.EF6, Version=1.0.91.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>packages\System.Data.SQLite.x64.1.0.91.3\lib\net45\System.Data.SQLite.EF6.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SQLite.Linq">
-      <HintPath>packages\System.Data.SQLite.1.0.91.3\lib\net45\System.Data.SQLite.Linq.dll</HintPath>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.91.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>packages\System.Data.SQLite.x64.1.0.91.3\lib\net45\System.Data.SQLite.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web" />
@@ -92,14 +96,6 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="x64\SQLite.Interop.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\SQLite.Interop.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Avalanche/packages.config b/Avalanche/packages.config
@@ -6,5 +6,5 @@
   <package id="Mono.Options" version="1.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net45" />
   <package id="SevenZipSharp" version="0.64" targetFramework="net45" />
-  <package id="System.Data.SQLite" version="1.0.91.3" targetFramework="net45" />
+  <package id="System.Data.SQLite.x64" version="1.0.91.3" targetFramework="net45" />
 </packages>
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/System.Data.SQLite.1.0.91.3.nupkg b/Avalanche/packages/System.Data.SQLite.1.0.91.3/System.Data.SQLite.1.0.91.3.nupkg
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/System.Data.SQLite.1.0.91.3.nuspec b/Avalanche/packages/System.Data.SQLite.1.0.91.3/System.Data.SQLite.1.0.91.3.nuspec
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net20/app.config.transform b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net20/app.config.transform
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net20/web.config.transform b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net20/web.config.transform
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net20/x64/SQLite.Interop.dll b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net20/x64/SQLite.Interop.dll
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net20/x86/SQLite.Interop.dll b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net20/x86/SQLite.Interop.dll
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net40/app.config.transform b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net40/app.config.transform
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net40/web.config.transform b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net40/web.config.transform
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net40/x64/SQLite.Interop.dll b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net40/x64/SQLite.Interop.dll
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net40/x86/SQLite.Interop.dll b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net40/x86/SQLite.Interop.dll
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net45/app.config.transform b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net45/app.config.transform
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net45/web.config.transform b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net45/web.config.transform
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net45/x64/SQLite.Interop.dll b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net45/x64/SQLite.Interop.dll
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net45/x86/SQLite.Interop.dll b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net45/x86/SQLite.Interop.dll
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net451/app.config.transform b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net451/app.config.transform
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net451/web.config.transform b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net451/web.config.transform
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net451/x64/SQLite.Interop.dll b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net451/x64/SQLite.Interop.dll
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net451/x86/SQLite.Interop.dll b/Avalanche/packages/System.Data.SQLite.1.0.91.3/content/net451/x86/SQLite.Interop.dll
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/lib/net20/System.Data.SQLite.Linq.dll b/Avalanche/packages/System.Data.SQLite.1.0.91.3/lib/net20/System.Data.SQLite.Linq.dll
diff --git a/Avalanche/packages/System.Data.SQLite.1.0.91.3/lib/net20/System.Data.SQLite.dll b/Avalanche/packages/System.Data.SQLite.1.0.91.3/lib/net20/System.Data.SQLite.dll