Merge branch 'release/2.2'

clients/java/signalr/build.gradle

@@ -25,24 +25,17 @@ sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
-    // add sonatype repository (temporary, due to java-8-parent being a snapshot)
-    maven {
-        url 'https://oss.sonatype.org/content/repositories/snapshots/'
-    }
 }
 
 dependencies {
-    implementation 'com.microsoft.maven:java-8-parent:8.0.0-SNAPSHOT'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
-
+    testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1'
-    // dependency versions imported from java-8-parent POM imported above
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api'
-    testCompile 'org.junit.jupiter:junit-jupiter-params'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine'
     testCompile 'org.slf4j:slf4j-jdk14:1.7.25'
-    implementation 'com.google.code.gson:gson'
+    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.squareup.okhttp3:okhttp'
+    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
-    implementation 'io.reactivex.rxjava2:rxjava'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
-    implementation 'org.slf4j:slf4j-api'
+    implementation 'org.slf4j:slf4j-api:1.7.25'
 }
 
 spotless {

clients/ts/FunctionalTests/Program.cs

@@ -28,8 +28,8 @@ namespace FunctionalTests
                 .ConfigureLogging(factory =>
                 {
                     factory.AddConsole(options => options.IncludeScopes = true);
-                    factory.AddFilter("Console", level => level >= LogLevel.Information);
                     factory.AddDebug();
+                    factory.SetMinimumLevel(LogLevel.Information);
                 })
                 .UseKestrel()
                 .UseContentRoot(Directory.GetCurrentDirectory())

clients/ts/FunctionalTests/package.json

@@ -44,7 +44,7 @@
     "test": "tsc --noEmit && npm run test:local --",
     "test:inner": "npm run build && dotnet build && npm run test:local --",
     "test:local": "ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts",
-    "test:all": "ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts --all-browsers",
+    "test:all": "npm run pretest && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts --all-browsers",
     "test:sauce": "ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts --sauce",
     "sauce": "npm run pretest && npm run test:sauce"
   },

clients/ts/FunctionalTests/scripts/run-tests.ts

@@ -17,6 +17,7 @@ const LOGS_DIR = path.resolve(ARTIFACTS_DIR, "logs");
 
 // Promisify things from fs we want to use.
 const fs = {
+    createWriteStream: _fs.createWriteStream,
     exists: promisify(_fs.exists),
     mkdir: promisify(_fs.mkdir),
 };
@@ -110,7 +111,7 @@ for (let i = 2; i < process.argv.length; i += 1) {
             console.log("Running on SauceLabs.");
             break;
         case "-a":
-        case "--all":
+        case "--all-browsers":
             allBrowsers = true;
             break;
         case "--no-color":
@@ -169,7 +170,7 @@ function runJest(url: string) {
         console.log(error.message);
         console.log(error.stderr);
         console.log(error.stdout);
-        return error.status;
+        return error.status || 1;
     }
 }
 
@@ -207,6 +208,9 @@ function runJest(url: string) {
             }
         }
 
+        const logStream = fs.createWriteStream(path.resolve(__dirname, "..", "..", "..", "..", "artifacts", "logs", "ts.functionaltests.dotnet.log"));
+        dotnet.stdout.pipe(logStream);
+
         process.on("SIGINT", cleanup);
         process.on("exit", cleanup);
 
@@ -245,6 +249,7 @@ function runJest(url: string) {
 
         console.log(`karma exit code: ${results.exitCode}`);
         console.log(`jest exit code: ${jestExit}`);
+
         process.exit(results.exitCode !== 0 ? results.exitCode : jestExit);
     } catch (e) {
         console.error(e);

clients/ts/signalr-protocol-msgpack/README.md

@@ -14,6 +14,9 @@ See the [SignalR Documentation](https://docs.microsoft.com/en-us/aspnet/core/sig
 
 To use the client in a browser, copy `*.js` files from the `dist/browser` folder to your script folder include on your page using the `<script>` tag.
 
+### NodeJS
+
+To use the client in a NodeJS application, install the package to your `node_modules` folder and use `require('@aspnet/signalr-protocol-msgpack')` to load the module. The object returned by `require('@aspnet/signalr-protocol-msgpack')` has the same members as the global `signalR.protocols.msgpack` object (when used in a browser).
 
 ### Example (Browser)
 

clients/ts/signalr/README.md

@@ -16,10 +16,7 @@ To use the client in a browser, copy `*.js` files from the `dist/browser` folder
 
 ### Node.js
 
-The following polyfills are required to use the client in Node.js applications:
+To use the client in a NodeJS application, install the package to your `node_modules` folder and use `require('@aspnet/signalr')` to load the module. The object returned by `require('@aspnet/signalr')` has the same members as the global `signalR` object (when used in a browser).
-- `XmlHttpRequest` - always
-- `WebSockets` - to use the WebSockets transport
-- `EventSource` - to use the ServerSentEvents transport
 
 ### Example (Browser)