Merge pull request #3163 from dotnet-maestro-bot/merge/release/2.2-to-master

[automated] Merge branch 'release/2.2' => 'master'

Author: BrennanConroy

.vsts-pipelines/builds/ci-internal.yml

@@ -9,28 +9,9 @@ resources:
     name: aspnet-BuildTools
     ref: refs/heads/master
 
-phases:
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+jobs:
+- template: .azure/templates/project-ci.yml@buildtools
   parameters:
-    agentOs: Windows
-    beforeBuild:
-    - task: NodeTool@0
-      displayName: Use Node 8.x
-      inputs:
-        versionSpec: 8.x
-
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: macOS
-    beforeBuild:
-    - task: NodeTool@0
-      displayName: Use Node 8.x
-      inputs:
-        versionSpec: 8.x
-
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: Linux
     beforeBuild:
     - task: NodeTool@0
       displayName: Use Node 8.x

.vsts-pipelines/builds/ci-public.yml

@@ -11,28 +11,9 @@ resources:
     name: aspnet/BuildTools
     ref: refs/heads/master
 
-phases:
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+jobs:
+- template: .azure/templates/project-ci.yml@buildtools
   parameters:
-    agentOs: Windows
-    beforeBuild:
-    - task: NodeTool@0
-      displayName: Use Node 8.x
-      inputs:
-        versionSpec: 8.x
-
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: macOS
-    beforeBuild:
-    - task: NodeTool@0
-      displayName: Use Node 8.x
-      inputs:
-        versionSpec: 8.x
-
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: Linux
     beforeBuild:
     - task: NodeTool@0
       displayName: Use Node 8.x

clients/java/signalr/build.gradle

@@ -38,6 +38,7 @@ dependencies {
     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.squareup.okhttp3:okhttp'
     implementation 'io.reactivex.rxjava2:rxjava'

clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java

@@ -3,6 +3,9 @@
 
 package com.microsoft.signalr;
 
+/**
+ * A callback that takes no parameters.
+ */
 @FunctionalInterface
 public interface Action {
     void invoke();

clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java

@@ -3,6 +3,11 @@
 
 package com.microsoft.signalr;
 
+/**
+ * A callback that takes one parameter.
+ *
+ * @param <T1> The type of the first parameter to the callback.
+ */
 @FunctionalInterface
 public interface Action1<T1> {
     void invoke(T1 param1);

clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java

@@ -3,6 +3,12 @@
 
 package com.microsoft.signalr;
 
+/**
+ * A callback that takes two parameters.
+ *
+ * @param <T1> The type of the first parameter to the callback.
+ * @param <T2> The type of the second parameter to the callback.
+ */
 @FunctionalInterface
 public interface Action2<T1, T2> {
     void invoke(T1 param1, T2 param2);

clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java

@@ -3,6 +3,13 @@
 
 package com.microsoft.signalr;
 
+/**
+ * A callback that takes three parameters.
+ *
+ * @param <T1> The type of the first parameter to the callback.
+ * @param <T2> The type of the second parameter to the callback.
+ * @param <T3> The type of the third parameter to the callback.
+ */
 @FunctionalInterface
 public interface Action3<T1, T2, T3> {
     void invoke(T1 param1, T2 param2, T3 param3);

clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java

@@ -3,6 +3,14 @@
 
 package com.microsoft.signalr;
 
+/**
+ * A callback that takes four parameters.
+ *
+ * @param <T1> The type of the first parameter to the callback.
+ * @param <T2> The type of the second parameter to the callback.
+ * @param <T3> The type of the third parameter to the callback.
+ * @param <T4> The type of the fourth parameter to the callback.
+ */
 @FunctionalInterface
 public interface Action4<T1, T2, T3, T4> {
     void invoke(T1 param1, T2 param2, T3 param3, T4 param4);

clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java

@@ -3,6 +3,15 @@
 
 package com.microsoft.signalr;
 
+/**
+ * A callback that takes five parameter.
+ *
+ * @param <T1> The type of the first parameter to the callback.
+ * @param <T2> The type of the second parameter to the callback.
+ * @param <T3> The type of the third parameter to the callback.
+ * @param <T4> The type of the fourth parameter to the callback.
+ * @param <T5> The type of the fifth parameter to the callback.
+ */
 @FunctionalInterface
 public interface Action5<T1, T2, T3, T4, T5> {
     void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5);

clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java

@@ -3,6 +3,16 @@
 
 package com.microsoft.signalr;
 
+/**
+ * A callback that takes six parameters.
+ *
+ * @param <T1> The type of the first parameter to the callback.
+ * @param <T2> The type of the second parameter to the callback.
+ * @param <T3> The type of the third parameter to the callback.
+ * @param <T4> The type of the fourth parameter to the callback.
+ * @param <T5> The type of the fifth parameter to the callback.
+ * @param <T6> The type of the sixth parameter to the callback.
+ */
 @FunctionalInterface
 public interface Action6<T1, T2, T3, T4, T5, T6> {
     void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6);