Changeset 12732 for stable/HeuristicLab.ExtLibs

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/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/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