Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/10/11 12:24:33 (12 years ago)
Author:
ascheibe
Message:

#1517

  • rewrote Logger to use Diagnostics.Trace
  • removed HiveLogger as it's not used anymore
  • removed dependency from Persistence to log4net
  • ConfigMerger now also merges <system.diagnostics> sections
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/ConfigMerger/ConfigMerger.cs

    r5163 r6173  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    2523using System.Text;
    2624using System.Xml;
     
    6967      destinationNode = destination.SelectSingleNode("/configuration/system.serviceModel/services");
    7068      Merge(sourceNode, destinationNode, destination, "/configuration/system.serviceModel");
    71      
     69
    7270      #region Merge 'system.serviceModel/bindings/*'
    7371      destinationNode = destination.SelectSingleNode("/configuration/system.serviceModel/bindings");
     
    184182      destinationNode = destination.SelectSingleNode("/configuration/system.data/DbProviderFactories");
    185183      Merge(sourceNode, destinationNode, destination, "/configuration");
     184
     185      sourceNode = source.SelectSingleNode("/configuration/system.diagnostics");
     186      destinationNode = destination.SelectSingleNode("/configuration/system.diagnostics");
     187      Merge(sourceNode, destinationNode, destination, "/configuration");
     188
     189
     190
    186191
    187192      destination.Save(destinationFile);
Note: See TracChangeset for help on using the changeset viewer.