Changeset 2213

Timestamp:

07/30/09 13:14:55 (15 years ago)

Author:

mkommend

Message:

corrected deployment of SQLServer compact (ticket #712)

Location:

branches/HeuristicLab.Modeling Database Backend/sources

Files:

• HeuristicLab.CEDMA.Core/3.3/HeuristicLabCedmaCorePlugin.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server/3.3/HeuristicLabCedmaServerPlugin.cs (modified) (2 diffs)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/HeuristicLab.Modeling.Database.SQLServerCompact-3.2.csproj (modified) (1 diff)
• HeuristicLab.SQLServerCompact/3.2/HeuristicLab.SQLServerCompact-3.2.csproj (modified) (2 diffs)
• HeuristicLab.SQLServerCompact/3.2/HeuristicLabSQLServerCompactPlugin.cs (modified) (1 diff)
• HeuristicLab.SQLServerCompact/3.2/System.Data.SqlServerCe.Entity.dll (deleted)
• HeuristicLab.SQLServerCompact/3.2/System.Data.SqlServerCe.dll (added)
• HeuristicLab/CopyAssemblies.cmd (modified) (1 diff)
• HeuristicLab/app.config (modified) (1 diff)

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Core/3.3/HeuristicLabCedmaCorePlugin.cs

@@ -31 +31 @@
   [Dependency(Dependency = "HeuristicLab.Data-3.2")]
   [Dependency(Dependency = "HeuristicLab.DataAnalysis-3.2")]
-  [Dependency(Dependency = "HeuristicLab.CEDMA.DB.Interfaces-3.3")]
   [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
+  [Dependency(Dependency = "HeuristicLab.Modeling.Database-3.2")]
+  [Dependency(Dependency = "HeuristicLab.Modeling.Database.SQLServerCompact-3.2")]
   public class HeuristicLabCedmaCorePlugin : PluginBase {
   }

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/HeuristicLabCedmaServerPlugin.cs

@@ -28 +28 @@
   [ClassInfo(Name = "HeuristicLab.CEDMA.Server-3.3")]
   [PluginFile(Filename = "HeuristicLab.CEDMA.Server-3.3.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.CEDMA.DB.Interfaces-3.3")]
-  [Dependency(Dependency = "HeuristicLab.CEDMA.DB-3.3")]
   [Dependency(Dependency = "HeuristicLab.Grid-3.2")]
   [Dependency(Dependency = "HeuristicLab.Grid.HiveBridge-3.2")]
@@ -36 +34 @@
   [Dependency(Dependency = "HeuristicLab.DataAnalysis-3.2")]
   [Dependency(Dependency = "HeuristicLab.Modeling-3.2")]
+  [Dependency(Dependency = "HeuristicLab.Modeling.Database-3.2")]
+  [Dependency(Dependency = "HeuristicLab.Modeling.Database.SQLServerCompact-3.2")]
   [Dependency(Dependency = "HeuristicLab.Tracing-3.2")]
   public class HeuristicLabCedmaServerPlugin : PluginBase {

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/HeuristicLab.Modeling.Database.SQLServerCompact-3.2.csproj

@@ -111 +111 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.SQLServerCompact\3.2\HeuristicLab.SQLServerCompact-3.2.csproj">
+      <Project>{31DD6385-7276-49ED-9533-823D4CDF3D2A}</Project>
+      <Name>HeuristicLab.SQLServerCompact-3.2</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.SQLServerCompact/3.2/HeuristicLab.SQLServerCompact-3.2.csproj

@@ -84 +84 @@
   </ItemGroup>
   <ItemGroup>
+    <Content Include="System.Data.SqlServerCe.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="System.Data.SqlServerCe.Entity.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -112 +115 @@
     <None Include="Properties\AssemblyInfo.frame" />
   </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Service References\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.SQLServerCompact/3.2/HeuristicLabSQLServerCompactPlugin.cs

@@ -9 +9 @@
   [ClassInfo(Name = "HeuristicLab.SQLServerCompact-3.2")]
   [PluginFile(Filename = "HeuristicLab.SQLServerCompact-3.2.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "sqlceca35.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "sqlcecompact35.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "sqlceer35EN.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "sqlceme35.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "sqlceoledb35.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "sqlceqp35.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "sqlcese35.dll", Filetype = PluginFileType.Assembly)]
-  [PluginFile(Filename = "System.Data.SqlServerCe.Entity.dll", Filetype = PluginFileType.Assembly)]
+  [PluginFile(Filename = "System.Data.SqlServerCe.dll", Filetype = PluginFileType.Assembly)] 
   public class HeuristicLabSQLServerCompactPlugin : PluginBase {
   }

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab/CopyAssemblies.cmd

@@ -111 +111 @@
 copy "%SolutionDir%\HeuristicLab.SQLite\3.2\SQLite.NET.chm" .\plugins
 copy "%SolutionDir%\HeuristicLAb.SQLServerCompact\3.2\%Outdir%\HeuristicLab.SQLServerCompact-3.2.dll" .\plugins
-copy "%SolutionDir%\HeuristicLAb.SQLServerCompact\3.2\%Outdir%\System.Data.SqlServerCe.Entity.dll" .\plugins
+copy "%SolutionDir%\HeuristicLAb.SQLServerCompact\3.2\%Outdir%\System.Data.SqlServerCe.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.StatisticalAnalysis\3.2\%Outdir%\HeuristicLab.StatisticalAnalysis-3.2.dll" .\plugins
 copy "%SolutionDir%\HeuristicLab.SupportVectorMachines\3.2\%Outdir%\HeuristicLab.SupportVectorMachines-3.2.dll" .\plugins

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab/app.config

@@ -15 +15 @@
       <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" />
+           description=".Net Framework Data Provider for SQLite"           
+           type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
+      <remove invariant="System.Data.SqlServerCe.3.5" />
+      <add name="Microsoft SQL Server Compact Data Provider" invariant="System.Data.SqlServerCe.3.5" 
+           description=".NET Framework Data Provider for Microsoft SQL Server Compact" 
+           type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
     </DbProviderFactories>
   </system.data>