From f126871a4cdf7ad5e5cdcbd6bbf54bb54ea85e3e Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Wed, 30 May 2018 15:16:22 -0700
Subject: [PATCH] [2.1.x] Remove WebHooks and Proxy from servicing (#1189)

These repos do not produce packages that will ship in 2.1.x.
---
 .gitmodules            |  8 --------
 build/artifacts.props  | 15 ---------------
 build/submodules.props |  2 --
 modules/Proxy          |  1 -
 modules/WebHooks       |  1 -
 5 files changed, 27 deletions(-)
 delete mode 160000 modules/Proxy
 delete mode 160000 modules/WebHooks

diff --git a/.gitmodules b/.gitmodules
index f46e4e64ce..ed8ae26eba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -138,10 +138,6 @@
 	path = modules/Options
 	url = https://github.com/aspnet/Options.git
 	branch = release/2.1
-[submodule "modules/Proxy"]
-	path = modules/Proxy
-	url = https://github.com/aspnet/Proxy.git
-	branch = release/2.1
 [submodule "modules/Razor"]
 	path = modules/Razor
 	url = https://github.com/aspnet/Razor.git
@@ -190,7 +186,3 @@
 	path = modules/WebSockets
 	url = https://github.com/aspnet/WebSockets.git
 	branch = release/2.1
-[submodule "modules/WebHooks"]
-	path = modules/WebHooks
-	url = https://github.com/aspnet/WebHooks.git
-	branch = release/2.1
diff --git a/build/artifacts.props b/build/artifacts.props
index a1df1c0583..33c0a6d127 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -91,7 +91,6 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.NodeServices.Sockets" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.NodeServices" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Proxy" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.RangeHelper.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Razor.Design" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Razor.Language" AllMetapackage="true" AppMetapackage="true" Category="ship" />
@@ -115,20 +114,6 @@
     <PackageArtifact Include="Microsoft.AspNetCore.SpaServices.Extensions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SpaServices" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.StaticFiles" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.AzureAlert" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.BitBucket" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Dropbox" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.DynamicsCRM" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.GitHub" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Kudu" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.MailChimp" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Pusher" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Salesforce" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Slack" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Stripe" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Trello" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.WordPress" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.WebSockets" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.CodeAnalysis.Razor.Workspaces" Category="shipoob" />
diff --git a/build/submodules.props b/build/submodules.props
index 5eb83ac7ef..2833c6e1ab 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -18,12 +18,10 @@
     <Repository Include="MusicStore" />
     <Repository Include="Mvc" />
     <Repository Include="MvcPrecompilation" />
-    <Repository Include="Proxy" />
     <Repository Include="Razor" />
     <Repository Include="Scaffolding" />
     <Repository Include="Security" />
     <Repository Include="SignalR" />
-    <Repository Include="WebHooks" />
     <Repository Include="WebSockets" />
     <Repository Include="StaticFiles" />
   </ItemGroup>
diff --git a/modules/Proxy b/modules/Proxy
deleted file mode 160000
index 8ec1eb26bb..0000000000
--- a/modules/Proxy
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8ec1eb26bbf238eac08161a83632a6260f02d234
diff --git a/modules/WebHooks b/modules/WebHooks
deleted file mode 160000
index e554b1e9f9..0000000000
--- a/modules/WebHooks
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e554b1e9f9a07dd9af35d55bcd6f7159fc6cf752