From b44ffdb745aa227b311a6f0ec3d178db33fd8c70 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Wed, 12 Nov 2014 15:54:28 -0800 Subject: [PATCH] #111 - Remove DataProtectionOptions from the service collection. --- src/Microsoft.AspNet.Hosting/HostingServices.cs | 6 ------ src/Microsoft.AspNet.Hosting/Program.cs | 8 -------- src/Microsoft.AspNet.Hosting/project.json | 1 - 3 files changed, 15 deletions(-) diff --git a/src/Microsoft.AspNet.Hosting/HostingServices.cs b/src/Microsoft.AspNet.Hosting/HostingServices.cs index f1ce9b3cd2..52d5e978ca 100644 --- a/src/Microsoft.AspNet.Hosting/HostingServices.cs +++ b/src/Microsoft.AspNet.Hosting/HostingServices.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using Microsoft.AspNet.Hosting.Builder; using Microsoft.AspNet.Hosting.Server; using Microsoft.AspNet.Hosting.Startup; -using Microsoft.AspNet.Security.DataProtection; using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; @@ -46,11 +45,6 @@ namespace Microsoft.AspNet.Hosting { yield return service; } - - foreach (var service in DataProtectionServices.GetDefaultServices()) - { - yield return service; - } } } } diff --git a/src/Microsoft.AspNet.Hosting/Program.cs b/src/Microsoft.AspNet.Hosting/Program.cs index a339fa9de9..03e470620c 100644 --- a/src/Microsoft.AspNet.Hosting/Program.cs +++ b/src/Microsoft.AspNet.Hosting/Program.cs @@ -5,7 +5,6 @@ using System; using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Security.DataProtection; using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection.Fallback; @@ -47,13 +46,6 @@ namespace Microsoft.AspNet.Hosting var serviceCollection = new ServiceCollection(); serviceCollection.Add(HostingServices.GetDefaultServices(config)); serviceCollection.AddInstance(hostingEnv); - // The application name is a "good enough" mechanism to identify this application - // on the machine and to prevent subkeys from being shared across multiple applications - // by default. - serviceCollection.Configure(options => - { - options.ApplicationDiscriminator = appEnv.ApplicationName; - }); var services = serviceCollection.BuildServiceProvider(_serviceProvider); diff --git a/src/Microsoft.AspNet.Hosting/project.json b/src/Microsoft.AspNet.Hosting/project.json index 7bd0c8398b..e39c50689a 100644 --- a/src/Microsoft.AspNet.Hosting/project.json +++ b/src/Microsoft.AspNet.Hosting/project.json @@ -3,7 +3,6 @@ "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.", "dependencies": { "Microsoft.AspNet.PipelineCore": "1.0.0-*", - "Microsoft.AspNet.Security.DataProtection": "1.0.0-*", "Microsoft.Framework.Logging": "1.0.0-*", "Microsoft.Framework.OptionsModel": "1.0.0-*", "Microsoft.Framework.Runtime.Interfaces": { "version": "1.0.0-*", "type": "build" },