From 4bbd0bc530a32b5d1080e09bbb67b47a0e828fa1 Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@stanton-nurse.com>
Date: Thu, 11 Jan 2018 12:16:38 -0800
Subject: [PATCH] fix artifacts, external deps and update SignalR (#775)

---
 build/artifacts.props | 28 +++++++++++++++++-----------
 modules/SignalR       |  2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/build/artifacts.props b/build/artifacts.props
index ba95ce1830..943ef9e82f 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -134,17 +134,23 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Category="ship" Metapackage="true" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Category="ship" Metapackage="true"  />
     <PackageArtifact Include="Microsoft.AspNetCore.Session" Category="ship" Metapackage="true" />
-    <PackageArtifact Include="Microsoft.AspNetCore.SignalR" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Client" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Client.Core" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Common" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Core" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Redis" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Sockets" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Abstractions" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Client.Http" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Common.Http" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Http" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.SignalR" Category="ship" Metapackage="true" />
+    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Common" Category="ship" Metapackage="true" />
+    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Core" Category="ship" Metapackage="true" />
+    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Redis" Category="ship" Metapackage="true" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Sockets" Category="ship" Metapackage="true" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Abstractions" Category="ship" Metapackage="true" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Common.Http" Category="ship" Metapackage="true" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Http" Category="ship" Metapackage="true" />
+
+    <!-- SignalR Client and SignalR MsgPack Protocol support are not part of the meta-package -->
+    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Client" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Client.Core" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Client.Http" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Protocols.MsgPack" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.MsgPack" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Client.MsgPack" Category="ship" />
+
     <PackageArtifact Include="Microsoft.AspNetCore.SpaServices" Category="ship" Metapackage="true" />
     <PackageArtifact Include="Microsoft.AspNetCore.SpaServices.Extensions" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SpaTemplates" Category="ship" />
diff --git a/modules/SignalR b/modules/SignalR
index 89b532c985..a9d643a93e 160000
--- a/modules/SignalR
+++ b/modules/SignalR
@@ -1 +1 @@
-Subproject commit 89b532c985999047da51b580ff79365b265dccc8
+Subproject commit a9d643a93e5b388984e208c3664366895baa4449