Changeset 2692


Ignore:
Timestamp:
01/27/10 17:34:07 (10 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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SQLServerCompact/3.5.1.0/HeuristicLab.SQLServerCompact-3.5.1.0.csproj

    r2691 r2692  
    115115  </ItemGroup>
    116116  <ItemGroup>
     117    <None Include="app.config" />
    117118    <None Include="HeuristicLab.snk" />
    118119    <None Include="Properties\AssemblyInfo.frame" />
  • trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/HeuristicLabModelingDatabaseSQLServerCompactPlugin.cs

    r2657 r2692  
    3333  [PluginDependency("HeuristicLab.Modeling-3.2")]
    3434  [PluginDependency("HeuristicLab.Modeling.Database-3.2")]
    35   [PluginDependency("HeuristicLab.SQLServerCompact-3.5.5692.0")] 
     35  [PluginDependency("HeuristicLab.SQLServerCompact-3.5.1.0")] 
    3636  public class HeuristicLabModelingDatabaseSQLServerCompactPlugin : PluginBase {
    3737  }
  • trunk/sources/HeuristicLab/MergeConfigs.cmd

    r2596 r2692  
    44ConfigMerger "%SolutionDir%\HeuristicLab.Hive.Server.Core\3.2\%Outdir%\HeuristicLab.Hive.Server.Core-3.2.dll.config" "HeuristicLab.exe.config"
    55ConfigMerger "%SolutionDir%\HeuristicLab.Tracing\3.2\%Outdir%\HeuristicLab.Tracing-3.2.dll.config" "HeuristicLab.exe.config"
     6ConfigMerger "%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

    r2530 r2692  
    2020           description=".Net Framework Data Provider for SQLite"           
    2121           type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
    22       <remove invariant="System.Data.SqlServerCe.3.5" />
    23       <add name="Microsoft SQL Server Compact Data Provider" invariant="System.Data.SqlServerCe.3.5"
    24            description=".NET Framework Data Provider for Microsoft SQL Server Compact"
    25            type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
    2622    </DbProviderFactories>
    2723  </system.data>
  • trunk/tools/ConfigMerger/ConfigMerger.cs

    r2602 r2692  
    8282      Merge(sourceNode, destinationNode, destination, "/configuration");
    8383
     84      sourceNode = source.SelectSingleNode("/configuration/system.data/DbProviderFactories");
     85      destinationNode = destination.SelectSingleNode("/configuration/system.data/DbProviderFactories");
     86      Merge(sourceNode, destinationNode, destination, "/configuration");
     87
    8488      destination.Save(destinationFile);
    8589    }
Note: See TracChangeset for help on using the changeset viewer.