Changeset 16692 for branches/2521_ProblemRefactoring/HeuristicLab

Timestamp:

03/18/19 17:24:30 (6 years ago)

Author:

abeham

Message:

#2521: merged trunk changes up to r15681 into branch (removal of trunk/sources)

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (2 props)
• HeuristicLab/3.3/CustomPostBuildTemplate_UpdateLocalInstallation.cmd (deleted)
• HeuristicLab/3.3/Files.txt (deleted)
• HeuristicLab/3.3/Files.x64.txt (deleted)
• HeuristicLab/3.3/Files.x86.txt (deleted)
• HeuristicLab/3.3/HeuristicLab 3.3 License.txt (modified) (1 diff)
• HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) (4 diffs)
• HeuristicLab/3.3/Program.cs (modified) (1 diff)
• HeuristicLab/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• HeuristicLab/3.3/app.manifest (copied) (copied from trunk/sources/HeuristicLab/3.3/app.manifest)

branches/2521_ProblemRefactoring

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

branches/2521_ProblemRefactoring/HeuristicLab/3.3/HeuristicLab 3.3 License.txt

@@ -1 +1 @@
 HeuristicLab
-Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
 
 HeuristicLab is free software: you can redistribute it and/or modify

branches/2521_ProblemRefactoring/HeuristicLab/3.3/HeuristicLab-3.3.csproj

@@ -108 +108 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -141 +144 @@
       <SubType>Designer</SubType>
     </None>
-    <None Include="CustomPostBuild.cmd" />
-    <None Include="CustomPostBuildTemplate_UpdateLocalInstallation.cmd" />
+    <None Include="app.manifest">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
@@ -166 +170 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <Content Include="Files.txt">
-    </Content>
-    <Content Include="Files.x64.txt">
-    </Content>
-    <Content Include="Files.x86.txt">
-    </Content>
     <None Include="HeuristicLab 3.3 License.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -214 +212 @@
 $SolutionDir/PreBuildEvent.sh
 </PreBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
-set ProjectDir=$(ProjectDir)
-set SolutionDir=$(SolutionDir)
-set Outdir=$(Outdir)
-set Platform=$(PlatformName)
-set Configuration=$(ConfigurationName)
-
-call "$(SolutionDir)MergeConfigs.cmd"
-if exist "%25ProjectDir%25CustomPostBuild.cmd" call CustomPostBuild.cmd</PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+      set ProjectDir=$(ProjectDir)
+      set SolutionDir=$(SolutionDir)
+      set OutDir=$(OutDir)
+      set TargetDir=$(TargetDir)
+      set Platform=$(PlatformName)
+      set Configuration=$(ConfigurationName)
+
+      call "$(SolutionDir)MergeConfigs.cmd"
+    </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-export Outdir=$(Outdir)
+export OutDir=$(OutDir)
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)
+export TargetDir=$(TargetDir)
 
 $SolutionDir/MergeConfigs.sh

branches/2521_ProblemRefactoring/HeuristicLab/3.3/Program.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -51 +51 @@
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.13.$WCREV$")]
-[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]
+[assembly: AssemblyVersion("3.3.15.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.15.$WCREV$")]

@@ -24 +24 @@
 protoc.exe
 obj
+.vs