Changeset 2692

Timestamp:

01/27/10 17:34:07 (14 years ago)

Author:

gkronber

Message:

Fixed #855 (Configuration for SQL Compact DbProviderFactory should be merged from a local app.config for the SqlServerCompact assembly)

Location:

trunk

Files:

• sources/ConfigMerger.exe (modified) (previous)
• sources/HeuristicLab.ExtLibs/HeuristicLab.SQLServerCompact/3.5.1.0/HeuristicLab.SQLServerCompact-3.5.1.0.csproj (modified) (1 diff)
• sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/HeuristicLabModelingDatabaseSQLServerCompactPlugin.cs (modified) (1 diff)
• sources/HeuristicLab/MergeConfigs.cmd (modified) (1 diff)
• sources/HeuristicLab/app.config (modified) (1 diff)
• tools/ConfigMerger/ConfigMerger.cs (modified) (1 diff)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SQLServerCompact/3.5.1.0/HeuristicLab.SQLServerCompact-3.5.1.0.csproj

@@ -115 +115 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />

trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/HeuristicLabModelingDatabaseSQLServerCompactPlugin.cs

@@ -33 +33 @@
   [PluginDependency("HeuristicLab.Modeling-3.2")]
   [PluginDependency("HeuristicLab.Modeling.Database-3.2")]
-  [PluginDependency("HeuristicLab.SQLServerCompact-3.5.5692.0")]  
+  [PluginDependency("HeuristicLab.SQLServerCompact-3.5.1.0")]  
   public class HeuristicLabModelingDatabaseSQLServerCompactPlugin : PluginBase {
   }

trunk/sources/HeuristicLab/MergeConfigs.cmd

@@ -4 +4 @@
 ConfigMerger "%SolutionDir%\HeuristicLab.Hive.Server.Core\3.2\%Outdir%\HeuristicLab.Hive.Server.Core-3.2.dll.config" "HeuristicLab.exe.config"
 ConfigMerger "%SolutionDir%\HeuristicLab.Tracing\3.2\%Outdir%\HeuristicLab.Tracing-3.2.dll.config" "HeuristicLab.exe.config"
+ConfigMerger "%SolutionDir%\HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\%Outdir%\HeuristicLab.SQLServerCompact-3.5.1.0.dll.config" "HeuristicLab.exe.config"

trunk/sources/HeuristicLab/app.config

@@ -20 +20 @@
            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>

trunk/tools/ConfigMerger/ConfigMerger.cs

@@ -82 +82 @@
       Merge(sourceNode, destinationNode, destination, "/configuration");
 
+      sourceNode = source.SelectSingleNode("/configuration/system.data/DbProviderFactories");
+      destinationNode = destination.SelectSingleNode("/configuration/system.data/DbProviderFactories");
+      Merge(sourceNode, destinationNode, destination, "/configuration");
+
       destination.Save(destinationFile);
     }