From 5bcc76d32c18fa7934b1468e59081f282ce2d0ac Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 1 Jun 2017 16:26:54 -0700
Subject: [PATCH] Remove dependency on DataProtection

Reverse changes made in #1064
---
 .../Internal/ApplicationDiscriminator.cs      | 25 -------------------
 .../Microsoft.AspNetCore.Hosting.csproj       |  1 -
 .../WebHostBuilder.cs                         |  2 --
 .../WebHostBuilderTests.cs                    | 14 -----------
 4 files changed, 42 deletions(-)
 delete mode 100644 src/Microsoft.AspNetCore.Hosting/Internal/ApplicationDiscriminator.cs

diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/ApplicationDiscriminator.cs b/src/Microsoft.AspNetCore.Hosting/Internal/ApplicationDiscriminator.cs
deleted file mode 100644
index c269f7d61c..0000000000
--- a/src/Microsoft.AspNetCore.Hosting/Internal/ApplicationDiscriminator.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.AspNetCore.DataProtection.Infrastructure;
-
-namespace Microsoft.AspNetCore.Hosting.Internal
-{
-    public class ApplicationDiscriminator : IApplicationDiscriminator
-    {
-        private readonly IHostingEnvironment _hostingEnvironment;
-
-        public ApplicationDiscriminator(IHostingEnvironment hostingEnvironment)
-        {
-            if (hostingEnvironment == null)
-            {
-                throw new ArgumentNullException(nameof(hostingEnvironment));
-            }
-
-            _hostingEnvironment = hostingEnvironment;
-        }
-
-        public string Discriminator => _hostingEnvironment.ContentRootPath;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj b/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj
index 9913716f60..a5667da7eb 100644
--- a/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj
+++ b/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj
@@ -16,7 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(AspNetCoreVersion)" />
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
index 7774de93ab..fdebde3182 100644
--- a/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
+++ b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
-using Microsoft.AspNetCore.DataProtection.Infrastructure;
 using Microsoft.AspNetCore.Hosting.Builder;
 using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.AspNetCore.Http;
@@ -298,7 +297,6 @@ namespace Microsoft.AspNetCore.Hosting
             var services = new ServiceCollection();
             services.AddSingleton(_hostingEnvironment);
             services.AddSingleton(_context);
-            services.AddTransient<IApplicationDiscriminator, ApplicationDiscriminator>();
 
             var builder = new ConfigurationBuilder()
                 .SetBasePath(_hostingEnvironment.ContentRootPath)
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
index 9e33f7822d..2ad85e4ba2 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
@@ -9,7 +9,6 @@ using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.DataProtection.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Fakes;
 using Microsoft.AspNetCore.Hosting.Internal;
@@ -989,19 +988,6 @@ namespace Microsoft.AspNetCore.Hosting
             }
         }
 
-        [Fact]
-        public void Build_SetsAppDescriminatorFromContentRoot()
-        {
-            var builder = CreateWebHostBuilder()
-                .UseContentRoot(Environment.CurrentDirectory)
-                .Configure(app => { })
-                .UseServer(new TestServer());
-
-            var host = builder.Build();
-            var applicationDiscriminator = host.Services.GetRequiredService<IApplicationDiscriminator>();
-            Assert.Equal(Environment.CurrentDirectory, applicationDiscriminator.Discriminator);
-        }
-
         [Fact]
         public async Task Build_DoesNotThrowIfUnloadableAssemblyNameInHostingStartupAssembliesAndCaptureStartupErrorsTrue()
         {