From d3f418efd8fc388e4b549133c559139118b8a135 Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@stanton-nurse.com>
Date: Wed, 8 Aug 2018 10:59:09 -0700
Subject: [PATCH 1/2] disable the gradle daemon on the CI (#2759)

---
 build/repo.targets | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/repo.targets b/build/repo.targets
index 32d47b4db7..424fa09955 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -16,6 +16,9 @@
     <JavacPath Condition="'$(OS)' != 'Windows_NT'">$(JAVA_HOME)/bin/javac</JavacPath>
 
     <HasJdk Condition="Exists('$(JavacPath)')">true</HasJdk>
+
+    <!-- Disable gradle daemon on CI since the CI seems to try to wait for the daemon to shut down, which it doesn't do :) -->
+    <GradleOptions Condition="'$(CI)' == 'true'">-Dorg.gradle.daemon=false</GradleOptions>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -45,7 +48,7 @@
 
   <Target Name="RunJavaTests" Condition="'$(HasJdk)' == 'true'">
     <Message Text="Running Java client tests" Importance="high" />
-    <Exec Command="./gradlew test" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" IgnoreStandardErrorWarningFormat="true" />
+    <Exec Command="./gradlew $(GradleOptions) test" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" IgnoreStandardErrorWarningFormat="true" />
   </Target> 
 
   <PropertyGroup>
@@ -106,7 +109,7 @@
 
   <Target Name="BuildJavaClient" Condition="'$(HasJdk)' == 'true'" DependsOnTargets="GetJavaArtifactInfo">
     <Message Text="Building Java client" Importance="high" />
-    <Exec Command="./gradlew compileJava" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
+    <Exec Command="./gradlew $(GradleOptions) compileJava" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
   </Target>
 
   <PropertyGroup>
@@ -136,7 +139,7 @@
 
   <Target Name="PackJavaClient" Condition="'$(HasJdk)' == 'true'">
     <Message Text="Packing Java client" Importance="high" />
-    <Exec Command="./gradlew jar sourceJar javadocJar generatePOM" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
+    <Exec Command="./gradlew $(GradleOptions) jar sourceJar javadocJar generatePOM" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
     <Copy SourceFiles="$(RepositoryRoot)clients/java/signalr\build\libs\%(JavaBuildFiles.Identity)" DestinationFolder="$(BuildDir)" />
   </Target>
 

From 186a85b7e009d1814c678ccfe3ded7871328f1d8 Mon Sep 17 00:00:00 2001
From: BrennanConroy <brecon@microsoft.com>
Date: Wed, 8 Aug 2018 11:28:30 -0700
Subject: [PATCH 2/2] Add timestamp to logs TS client (#2760)

---
 clients/ts/signalr/src/Utils.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/clients/ts/signalr/src/Utils.ts b/clients/ts/signalr/src/Utils.ts
index 247629906b..9c67f775e1 100644
--- a/clients/ts/signalr/src/Utils.ts
+++ b/clients/ts/signalr/src/Utils.ts
@@ -166,17 +166,17 @@ export class ConsoleLogger implements ILogger {
             switch (logLevel) {
                 case LogLevel.Critical:
                 case LogLevel.Error:
-                    console.error(`${LogLevel[logLevel]}: ${message}`);
+                    console.error(`[${new Date().toISOString()}] ${LogLevel[logLevel]}: ${message}`);
                     break;
                 case LogLevel.Warning:
-                    console.warn(`${LogLevel[logLevel]}: ${message}`);
+                    console.warn(`[${new Date().toISOString()}] ${LogLevel[logLevel]}: ${message}`);
                     break;
                 case LogLevel.Information:
-                    console.info(`${LogLevel[logLevel]}: ${message}`);
+                    console.info(`[${new Date().toISOString()}] ${LogLevel[logLevel]}: ${message}`);
                     break;
                 default:
                     // console.debug only goes to attached debuggers in Node, so we use console.log for Trace and Debug
-                    console.log(`${LogLevel[logLevel]}: ${message}`);
+                    console.log(`[${new Date().toISOString()}] ${LogLevel[logLevel]}: ${message}`);
                     break;
             }
         }