From c737eb32f2b6925b2839b0794ba034d2be728164 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 12 Aug 2018 19:29:53 +0000 Subject: [PATCH 1/3] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 98 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 0dfaf34542..6a7855361b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,57 +5,57 @@ 0.10.13 3.1.0 - 2.2.0-preview1-34896 - 2.2.0-preview1-20180731.1 + 2.2.0-preview1-34967 + 2.2.0-preview1-20180807.2 1.7.3.4 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 4.5.0 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 2.2.0-preview1-26618-02 15.6.1 4.7.49 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index b6efc7cfcb..29a57027f1 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180731.1 -commithash:29fde58465439f4bb9df40830635ed758e063daf +version:2.2.0-preview1-20180807.2 +commithash:11495dbd236104434e08cb1152fcb58cf2a20923 From 82cef1a0c6324d6f5f5485e1de152db1be93f32f Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Mon, 13 Aug 2018 11:34:38 -0700 Subject: [PATCH 2/3] fix chrome headless when root by adding --no-sandbox (#2796) --- clients/ts/FunctionalTests/scripts/karma.local.conf.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/clients/ts/FunctionalTests/scripts/karma.local.conf.js b/clients/ts/FunctionalTests/scripts/karma.local.conf.js index 7f81ea9c0f..1245f9052b 100644 --- a/clients/ts/FunctionalTests/scripts/karma.local.conf.js +++ b/clients/ts/FunctionalTests/scripts/karma.local.conf.js @@ -40,7 +40,7 @@ try { } // We use the launchers themselves to figure out if the browser exists. It's a bit sneaky, but it works. - tryAddBrowser("ChromeHeadless", new ChromeHeadlessBrowser(() => { }, {})); + tryAddBrowser("ChromeHeadlessNoSandbox", new ChromeHeadlessBrowser(() => { }, {})); tryAddBrowser("ChromiumHeadless", new ChromiumHeadlessBrowser(() => { }, {})); tryAddBrowser("FirefoxHeadless", new FirefoxHeadlessBrowser(0, () => { }, {})); @@ -53,6 +53,12 @@ try { module.exports = createKarmaConfig({ browsers, + customLaunchers: { + ChromeHeadlessNoSandbox: { + base: 'ChromeHeadless', + flags: ['--no-sandbox'] + } + } }); } catch (e) { console.error(e); From 6310cffd7c7a8e9beef5d7d774f557870e08b401 Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Mon, 13 Aug 2018 11:36:57 -0700 Subject: [PATCH 3/3] Add timestamps to log messages (#2777) --- .../com/microsoft/aspnet/signalr/ConsoleLogger.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ConsoleLogger.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ConsoleLogger.java index a79ff1ad52..285ddf71e3 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ConsoleLogger.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ConsoleLogger.java @@ -3,8 +3,14 @@ package com.microsoft.aspnet.signalr; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + public class ConsoleLogger implements Logger { private LogLevel logLevel; + private DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mmZ"); + public ConsoleLogger(LogLevel logLevel) { this.logLevel = logLevel; } @@ -12,6 +18,8 @@ public class ConsoleLogger implements Logger { @Override public void log(LogLevel logLevel, String message) { if(logLevel.value >= this.logLevel.value){ + String timeStamp = dateFormat.format(new Date()); + message = String.format("[%s] [%s] %s", timeStamp, logLevel, message); switch (logLevel) { case Debug: case Information: @@ -29,7 +37,8 @@ public class ConsoleLogger implements Logger { @Override public void log(LogLevel logLevel, String formattedMessage, Object... args) { if (logLevel.value >= this.logLevel.value) { - formattedMessage = formattedMessage + "%n"; + String timeStamp = dateFormat.format(new Date()); + formattedMessage = String.format("[%s] [%s] %s%n", timeStamp, logLevel, formattedMessage); switch (logLevel) { case Debug: case Information: