Changeset 9363 for branches/OaaS/HeuristicLab.DebugEngine

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.DebugEngine/3.3/DebugEngine.cs (modified) (5 diffs)
• HeuristicLab.DebugEngine/3.3/HeuristicLab.DebugEngine-3.3.csproj (modified) (2 diffs)
• HeuristicLab.DebugEngine/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.DebugEngine/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.DebugEngine/3.3/Utils.cs (modified) (1 diff)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.DebugEngine/3.3/DebugEngine.cs

@@ -155 +155 @@
       cancellationTokenSource = new CancellationTokenSource();
       stopPending = false;
-      lastUpdateTime = DateTime.Now;
+      lastUpdateTime = DateTime.UtcNow;
       timer.Start();
       try {
@@ -166 +166 @@
       }
       timer.Stop();
-      ExecutionTime += DateTime.Now - lastUpdateTime;
+      ExecutionTime += DateTime.UtcNow - lastUpdateTime;
       cancellationTokenSource.Dispose();
       cancellationTokenSource = null;
@@ -242 +242 @@
 
       OnStarted();
-      lastUpdateTime = DateTime.Now;
+      lastUpdateTime = DateTime.UtcNow;
       timer.Start();
       try {
@@ -253 +253 @@
       finally {
         timer.Stop();
-        ExecutionTime += DateTime.Now - lastUpdateTime;
+        ExecutionTime += DateTime.UtcNow - lastUpdateTime;
 
         if (IsAtBreakpoint)
@@ -263 +263 @@
       System.Timers.Timer timer = (System.Timers.Timer)sender;
       timer.Enabled = false;
-      DateTime now = DateTime.Now;
+      DateTime now = DateTime.UtcNow;
       ExecutionTime += now - lastUpdateTime;
       lastUpdateTime = now;

branches/OaaS/HeuristicLab.DebugEngine/3.3/HeuristicLab.DebugEngine-3.3.csproj

@@ -136 +136 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -142 +142 @@
 
 call PreBuildEvent.cmd
+</PreBuildEvent>
+<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+
+$SolutionDir/PreBuildEvent.sh
 </PreBuildEvent>
   </PropertyGroup>

branches/OaaS/HeuristicLab.DebugEngine/3.3/Plugin.cs.frame

@@ -24 +24 @@
 namespace HeuristicLab.DebugEngine {
 
-  [Plugin("HeuristicLab.DebugEngine", "3.3.6.$WCREV$")]
+  [Plugin("HeuristicLab.DebugEngine", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.DebugEngine-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/OaaS/HeuristicLab.DebugEngine/3.3/Properties/AssemblyInfo.cs.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

branches/OaaS/HeuristicLab.DebugEngine/3.3/Utils.cs

@@ -36 +36 @@
       if (obj == null)
         return "null";
-      return TypeNameParser.Parse(obj.GetType().ToString()).GetTypeNameInCode(true);
+      return TypeNameParser.Parse(obj.GetType().FullName).GetTypeNameInCode(true);
     }
 

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages