From 079107aa923fb381a4c2543de97effd488c628f0 Mon Sep 17 00:00:00 2001
From: Mikael Mengistu <mikaelm12@users.noreply.github.com>
Date: Tue, 27 Nov 2018 18:31:57 -0800
Subject: [PATCH 1/6] Make gradlew executable (#4275)

---
 src/SignalR/clients/java/signalr/gradlew | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 src/SignalR/clients/java/signalr/gradlew

diff --git a/src/SignalR/clients/java/signalr/gradlew b/src/SignalR/clients/java/signalr/gradlew
old mode 100644
new mode 100755

From b38f936f31298c5621fc16cd80bb47abd4eaeeb7 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Wed, 28 Nov 2018 16:04:59 -0800
Subject: [PATCH 2/6] Ensure
 Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets is included in 2.2.1
 (#4308)

---
 eng/PatchConfig.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index c05b2376c6..8fb3de2790 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -8,6 +8,7 @@
       Microsoft.AspNetCore.Server.IIS;
       Microsoft.AspNetCore.Server.IISIntegration;
       Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
+      Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
     </PackagesInPatch>
   </PropertyGroup>
 

From 8b48191120a3543262d31b2d18b69842c0de03f1 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Wed, 28 Nov 2018 16:46:05 -0800
Subject: [PATCH 3/6] Ensure static analysis gets the right package versions
 when patching a package

---
 eng/targets/Packaging.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets
index 2a1427c2de..fefa42496b 100644
--- a/eng/targets/Packaging.targets
+++ b/eng/targets/Packaging.targets
@@ -9,7 +9,7 @@
 
   <!-- Temporary: this target is used to gather version information to pass to submodule builds. This can be removed after we finish merging submodules. -->
   <Target Name="GetBaselineArtifactInfo"
-          Condition="'$(IsPackableInNonServicingBuild)' == 'true' AND '$(IsSubfolderBuild)' != 'true' "
+          Condition="'$(IsPackableInNonServicingBuild)' == 'true' AND '$(IsSubfolderBuild)' != 'true' AND '$(IsPackable)' != 'true' "
           Returns="@(ArtifactInfo)"
           BeforeTargets="GetArtifactInfo">
 

From 78c081363158424ae1cf87c9e4f161e5c5f58111 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Thu, 29 Nov 2018 08:44:39 -0800
Subject: [PATCH 4/6] Set Microsoft.Owin.Security.Interop to 'noship' for 2.2
 (#4314)[ci skip]

---
 build/artifacts.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/artifacts.props b/build/artifacts.props
index 29d082173e..837e529ba8 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -190,7 +190,7 @@
     <PackageArtifact Include="Microsoft.Extensions.Localization" Category="ship" />
     <PackageArtifact Include="Microsoft.Net.Http.Headers" Category="ship" />
     <PackageArtifact Include="Microsoft.NET.Sdk.Razor" Category="ship" />
-    <PackageArtifact Include="Microsoft.Owin.Security.Interop" Category="ship" />
+    <PackageArtifact Include="Microsoft.Owin.Security.Interop" Category="noship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Editor.Razor" Category="shipoob" />
     <PackageArtifact Include="Microsoft.VisualStudio.LanguageServices.Razor" Category="shipoob" />
     <PackageArtifact Include="Microsoft.VisualStudio.Mac.LanguageServices.Razor" Category="shipoob" />

From e435fd1d232c2b7922498b4ec0b3b9a4eb8e3736 Mon Sep 17 00:00:00 2001
From: BrennanConroy <brecon@microsoft.com>
Date: Thu, 29 Nov 2018 09:25:52 -0800
Subject: [PATCH 5/6] Fix accidental skipped tests (#4301)

---
 src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts b/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts
index d1d8da177d..04b889b59d 100644
--- a/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts
+++ b/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts
@@ -273,7 +273,7 @@ describe("HubConnection", () => {
             });
         });
 
-        it.only("start completes if connection closes and handshake not received yet", async () => {
+        it("start completes if connection closes and handshake not received yet", async () => {
             await VerifyLogger.run(async (logger) => {
                 const mockProtocol = new TestProtocol(TransferFormat.Text);
 

From 7dc01b6928c13dd4c93c93b9634a7a490712c710 Mon Sep 17 00:00:00 2001
From: BrennanConroy <brecon@microsoft.com>
Date: Thu, 29 Nov 2018 15:04:24 -0800
Subject: [PATCH 6/6] Fix 2.2 benchmarks (#4322)

---
 .../benchmarkapps/BenchmarkServer/BenchmarkServer.csproj      | 4 ++--
 src/SignalR/benchmarkapps/BenchmarkServer/signalr.json        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SignalR/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj b/src/SignalR/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj
index 67a14ce4e7..8fe04f5103 100644
--- a/src/SignalR/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj
+++ b/src/SignalR/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <!-- SignalR is versioned 1.0 alongside the 2.1 version of AspNetCore.All, this converts the .All version to the SignalR version -->
-    <MessagePackPackageVersion Condition=" '$(BenchmarksTargetFramework)' != '' ">$([System.String]::Copy($(MicrosoftAspNetCoreAllPackageVersion)).Replace('2.2', '1.1'))</MessagePackPackageVersion>
+    <!-- Protocols.MessagePack isn't part of the .All metapackage, so we need to manually add it -->
+    <MessagePackPackageVersion Condition=" '$(BenchmarksTargetFramework)' != '' ">1.1.0</MessagePackPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SignalR/benchmarkapps/BenchmarkServer/signalr.json b/src/SignalR/benchmarkapps/BenchmarkServer/signalr.json
index 23c53f7088..275c01fe0e 100644
--- a/src/SignalR/benchmarkapps/BenchmarkServer/signalr.json
+++ b/src/SignalR/benchmarkapps/BenchmarkServer/signalr.json
@@ -2,9 +2,9 @@
   "Default": {
     "Client": "SignalR",
     "Source": {
-      "Repository": "https://github.com/aspnet/SignalR.git",
+      "Repository": "https://github.com/aspnet/AspNetCore.git",
       "BranchOrCommit": "release/2.2",
-      "Project": "benchmarkapps/BenchmarkServer/BenchmarkServer.csproj"
+      "Project": "src/signalr/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj"
     },
     "Connections": 10,
     "Duration": 20,