Updated MergeConfigs.cmd and Files.txt due to changes in r4893 (#1271)

git-svn-id: https://src.heuristiclab.com/svn/core/tags/3.3.2@4894 2abd9481-f8db-48e9-bd25-06bc13291c1b
heal-research · Nov 22, 2010 · 61bcee8 · 61bcee8
1 parent a901860
commit 61bcee8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj b/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj
@@ -93,7 +93,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Data.Views-3.3">
       <HintPath>..\..\HeuristicLab.Data.Views\3.3\bin\Debug\HeuristicLab.Data.Views-3.3.dll</HintPath>
     </Reference>
@@ -174,6 +173,10 @@
       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
       <Name>HeuristicLab.Collections-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
+      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
       <Name>HeuristicLab.Common-3.3</Name>

diff --git a/HeuristicLab/3.3/Files.txt b/HeuristicLab/3.3/Files.txt
@@ -13,7 +13,6 @@ HeuristicLab.Algorithms.SimulatedAnnealing\3.3:HeuristicLab.Algorithms.Simulated
 HeuristicLab.Algorithms.TabuSearch\3.3:HeuristicLab.Algorithms.TabuSearch-3.3.dll
 HeuristicLab.Analysis\3.3:HeuristicLab.Analysis-3.3.dll
 HeuristicLab.Analysis.Views\3.3:HeuristicLab.Analysis.Views-3.3.dll
-HeuristicLab.Clients.Common\3.3:HeuristicLab.Clients.Common-3.3.dll
 HeuristicLab.CodeEditor\3.3:HeuristicLab.CodeEditor-3.3.dll
 HeuristicLab.Collections\3.3:HeuristicLab.Collections-3.3.dll
 HeuristicLab.Common\3.3:HeuristicLab.Common-3.3.dll
@@ -42,7 +41,6 @@ HeuristicLab.Optimizer\3.3:HeuristicLab.Optimizer-3.3.dll
 HeuristicLab.Parameters\3.3:HeuristicLab.Parameters-3.3.dll
 HeuristicLab.Parameters.Views\3.3:HeuristicLab.Parameters.Views-3.3.dll
 HeuristicLab.Persistence\3.3:HeuristicLab.Persistence-3.3.dll
-HeuristicLab.Persistence.GUI\3.3:HeuristicLab.Persistence.GUI-3.3.dll
 HeuristicLab.Problems.ArtificialAnt\3.3:HeuristicLab.Problems.ArtificialAnt-3.3.dll
 HeuristicLab.Problems.ArtificialAnt.Views\3.3:HeuristicLab.Problems.ArtificialAnt.Views-3.3.dll
 HeuristicLab.Problems.DataAnalysis\3.3:HeuristicLab.Problems.DataAnalysis-3.3.dll

diff --git a/HeuristicLab/3.3/MergeConfigs.cmd b/HeuristicLab/3.3/MergeConfigs.cmd
@@ -1,5 +1,4 @@
 ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure\3.3\%Outdir%\HeuristicLab.PluginInfrastructure-3.3.dll.config" "HeuristicLab 3.3.exe.config"
-ConfigMerger "%SolutionDir%\HeuristicLab.Clients.Common\3.3\%Outdir%\HeuristicLab.Clients.Common-3.3.dll.config" "HeuristicLab 3.3.exe.config"
 ConfigMerger "%SolutionDir%\HeuristicLab.Optimizer\3.3\%Outdir%\HeuristicLab.Optimizer-3.3.dll.config" "HeuristicLab 3.3.exe.config"
 ConfigMerger "%SolutionDir%\HeuristicLab.Persistence\3.3\%Outdir%\HeuristicLab.Persistence-3.3.dll.config" "HeuristicLab 3.3.exe.config"
 ConfigMerger "%SolutionDir%\HeuristicLab.Tracing\3.3\%Outdir%\HeuristicLab.Tracing-3.3.dll.config" "HeuristicLab 3.3.exe.config"