Changeset 16715

Timestamp:

03/27/19 14:10:59 (6 years ago)

Author:

abeham

Message:

updated config merger to include further subsettings for oracle clients

Location:

misc/tools/ConfigMerger

Files:

• ConfigMerger.cs (modified) (1 diff)
• ConfigMerger.csproj (modified) (1 diff)
• ConfigMerger.sln (added)
• PreBuildEvent.cmd (added)
• Properties/AssemblyInfo.cs.frame (added)
• Properties/AssemblyInfo.frame (deleted)

misc/tools/ConfigMerger/ConfigMerger.cs

@@ -189 +189 @@
       sourceNode = source.SelectSingleNode("/configuration/oracle.manageddataaccess.client/version/dataSources");
       destinationNode = destination.SelectSingleNode("/configuration/oracle.manageddataaccess.client/version/dataSources");
+      Merge(sourceNode, destinationNode, destination, "/configuration");
+      
+      sourceNode = source.SelectSingleNode("/configuration/oracle.manageddataaccess.client/version/settings");
+      destinationNode = destination.SelectSingleNode("/configuration/oracle.manageddataaccess.client/version/settings");
+      Merge(sourceNode, destinationNode, destination, "/configuration");
+      
+      sourceNode = source.SelectSingleNode("/configuration/oracle.manageddataaccess.client/version/LDAPsettings");
+      destinationNode = destination.SelectSingleNode("/configuration/oracle.manageddataaccess.client/version/LDAPsettings");
       Merge(sourceNode, destinationNode, destination, "/configuration");
 

misc/tools/ConfigMerger/ConfigMerger.csproj

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