Changeset 7060

Timestamp:

11/24/11 11:34:22 (13 years ago)

Author:

abeham

Message:

#1653

• Changed config merging behavior to always merge from the original HeuristicLab app.config file in order to not break the local build when changes to the config files occur
• Added an interactive mode detection to the MergeConfigs.cmd to allow execution from the explorer
• Changed app.config in HeuristicLab.Tracing-3.3.csproj to not copy to output directory
• Changed app.config in HeuristicLab-3.3.csproj to always copy to output directory

Location:

trunk/sources

Files:

• HeuristicLab.Tracing/3.3/HeuristicLab.Tracing-3.3.csproj (modified) (1 diff)
• HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) (2 diffs)
• HeuristicLab/3.3/MergeConfigs.cmd (deleted)
• MergeConfigs.cmd (added)

trunk/sources/HeuristicLab.Tracing/3.3/HeuristicLab.Tracing-3.3.csproj

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

trunk/sources/HeuristicLab/3.3/HeuristicLab-3.3.csproj

@@ -134 +134 @@
     <None Include="app.config">
       <SubType>Designer</SubType>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="CustomPostBuild.cmd" />
@@ -210 +211 @@
 set Configuration=$(ConfigurationName)
 
-call MergeConfigs.cmd
+call $(SolutionDir)MergeConfigs.cmd
 if exist "%25ProjectDir%25CustomPostBuild.cmd" call CustomPostBuild.cmd</PostBuildEvent>
   </PropertyGroup>