Changeset 12732 for stable

Timestamp:

07/11/15 19:29:32 (9 years ago)

Author:

abeham

Message:

#2420: merged 12657,12671 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.ExtLibs.sln (modified) (2 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7 (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/HeuristicLab.SimSharp-3.0.7.csproj (modified) (2 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/Plugin.cs (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/Plugin.cs.frame (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/Plugin.cs.frame)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/Properties (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/Properties/AssemblyInfo.cs (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/Properties/AssemblyInfo.cs.frame (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/Properties/AssemblyInfo.cs.frame)

stable/HeuristicLab.ExtLibs.sln

@@ -68 +68 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.EPPlus-4.0.3", "HeuristicLab.ExtLibs\HeuristicLab.EPPlus\4.0.3\HeuristicLab.EPPlus-4.0.3\HeuristicLab.EPPlus-4.0.3.csproj", "{675A6EE4-DE7C-413E-8BEF-EB21E0384C87}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimSharp-3.0.7", "HeuristicLab.ExtLibs\HeuristicLab.SimSharp\3.0.7\SimSharp-3.0.7\SimSharp-3.0.7.csproj", "{9FE9C740-7859-4D01-AD07-7D4E15A6320B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SimSharp-3.0.7", "HeuristicLab.ExtLibs\HeuristicLab.SimSharp\3.0.7\HeuristicLab.SimSharp-3.0.7\HeuristicLab.SimSharp-3.0.7.csproj", "{5C93CAF7-AE6A-4540-95B2-5DA6761A2677}"
 EndProject
 Global
@@ -439 +443 @@
     {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Release|x86.ActiveCfg = Release|x86
     {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Release|x86.Build.0 = Release|x86
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|x64.ActiveCfg = Debug|x64
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|x64.Build.0 = Debug|x64
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|x86.ActiveCfg = Debug|x86
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|x86.Build.0 = Debug|x86
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|Any CPU.Build.0 = Release|Any CPU
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|x64.ActiveCfg = Release|x64
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|x64.Build.0 = Release|x64
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|x86.ActiveCfg = Release|x86
+    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|x86.Build.0 = Release|x86
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|x64.ActiveCfg = Debug|x64
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|x64.Build.0 = Debug|x64
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|x86.ActiveCfg = Debug|x86
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|x86.Build.0 = Debug|x86
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|Any CPU.Build.0 = Release|Any CPU
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x64.ActiveCfg = Release|x64
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x64.Build.0 = Release|x64
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x86.ActiveCfg = Release|x86
+    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

stable/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7

@@ -2 +2 @@
 bin
 *.user
+Plugin.cs

@@ -2 +2 @@
 bin
 *.user
+Plugin.cs

stable/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/HeuristicLab.SimSharp-3.0.7.csproj

@@ -78 +78 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="Plugin.cs.frame" />
     <Compile Include="Plugin.cs" />
+    <None Include="Properties\AssemblyInfo.cs.frame" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -101 +103 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd
+</PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

@@ -2 +2 @@
 bin
 *.user
+Plugin.cs