Changeset 9363 for branches/OaaS/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj
- Timestamp:
- 04/16/13 13:13:41 (12 years ago)
- Location:
- branches/OaaS
- Files:
-
- 3 edited
-
. (modified) (2 props)
-
HeuristicLab.Services.Hive (modified) (1 prop)
-
HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Services.Hive
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Services.Hive merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Services.Hive 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Services.Hive 6917-7005 /branches/CloningRefactoring/HeuristicLab.Services.Hive 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Services.Hive 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.Hive 5815-6180 /branches/DataAnalysis/HeuristicLab.Services.Hive 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Services.Hive 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.Hive 5060 /branches/HiveTaskScheduler/HeuristicLab.Services.Hive 8687-9106 /branches/NET40/sources/HeuristicLab.Services.Hive 5138-5162 /branches/ParallelEngine/HeuristicLab.Services.Hive 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.Hive 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Services.Hive 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Services.Hive 6828 /branches/RuntimeOptimizer/HeuristicLab.Services.Hive 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Services.Hive 7787-8333 /branches/SlaveShutdown/HeuristicLab.Services.Hive 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Services.Hive 5370-5682 /branches/Trunk/HeuristicLab.Services.Hive 6829-6865 /branches/UnloadJobs/HeuristicLab.Services.Hive 9168-9215 /branches/VNS/HeuristicLab.Services.Hive 5594-5752 /branches/histogram/HeuristicLab.Services.Hive 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj
r8326 r9363 116 116 <Compile Include="Convert.cs" /> 117 117 <Compile Include="DataTransfer\Command.cs" /> 118 <Compile Include="DataTransfer\UserPriority.cs" /> 118 119 <Compile Include="DataTransfer\ResourcePermission.cs" /> 119 120 <Compile Include="DataTransfer\Downtime.cs" /> … … 142 143 <Compile Include="Interfaces\IConnectionProvider.cs" /> 143 144 <Compile Include="Interfaces\IHiveDao.cs" /> 145 <Compile Include="Interfaces\ITaskScheduler.cs" /> 146 <Compile Include="Scheduler\TaskInfoForScheduler.cs" /> 147 <Compile Include="Scheduler\JobInfoForScheduler.cs" /> 148 <Compile Include="Scheduler\RoundRobinTaskScheduler.cs" /> 144 149 <Compile Include="Settings.cs" /> 145 150 <None Include="app.config" /> … … 199 204 </PropertyGroup> 200 205 <PropertyGroup> 201 <PreBuildEvent >set Path=%25Path%25;$(ProjectDir);$(SolutionDir)206 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 202 207 set ProjectDir=$(ProjectDir) 203 208 set SolutionDir=$(SolutionDir) … … 205 210 206 211 call PreBuildEvent.cmd</PreBuildEvent> 212 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 213 export ProjectDir=$(ProjectDir) 214 export SolutionDir=$(SolutionDir) 215 216 $SolutionDir/PreBuildEvent.sh 217 </PreBuildEvent> 207 218 </PropertyGroup> 208 219 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset
for help on using the changeset viewer.
