From 73b5d6d0e51e3b1dd678abb06c4a04926dadf163 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Tue, 20 Nov 2018 11:36:26 -0800
Subject: [PATCH] Remove the BrowserLink submodule (#4087)
---
.gitmodules | 4 ----
build/artifacts.props | 1 -
build/buildorder.props | 1 -
build/dependencies.props | 1 +
build/external-dependencies.props | 1 +
build/submodules.props | 1 -
modules/BrowserLink | 1 -
7 files changed, 2 insertions(+), 8 deletions(-)
delete mode 160000 modules/BrowserLink
diff --git a/.gitmodules b/.gitmodules
index b64f1a6afca..ef502e2e7ee 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,6 @@
path = modules/BasicMiddleware
url = https://github.com/aspnet/BasicMiddleware.git
branch = release/2.1
-[submodule "modules/BrowserLink"]
- path = modules/BrowserLink
- url = https://github.com/aspnet/BrowserLink.git
- branch = release/2.1
[submodule "modules/CORS"]
path = modules/CORS
url = https://github.com/aspnet/CORS.git
diff --git a/build/artifacts.props b/build/artifacts.props
index 587242f9e54..f898d0125a6 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -191,7 +191,6 @@
<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" />
- <PackageArtifact Include="Microsoft.VisualStudio.Web.BrowserLink" AllMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" Category="ship" />
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Category="ship" />
diff --git a/build/buildorder.props b/build/buildorder.props
index 58a3f1f7664..395ee9b702b 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -10,7 +10,6 @@
<RepositoryBuildOrder Include="Razor" Order="6" />
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
<RepositoryBuildOrder Include="HttpSysServer" Order="8" />
- <RepositoryBuildOrder Include="BrowserLink" Order="8" />
<RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
<RepositoryBuildOrder Include="Antiforgery" Order="9" />
<RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
diff --git a/build/dependencies.props b/build/dependencies.props
index 8b1e4119f13..61f901030da 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -151,6 +151,7 @@
<MicrosoftVisualStudioShellInterop90PackageVersion>9.0.30729</MicrosoftVisualStudioShellInterop90PackageVersion>
<MicrosoftVisualStudioShellInteropPackageVersion>7.10.6071</MicrosoftVisualStudioShellInteropPackageVersion>
<MicrosoftVisualStudioTextUIPackageVersion>15.6.161-preview</MicrosoftVisualStudioTextUIPackageVersion>
+ <MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.1.1</MicrosoftVisualStudioWebBrowserLinkPackageVersion>
<MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.5.0</MicrosoftWin32RegistryPackageVersion>
<MonoAddinsPackageVersion>1.3.8</MonoAddinsPackageVersion>
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index 684b4db40b4..70d6935c053 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -170,6 +170,7 @@
<ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.8.0" Version="$(MicrosoftVisualStudioShellInterop80PackageVersion)" />
<ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.9.0" Version="$(MicrosoftVisualStudioShellInterop90PackageVersion)" />
<ExternalDependency Include="Microsoft.VisualStudio.Text.UI" Version="$(MicrosoftVisualStudioTextUIPackageVersion)" />
+ <ExternalDependency Include="Microsoft.VisualStudio.Web.BrowserLink" Version="$(MicrosoftVisualStudioWebBrowserLinkPackageVersion)" AllMetapackage="true" />
<ExternalDependency Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
<ExternalDependency Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<ExternalDependency Include="Mono.Addins" Version="$(MonoAddinsPackageVersion)" />
diff --git a/build/submodules.props b/build/submodules.props
index 638753659f5..2fed4cecfee 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -52,7 +52,6 @@
<ShippedRepository Include="Antiforgery" />
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
<ShippedRepository Include="BasicMiddleware" />
- <ShippedRepository Include="BrowserLink" />
<ShippedRepository Include="CORS" />
<ShippedRepository Include="Diagnostics" />
<ShippedRepository Include="EntityFrameworkCore" />
diff --git a/modules/BrowserLink b/modules/BrowserLink
deleted file mode 160000
index 05f8eac8a23..00000000000
--- a/modules/BrowserLink
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 05f8eac8a233685d5bc3e8d3b59552839add4d79
--
GitLab