Changeset 2649

Timestamp:

01/20/10 00:42:34 (14 years ago)

Author:

swagner

Message:

Fixed wrong project name in Files.txt, added solution folders for closed source libraries, updated project references (#837)

Location:

trunk/sources

Files:

• HeuristicLab 3.2.sln (modified) (6 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/HeuristicLab.WinFormsUI-2.3.1/HeuristicLab.WinFormsUI-2.3.1.csproj (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/WinFormsUI-2.3.1/WinFormsUI-2.3.1.csproj (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/HeuristicLab.MainForm.WindowsForms-3.2.csproj (modified) (1 diff)
• HeuristicLab/Files.txt (modified) (2 diffs)

trunk/sources/HeuristicLab 3.2.sln

@@ -84 +84 @@
     {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11} = {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}
     {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F} = {FD1AFEC2-7A79-45CF-9365-5195B04A2C9F}
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1} = {C75532C4-765B-418E-B09B-46D36B2ABDB1}
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB} = {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}
     {85FA46C6-761E-4098-9EF7-060ECC386396} = {85FA46C6-761E-4098-9EF7-060ECC386396}
     {E3CCBFC6-900C-41B6-AFB8-6646DB097435} = {E3CCBFC6-900C-41B6-AFB8-6646DB097435}
@@ -295 +295 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.WinFormsUI-2.3.1", "HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\HeuristicLab.WinFormsUI-2.3.1\HeuristicLab.WinFormsUI-2.3.1.csproj", "{678E2145-8152-4E19-9646-07D439D00301}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI-2.3.1", "HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\WinFormsUI-2.3.1\WinFormsUI-2.3.1.csproj", "{C75532C4-765B-418E-B09B-46D36B2ABDB1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI-2.3.1", "HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\WinFormsUI-2.3.1\WinFormsUI-2.3.1.csproj", "{1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.ALGLIB", "HeuristicLab.ALGLIB", "{BC9B1349-F788-4293-AA27-0B3474761C7F}"
@@ -316 +316 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.log4net-1.2.10.0", "HeuristicLab.ExtLibs\HeuristicLab.log4net\1.2.10.0\HeuristicLab.log4net-1.2.10.0.csproj", "{1B3063DB-D71C-4A6A-A359-883E8F53A140}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.log4net", "HeuristicLab.log4net", "{823E15D8-30DC-4D69-804B-53BDF8D70E39}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.SQLite", "HeuristicLab.SQLite", "{9CAC84CA-BEB1-44F9-95E7-75ACEFF98693}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.SQLServerCompact", "HeuristicLab.SQLServerCompact", "{C2614CCD-A8B9-4BA2-86DA-6584CAA0087C}"
 EndProject
 Global
@@ -2540 +2546 @@
     {678E2145-8152-4E19-9646-07D439D00301}.Release|x86.ActiveCfg = Release|x86
     {678E2145-8152-4E19-9646-07D439D00301}.Release|x86.Build.0 = Release|x86
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.CEDMA Debug|x64.ActiveCfg = Debug|x64
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.CEDMA Debug|x64.Build.0 = Debug|x64
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.CEDMA Debug|x86.ActiveCfg = Debug|x86
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.CEDMA Debug|x86.Build.0 = Debug|x86
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x64.ActiveCfg = Debug|x64
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x64.Build.0 = Debug|x64
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.ActiveCfg = Debug|x86
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.Build.0 = Debug|x86
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Modeling Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Modeling Debug|Any CPU.Build.0 = Debug|Any CPU
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Modeling Debug|x64.ActiveCfg = Debug|x64
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Modeling Debug|x64.Build.0 = Debug|x64
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Modeling Debug|x86.ActiveCfg = Debug|x86
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Modeling Debug|x86.Build.0 = Debug|x86
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.Build.0 = Release|Any CPU
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x64.ActiveCfg = Release|x64
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x64.Build.0 = Release|x64
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.ActiveCfg = Release|x86
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.Build.0 = Release|x86
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.CEDMA Debug|x64.ActiveCfg = Debug|x64
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.CEDMA Debug|x64.Build.0 = Debug|x64
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.CEDMA Debug|x86.ActiveCfg = Debug|x86
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.CEDMA Debug|x86.Build.0 = Debug|x86
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|x64.ActiveCfg = Debug|x64
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|x64.Build.0 = Debug|x64
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|x86.ActiveCfg = Debug|x86
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|x86.Build.0 = Debug|x86
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Modeling Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Modeling Debug|Any CPU.Build.0 = Debug|Any CPU
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Modeling Debug|x64.ActiveCfg = Debug|x64
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Modeling Debug|x64.Build.0 = Debug|x64
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Modeling Debug|x86.ActiveCfg = Debug|x86
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Modeling Debug|x86.Build.0 = Debug|x86
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|Any CPU.Build.0 = Release|Any CPU
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|x64.ActiveCfg = Release|x64
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|x64.Build.0 = Release|x64
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|x86.ActiveCfg = Release|x86
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|x86.Build.0 = Release|x86
     {B6C53341-86C0-4063-87E2-F573EFE51132}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {B6C53341-86C0-4063-87E2-F573EFE51132}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -2702 +2708 @@
   GlobalSection(NestedProjects) = preSolution
     {D04A93C2-6903-4DCA-8803-2EBF60975E47} = {A0AEB817-CAC7-4DC8-8D39-0E040BA027E5}
-    {31DD6385-7276-49ED-9533-823D4CDF3D2A} = {A0AEB817-CAC7-4DC8-8D39-0E040BA027E5}
     {BC9B1349-F788-4293-AA27-0B3474761C7F} = {A0AEB817-CAC7-4DC8-8D39-0E040BA027E5}
-    {6960CBCD-E44B-49B0-BA86-671091C42C36} = {A0AEB817-CAC7-4DC8-8D39-0E040BA027E5}
     {66A6D1DA-E53C-455D-9F53-07C0128CBF29} = {A0AEB817-CAC7-4DC8-8D39-0E040BA027E5}
-    {1B3063DB-D71C-4A6A-A359-883E8F53A140} = {A0AEB817-CAC7-4DC8-8D39-0E040BA027E5}
+    {823E15D8-30DC-4D69-804B-53BDF8D70E39} = {A0AEB817-CAC7-4DC8-8D39-0E040BA027E5}
+    {9CAC84CA-BEB1-44F9-95E7-75ACEFF98693} = {A0AEB817-CAC7-4DC8-8D39-0E040BA027E5}
+    {C2614CCD-A8B9-4BA2-86DA-6584CAA0087C} = {A0AEB817-CAC7-4DC8-8D39-0E040BA027E5}
     {DD1A12A4-88DE-4991-8CBC-9AC2E57EADC3} = {D04A93C2-6903-4DCA-8803-2EBF60975E47}
     {678E2145-8152-4E19-9646-07D439D00301} = {DD1A12A4-88DE-4991-8CBC-9AC2E57EADC3}
-    {C75532C4-765B-418E-B09B-46D36B2ABDB1} = {DD1A12A4-88DE-4991-8CBC-9AC2E57EADC3}
+    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB} = {DD1A12A4-88DE-4991-8CBC-9AC2E57EADC3}
     {6982D0CF-65DB-49E7-A4FD-7135BCC25A15} = {BC9B1349-F788-4293-AA27-0B3474761C7F}
     {B6C53341-86C0-4063-87E2-F573EFE51132} = {6982D0CF-65DB-49E7-A4FD-7135BCC25A15}
@@ -2716 +2722 @@
     {A16F23B5-FB62-499E-A831-26953AA56FE2} = {FDB65084-1E00-4BCF-90A7-C69BBEC014F8}
     {89B50302-9CEE-4D13-9779-633EADCAE624} = {FDB65084-1E00-4BCF-90A7-C69BBEC014F8}
+    {1B3063DB-D71C-4A6A-A359-883E8F53A140} = {823E15D8-30DC-4D69-804B-53BDF8D70E39}
+    {6960CBCD-E44B-49B0-BA86-671091C42C36} = {9CAC84CA-BEB1-44F9-95E7-75ACEFF98693}
+    {31DD6385-7276-49ED-9533-823D4CDF3D2A} = {C2614CCD-A8B9-4BA2-86DA-6584CAA0087C}
   EndGlobalSection
 EndGlobal

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/HeuristicLab.WinFormsUI-2.3.1/HeuristicLab.WinFormsUI-2.3.1.csproj

@@ -98 +98 @@
     </ProjectReference>
     <ProjectReference Include="..\WinFormsUI-2.3.1\WinFormsUI-2.3.1.csproj">
-      <Project>{C75532C4-765B-418E-B09B-46D36B2ABDB1}</Project>
+      <Project>{1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}</Project>
       <Name>WinFormsUI-2.3.1</Name>
     </ProjectReference>

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/WinFormsUI-2.3.1/WinFormsUI-2.3.1.csproj

@@ -5 +5 @@
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C75532C4-765B-418E-B09B-46D36B2ABDB1}</ProjectGuid>
+    <ProjectGuid>{1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/HeuristicLab.MainForm.WindowsForms-3.2.csproj

@@ -141 +141 @@
   <ItemGroup>
     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\WinFormsUI-2.3.1\WinFormsUI-2.3.1.csproj">
-      <Project>{C75532C4-765B-418E-B09B-46D36B2ABDB1}</Project>
+      <Project>{1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}</Project>
       <Name>WinFormsUI-2.3.1</Name>
     </ProjectReference>

trunk/sources/HeuristicLab/Files.txt

@@ -126 +126 @@
 ;External Libraries
 HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.1.2.2591\ALGLIB-2.1.2.2591:ALGLIB-2.1.2.2591.dll
+HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.1.2.2591\HeuristicLab.ALGLIB-2.1.2.2591:HeuristicLab.ALGLIB-2.1.2.2591.dll
 HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.1.2.2591\HeuristicLab.ALGLIB-2.1.2.2591:ALGLIB License.txt
-HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.1.2.2591\HeuristicLab.ALGLIB-2.1.2.2591:HeuristicLab.ALGLIB-2.1.2.2591.dll
 
 HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\LibSVM-1.6.3:LibSVM-1.6.3.dll 
@@ -145 +145 @@
 HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5:SQLServer Compact license.txt
 
+HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\WinFormsUI-2.3.1:WeifenLuo.WinFormsUI.Docking-2.3.1.dll 
 HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\HeuristicLab.WinFormsUI-2.3.1:HeuristicLab.WinFormsUI-2.3.1.dll
-HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\WinFormsUI-2.3.1:WeifenLuo.WinFormsUI.Docking-2.3.1.dll 
-HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\WinFormsUI-2.3.1::WeifenLuo.WinFormsUI.Docking License.txt 
+HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\HeuristicLab.WinFormsUI-2.3.1:WeifenLuo.WinFormsUI.Docking License.txt