diff --git a/Hosting.sln b/Hosting.sln
index bc1fc41d75..cccee8976f 100644
--- a/Hosting.sln
+++ b/Hosting.sln
@@ -1,34 +1,32 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26424.2
+VisualStudioVersion = 15.0.26228.9
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E0497F39-AFFB-4819-A116-E39E361915AB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FEB39027-9158-4DE2-997F-7ADAEF8188D0}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.TestHost.Tests", "test\Microsoft.AspNetCore.TestHost.Tests\Microsoft.AspNetCore.TestHost.Tests.csproj", "{0ACB2719-9484-49B5-B8E3-117091192511}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost.Tests", "test\Microsoft.AspNetCore.TestHost.Tests\Microsoft.AspNetCore.TestHost.Tests.csproj", "{0ACB2719-9484-49B5-B8E3-117091192511}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.TestHost", "src\Microsoft.AspNetCore.TestHost\Microsoft.AspNetCore.TestHost.csproj", "{1A415A3F-1081-45DB-809B-EE19CEA02DC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "src\Microsoft.AspNetCore.TestHost\Microsoft.AspNetCore.TestHost.csproj", "{1A415A3F-1081-45DB-809B-EE19CEA02DC0}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Hosting", "src\Microsoft.AspNetCore.Hosting\Microsoft.AspNetCore.Hosting.csproj", "{3944F036-7E75-47E8-AA52-C4B89A64EC3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "src\Microsoft.AspNetCore.Hosting\Microsoft.AspNetCore.Hosting.csproj", "{3944F036-7E75-47E8-AA52-C4B89A64EC3A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Hosting.Tests", "test\Microsoft.AspNetCore.Hosting.Tests\Microsoft.AspNetCore.Hosting.Tests.csproj", "{D4F18D58-52B1-435D-A012-10F2CDF158C4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Tests", "test\Microsoft.AspNetCore.Hosting.Tests\Microsoft.AspNetCore.Hosting.Tests.csproj", "{D4F18D58-52B1-435D-A012-10F2CDF158C4}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Hosting.Abstractions", "src\Microsoft.AspNetCore.Hosting.Abstractions\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{BB780FBB-7842-4759-8DE7-96FA2E5571C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "src\Microsoft.AspNetCore.Hosting.Abstractions\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{BB780FBB-7842-4759-8DE7-96FA2E5571C1}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "src\Microsoft.AspNetCore.Hosting.Server.Abstractions\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj", "{FDBBA081-5248-4FC0-9E08-B46BEF3FA438}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "src\Microsoft.AspNetCore.Hosting.Server.Abstractions\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj", "{FDBBA081-5248-4FC0-9E08-B46BEF3FA438}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "src\Microsoft.AspNetCore.Server.IntegrationTesting\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{3DA89347-6731-4366-80C4-548F24E8607B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "src\Microsoft.AspNetCore.Server.IntegrationTesting\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{3DA89347-6731-4366-80C4-548F24E8607B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9C7520A0-F2EB-411C-8BB2-80B39C937217}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleStartups", "samples\SampleStartups\SampleStartups.csproj", "{485B6745-7648-400A-A969-F68FCF194E46}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleStartups", "samples\SampleStartups\SampleStartups.csproj", "{485B6745-7648-400A-A969-F68FCF194E46}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Hosting.WindowsServices", "src\Microsoft.AspNetCore.Hosting.WindowsServices\Microsoft.AspNetCore.Hosting.WindowsServices.csproj", "{03148731-EA95-40A2-BAE8-A12315EA1748}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.FunctionalTests", "test\Microsoft.AspNetCore.Hosting.FunctionalTests\Microsoft.AspNetCore.Hosting.FunctionalTests.csproj", "{FC578F4E-171C-4F82-B301-3ABF6318D082}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Hosting.FunctionalTests", "test\Microsoft.AspNetCore.Hosting.FunctionalTests\Microsoft.AspNetCore.Hosting.FunctionalTests.csproj", "{FC578F4E-171C-4F82-B301-3ABF6318D082}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Hosting.TestSites", "test\Microsoft.AspNetCore.Hosting.TestSites\Microsoft.AspNetCore.Hosting.TestSites.csproj", "{542D4600-B232-4B17-A08C-E31EBFA0D74E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.TestSites", "test\Microsoft.AspNetCore.Hosting.TestSites\Microsoft.AspNetCore.Hosting.TestSites.csproj", "{542D4600-B232-4B17-A08C-E31EBFA0D74E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStartupAssembly1", "test\TestStartupAssembly1\TestStartupAssembly1.csproj", "{39D3B138-37DB-4D03-A5A0-3F2B02EFC671}"
EndProject
@@ -132,18 +130,6 @@ Global
{485B6745-7648-400A-A969-F68FCF194E46}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{485B6745-7648-400A-A969-F68FCF194E46}.Release|x86.ActiveCfg = Release|Any CPU
{485B6745-7648-400A-A969-F68FCF194E46}.Release|x86.Build.0 = Release|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Debug|x86.ActiveCfg = Debug|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Debug|x86.Build.0 = Debug|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Release|Any CPU.Build.0 = Release|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Release|x86.ActiveCfg = Release|Any CPU
- {03148731-EA95-40A2-BAE8-A12315EA1748}.Release|x86.Build.0 = Release|Any CPU
{FC578F4E-171C-4F82-B301-3ABF6318D082}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FC578F4E-171C-4F82-B301-3ABF6318D082}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FC578F4E-171C-4F82-B301-3ABF6318D082}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -205,7 +191,6 @@ Global
{FDBBA081-5248-4FC0-9E08-B46BEF3FA438} = {E0497F39-AFFB-4819-A116-E39E361915AB}
{3DA89347-6731-4366-80C4-548F24E8607B} = {E0497F39-AFFB-4819-A116-E39E361915AB}
{485B6745-7648-400A-A969-F68FCF194E46} = {9C7520A0-F2EB-411C-8BB2-80B39C937217}
- {03148731-EA95-40A2-BAE8-A12315EA1748} = {E0497F39-AFFB-4819-A116-E39E361915AB}
{FC578F4E-171C-4F82-B301-3ABF6318D082} = {FEB39027-9158-4DE2-997F-7ADAEF8188D0}
{542D4600-B232-4B17-A08C-E31EBFA0D74E} = {FEB39027-9158-4DE2-997F-7ADAEF8188D0}
{39D3B138-37DB-4D03-A5A0-3F2B02EFC671} = {FEB39027-9158-4DE2-997F-7ADAEF8188D0}
diff --git a/samples/SampleStartups/SampleStartups.csproj b/samples/SampleStartups/SampleStartups.csproj
index 23f037440d..c090c5bdea 100644
--- a/samples/SampleStartups/SampleStartups.csproj
+++ b/samples/SampleStartups/SampleStartups.csproj
@@ -3,7 +3,7 @@
- net46;netcoreapp2.0
+ netcoreapp2.0
SampleStartups.StartupInjection
exe
diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj b/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj
index 14e9c22b11..910262a023 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj
@@ -4,7 +4,7 @@
ASP.NET Core hosting and startup abstractions for web applications.
- netstandard1.3
+ netcoreapp2.0
$(NoWarn);CS1591
true
aspnetcore;hosting
diff --git a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj
index 60cd091d4a..8641009420 100644
--- a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj
+++ b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj
@@ -4,7 +4,7 @@
ASP.NET Core hosting server abstractions for web applications.
- netstandard1.3
+ netcoreapp2.0
$(NoWarn);CS1591
true
aspnetcore;hosting
diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.csproj b/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.csproj
deleted file mode 100644
index 1623ac665a..0000000000
--- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
- ASP.NET Core hosting infrastructure and startup logic for web applications running within a Windows service.
- net46
- $(NoWarn);CS1591
- true
- aspnetcore;hosting
-
-
-
-
-
-
-
-
diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs b/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs
deleted file mode 100644
index f8121e5dce..0000000000
--- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs
+++ /dev/null
@@ -1,76 +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.ServiceProcess;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Microsoft.AspNetCore.Hosting.WindowsServices
-{
- ///
- /// Provides an implementation of a Windows service that hosts ASP.NET Core.
- ///
- public class WebHostService : ServiceBase
- {
- private IWebHost _host;
- private bool _stopRequestedByWindows;
-
- ///
- /// Creates an instance of WebHostService which hosts the specified web application.
- ///
- /// The configured web host containing the web application to host in the Windows service.
- public WebHostService(IWebHost host)
- {
- _host = host;
- }
-
- protected sealed override void OnStart(string[] args)
- {
- OnStarting(args);
-
- _host
- .Services
- .GetRequiredService()
- .ApplicationStopped
- .Register(() =>
- {
- if (!_stopRequestedByWindows)
- {
- Stop();
- }
- });
-
- _host.Start();
-
- OnStarted();
- }
-
- protected sealed override void OnStop()
- {
- _stopRequestedByWindows = true;
- OnStopping();
- _host?.Dispose();
- OnStopped();
- }
-
- ///
- /// Executes before ASP.NET Core starts.
- ///
- /// The command line arguments passed to the service.
- protected virtual void OnStarting(string[] args) { }
-
- ///
- /// Executes after ASP.NET Core starts.
- ///
- protected virtual void OnStarted() { }
-
- ///
- /// Executes before ASP.NET Core shuts down.
- ///
- protected virtual void OnStopping() { }
-
- ///
- /// Executes after ASP.NET Core shuts down.
- ///
- protected virtual void OnStopped() { }
- }
-}
diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostWindowsServiceExtensions.cs b/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostWindowsServiceExtensions.cs
deleted file mode 100644
index 9e657fbe3e..0000000000
--- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostWindowsServiceExtensions.cs
+++ /dev/null
@@ -1,42 +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.ServiceProcess;
-
-namespace Microsoft.AspNetCore.Hosting.WindowsServices
-{
- ///
- /// Extensions to for hosting inside a Windows service.
- ///
- public static class WebHostWindowsServiceExtensions
- {
- ///
- /// Runs the specified web application inside a Windows service and blocks until the service is stopped.
- ///
- /// An instance of the to host in the Windows service.
- ///
- /// This example shows how to use .
- ///
- /// public class Program
- /// {
- /// public static void Main(string[] args)
- /// {
- /// var config = WebHostConfiguration.GetDefault(args);
- ///
- /// var host = new WebHostBuilder()
- /// .UseConfiguration(config)
- /// .Build();
- ///
- /// // This call will block until the service is stopped.
- /// host.RunAsService();
- /// }
- /// }
- ///
- ///
- public static void RunAsService(this IWebHost host)
- {
- var webHostService = new WebHostService(host);
- ServiceBase.Run(webHostService);
- }
- }
-}
diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/baseline.netframework.json b/src/Microsoft.AspNetCore.Hosting.WindowsServices/baseline.netframework.json
deleted file mode 100644
index ec158c87ac..0000000000
--- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/baseline.netframework.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
- "AssemblyIdentity": "Microsoft.AspNetCore.Hosting.WindowsServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
- "Types": [
- {
- "Name": "Microsoft.AspNetCore.Hosting.WindowsServices.WebHostService",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "System.ServiceProcess.ServiceBase",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "OnStart",
- "Parameters": [
- {
- "Name": "args",
- "Type": "System.String[]"
- }
- ],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "Override": true,
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "OnStop",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "Override": true,
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "OnStarting",
- "Parameters": [
- {
- "Name": "args",
- "Type": "System.String[]"
- }
- ],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "OnStarted",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "OnStopping",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "OnStopped",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "host",
- "Type": "Microsoft.AspNetCore.Hosting.IWebHost"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.WindowsServices.WebHostWindowsServiceExtensions",
- "Visibility": "Public",
- "Kind": "Class",
- "Abstract": true,
- "Static": true,
- "Sealed": true,
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "RunAsService",
- "Parameters": [
- {
- "Name": "host",
- "Type": "Microsoft.AspNetCore.Hosting.IWebHost"
- }
- ],
- "ReturnType": "System.Void",
- "Static": true,
- "Extension": true,
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
index 67163831a4..68b333bab2 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
@@ -205,18 +205,13 @@ namespace Microsoft.AspNetCore.Hosting.Internal
var hostingEnv = _applicationServices.GetRequiredService();
var showDetailedErrors = hostingEnv.IsDevelopment() || _options.DetailedErrors;
- var model = new ErrorPageModel();
- var runtimeType = Microsoft.Extensions.Internal.RuntimeEnvironment.RuntimeType;
- model.RuntimeDisplayName = (runtimeType == "CoreCLR") ? ".NET Core" : runtimeType == "CLR" ? ".NET Framework" : "Mono";
-#if NETSTANDARD1_3 || NETSTANDARD1_5
+ var model = new ErrorPageModel
+ {
+ RuntimeDisplayName = ".NET Core"
+ };
var systemRuntimeAssembly = typeof(System.ComponentModel.DefaultValueAttribute).GetTypeInfo().Assembly;
var assemblyVersion = new AssemblyName(systemRuntimeAssembly.FullName).Version.ToString();
var clrVersion = assemblyVersion;
-#elif NET46
- var clrVersion = Environment.Version.ToString();
-#else
-#error Target frameworks need to be updated.
-#endif
model.RuntimeArchitecture = RuntimeInformation.ProcessArchitecture.ToString();
var currentAssembly = typeof(ErrorPage).GetTypeInfo().Assembly;
model.CurrentAssemblyVesion = currentAssembly
diff --git a/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj b/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj
index 738004360f..86bffba83e 100644
--- a/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj
+++ b/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj
@@ -4,7 +4,7 @@
ASP.NET Core hosting infrastructure and startup logic for web applications.
- netstandard1.3;netstandard1.5
+ netcoreapp2.0
$(NoWarn);CS1591
true
aspnetcore;hosting
@@ -35,10 +35,6 @@
-
-
-
-
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs b/src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs
index 37f139c7fd..167668dcd2 100644
--- a/src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs
+++ b/src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs
@@ -2,10 +2,8 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
-#if NETSTANDARD1_5
using System.Reflection;
using System.Runtime.Loader;
-#endif
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting.Server.Features;
@@ -92,13 +90,8 @@ namespace Microsoft.AspNetCore.Hosting
done.Wait();
};
-#if NETSTANDARD1_5
var assemblyLoadContext = AssemblyLoadContext.GetLoadContext(typeof(WebHostExtensions).GetTypeInfo().Assembly);
assemblyLoadContext.Unloading += context => shutdown();
-#elif NETSTANDARD1_3
-#else
-#error Target frameworks need to be updated.
-#endif
Console.CancelKeyPress += (sender, eventArgs) =>
{
shutdown();
diff --git a/src/Microsoft.AspNetCore.Hosting/baseline.net45.json b/src/Microsoft.AspNetCore.Hosting/baseline.net45.json
deleted file mode 100644
index a40523b168..0000000000
--- a/src/Microsoft.AspNetCore.Hosting/baseline.net45.json
+++ /dev/null
@@ -1,1525 +0,0 @@
-{
- "AssemblyIdentity": "Microsoft.AspNetCore.Hosting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
- "Types": [
- {
- "Name": "Microsoft.AspNetCore.Hosting.WebHostBuilder",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Hosting.IWebHostBuilder"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "UseSetting",
- "Parameters": [
- {
- "Name": "key",
- "Type": "System.String"
- },
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "GetSetting",
- "Parameters": [
- {
- "Name": "key",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.String",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "UseLoggerFactory",
- "Parameters": [
- {
- "Name": "loggerFactory",
- "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "ConfigureServices",
- "Parameters": [
- {
- "Name": "configureServices",
- "Type": "System.Action"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "ConfigureLogging",
- "Parameters": [
- {
- "Name": "configureLogging",
- "Type": "System.Action"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Build",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHost",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.WebHostBuilderExtensions",
- "Visibility": "Public",
- "Kind": "Class",
- "Abstract": true,
- "Static": true,
- "Sealed": true,
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Configure",
- "Parameters": [
- {
- "Name": "hostBuilder",
- "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder"
- },
- {
- "Name": "configureApp",
- "Type": "System.Action"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Static": true,
- "Extension": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "UseStartup",
- "Parameters": [
- {
- "Name": "hostBuilder",
- "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder"
- },
- {
- "Name": "startupType",
- "Type": "System.Type"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Static": true,
- "Extension": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "UseStartup",
- "Parameters": [
- {
- "Name": "hostBuilder",
- "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
- "Static": true,
- "Extension": true,
- "Visibility": "Public",
- "GenericParameter": [
- {
- "ParameterName": "TStartup",
- "ParameterPosition": 0,
- "Class": true,
- "BaseTypeOrInterfaces": []
- }
- ]
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.WebHostExtensions",
- "Visibility": "Public",
- "Kind": "Class",
- "Abstract": true,
- "Static": true,
- "Sealed": true,
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Run",
- "Parameters": [
- {
- "Name": "host",
- "Type": "Microsoft.AspNetCore.Hosting.IWebHost"
- }
- ],
- "ReturnType": "System.Void",
- "Static": true,
- "Extension": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Run",
- "Parameters": [
- {
- "Name": "host",
- "Type": "Microsoft.AspNetCore.Hosting.IWebHost"
- },
- {
- "Name": "token",
- "Type": "System.Threading.CancellationToken"
- }
- ],
- "ReturnType": "System.Void",
- "Static": true,
- "Extension": true,
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.ConventionBasedStartup",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Hosting.IStartup"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Configure",
- "Parameters": [
- {
- "Name": "app",
- "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
- }
- ],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IStartup",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "ConfigureServices",
- "Parameters": [
- {
- "Name": "services",
- "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
- }
- ],
- "ReturnType": "System.IServiceProvider",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IStartup",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "methods",
- "Type": "Microsoft.AspNetCore.Hosting.Internal.StartupMethods"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.DelegateStartup",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "Microsoft.AspNetCore.Hosting.StartupBase",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Configure",
- "Parameters": [
- {
- "Name": "app",
- "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
- }
- ],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Override": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IStartup",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "configureApp",
- "Type": "System.Action"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.StartupBase",
- "Visibility": "Public",
- "Kind": "Class",
- "Abstract": true,
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Hosting.IStartup"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Configure",
- "Parameters": [
- {
- "Name": "app",
- "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
- }
- ],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Abstract": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IStartup",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "ConfigureServices",
- "Parameters": [
- {
- "Name": "services",
- "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
- }
- ],
- "ReturnType": "System.IServiceProvider",
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IStartup",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Protected",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Server.Features.ServerAddressesFeature",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_Addresses",
- "Parameters": [],
- "ReturnType": "System.Collections.Generic.ICollection",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.ApplicationLifetime",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Hosting.IApplicationLifetime"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_ApplicationStarted",
- "Parameters": [],
- "ReturnType": "System.Threading.CancellationToken",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IApplicationLifetime",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ApplicationStopping",
- "Parameters": [],
- "ReturnType": "System.Threading.CancellationToken",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IApplicationLifetime",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ApplicationStopped",
- "Parameters": [],
- "ReturnType": "System.Threading.CancellationToken",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IApplicationLifetime",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "StopApplication",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IApplicationLifetime",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "NotifyStarted",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "NotifyStopped",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.AutoRequestServicesStartupFilter",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Hosting.IStartupFilter"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Configure",
- "Parameters": [
- {
- "Name": "next",
- "Type": "System.Action"
- }
- ],
- "ReturnType": "System.Action",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IStartupFilter",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.ConfigureBuilder",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_MethodInfo",
- "Parameters": [],
- "ReturnType": "System.Reflection.MethodInfo",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Build",
- "Parameters": [
- {
- "Name": "instance",
- "Type": "System.Object"
- }
- ],
- "ReturnType": "System.Action",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "configure",
- "Type": "System.Reflection.MethodInfo"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.ConfigureServicesBuilder",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_MethodInfo",
- "Parameters": [],
- "ReturnType": "System.Reflection.MethodInfo",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Build",
- "Parameters": [
- {
- "Name": "instance",
- "Type": "System.Object"
- }
- ],
- "ReturnType": "System.Func",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "configureServices",
- "Type": "System.Reflection.MethodInfo"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.HostingApplication",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Hosting.Server.IHttpApplication"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "CreateContext",
- "Parameters": [
- {
- "Name": "contextFeatures",
- "Type": "Microsoft.AspNetCore.Http.Features.IFeatureCollection"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Hosting.Internal.HostingApplication+Context",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.Server.IHttpApplication",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "DisposeContext",
- "Parameters": [
- {
- "Name": "context",
- "Type": "Microsoft.AspNetCore.Hosting.Internal.HostingApplication+Context"
- },
- {
- "Name": "exception",
- "Type": "System.Exception"
- }
- ],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.Server.IHttpApplication",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "ProcessRequestAsync",
- "Parameters": [
- {
- "Name": "context",
- "Type": "Microsoft.AspNetCore.Hosting.Internal.HostingApplication+Context"
- }
- ],
- "ReturnType": "System.Threading.Tasks.Task",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.Server.IHttpApplication",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "application",
- "Type": "Microsoft.AspNetCore.Http.RequestDelegate"
- },
- {
- "Name": "logger",
- "Type": "Microsoft.Extensions.Logging.ILogger"
- },
- {
- "Name": "diagnosticSource",
- "Type": "System.Diagnostics.DiagnosticSource"
- },
- {
- "Name": "httpContextFactory",
- "Type": "Microsoft.AspNetCore.Http.IHttpContextFactory"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.HostingEnvironment",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Hosting.IHostingEnvironment"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_EnvironmentName",
- "Parameters": [],
- "ReturnType": "System.String",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_EnvironmentName",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ApplicationName",
- "Parameters": [],
- "ReturnType": "System.String",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ApplicationName",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_WebRootPath",
- "Parameters": [],
- "ReturnType": "System.String",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_WebRootPath",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_WebRootFileProvider",
- "Parameters": [],
- "ReturnType": "Microsoft.Extensions.FileProviders.IFileProvider",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_WebRootFileProvider",
- "Parameters": [
- {
- "Name": "value",
- "Type": "Microsoft.Extensions.FileProviders.IFileProvider"
- }
- ],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ContentRootPath",
- "Parameters": [],
- "ReturnType": "System.String",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ContentRootPath",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ContentRootFileProvider",
- "Parameters": [],
- "ReturnType": "Microsoft.Extensions.FileProviders.IFileProvider",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ContentRootFileProvider",
- "Parameters": [
- {
- "Name": "value",
- "Type": "Microsoft.Extensions.FileProviders.IFileProvider"
- }
- ],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.HostingEnvironmentExtensions",
- "Visibility": "Public",
- "Kind": "Class",
- "Abstract": true,
- "Static": true,
- "Sealed": true,
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Initialize",
- "Parameters": [
- {
- "Name": "hostingEnvironment",
- "Type": "Microsoft.AspNetCore.Hosting.IHostingEnvironment"
- },
- {
- "Name": "applicationName",
- "Type": "System.String"
- },
- {
- "Name": "contentRootPath",
- "Type": "System.String"
- },
- {
- "Name": "options",
- "Type": "Microsoft.AspNetCore.Hosting.Internal.WebHostOptions"
- }
- ],
- "ReturnType": "System.Void",
- "Static": true,
- "Extension": true,
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.RequestServicesContainerMiddleware",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Invoke",
- "Parameters": [
- {
- "Name": "httpContext",
- "Type": "Microsoft.AspNetCore.Http.HttpContext"
- }
- ],
- "ReturnType": "System.Threading.Tasks.Task",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "next",
- "Type": "Microsoft.AspNetCore.Http.RequestDelegate"
- },
- {
- "Name": "scopeFactory",
- "Type": "Microsoft.Extensions.DependencyInjection.IServiceScopeFactory"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.RequestServicesFeature",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature",
- "System.IDisposable"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_RequestServices",
- "Parameters": [],
- "ReturnType": "System.IServiceProvider",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_RequestServices",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.IServiceProvider"
- }
- ],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Dispose",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "System.IDisposable",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "scopeFactory",
- "Type": "Microsoft.Extensions.DependencyInjection.IServiceScopeFactory"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.StartupLoader",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "LoadMethods",
- "Parameters": [
- {
- "Name": "services",
- "Type": "System.IServiceProvider"
- },
- {
- "Name": "startupType",
- "Type": "System.Type"
- },
- {
- "Name": "environmentName",
- "Type": "System.String"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Hosting.Internal.StartupMethods",
- "Static": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "FindStartupType",
- "Parameters": [
- {
- "Name": "startupAssemblyName",
- "Type": "System.String"
- },
- {
- "Name": "environmentName",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Type",
- "Static": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.StartupMethods",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_ConfigureServicesDelegate",
- "Parameters": [],
- "ReturnType": "System.Func",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ConfigureDelegate",
- "Parameters": [],
- "ReturnType": "System.Action",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "configure",
- "Type": "System.Action"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "configure",
- "Type": "System.Action"
- },
- {
- "Name": "configureServices",
- "Type": "System.Func"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.WebHost",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Hosting.IWebHost"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_Services",
- "Parameters": [],
- "ReturnType": "System.IServiceProvider",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IWebHost",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ServerFeatures",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Http.Features.IFeatureCollection",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IWebHost",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Initialize",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Start",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IWebHost",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Dispose",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "System.IDisposable",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "appServices",
- "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
- },
- {
- "Name": "hostingServiceProvider",
- "Type": "System.IServiceProvider"
- },
- {
- "Name": "options",
- "Type": "Microsoft.AspNetCore.Hosting.Internal.WebHostOptions"
- },
- {
- "Name": "config",
- "Type": "Microsoft.Extensions.Configuration.IConfiguration"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.WebHostOptions",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_ApplicationName",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ApplicationName",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_DetailedErrors",
- "Parameters": [],
- "ReturnType": "System.Boolean",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_DetailedErrors",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.Boolean"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_CaptureStartupErrors",
- "Parameters": [],
- "ReturnType": "System.Boolean",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_CaptureStartupErrors",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.Boolean"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_Environment",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_Environment",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_StartupAssembly",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_StartupAssembly",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_WebRoot",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_WebRoot",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ContentRootPath",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ContentRootPath",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "configuration",
- "Type": "Microsoft.Extensions.Configuration.IConfiguration"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Builder.ApplicationBuilderFactory",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Hosting.Builder.IApplicationBuilderFactory"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "CreateBuilder",
- "Parameters": [
- {
- "Name": "serverFeatures",
- "Type": "Microsoft.AspNetCore.Http.Features.IFeatureCollection"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Hosting.Builder.IApplicationBuilderFactory",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "serviceProvider",
- "Type": "System.IServiceProvider"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Builder.IApplicationBuilderFactory",
- "Visibility": "Public",
- "Kind": "Interface",
- "Abstract": true,
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "CreateBuilder",
- "Parameters": [
- {
- "Name": "serverFeatures",
- "Type": "Microsoft.AspNetCore.Http.Features.IFeatureCollection"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Hosting.Internal.HostingApplication+Context",
- "Visibility": "Public",
- "Kind": "Struct",
- "Sealed": true,
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_HttpContext",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_HttpContext",
- "Parameters": [
- {
- "Name": "value",
- "Type": "Microsoft.AspNetCore.Http.HttpContext"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_Scope",
- "Parameters": [],
- "ReturnType": "System.IDisposable",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_Scope",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.IDisposable"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_StartTimestamp",
- "Parameters": [],
- "ReturnType": "System.Int64",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_StartTimestamp",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.Int64"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.Extensions.Internal.Native.NativeMethods+Windows",
- "Visibility": "Public",
- "Kind": "Class",
- "Abstract": true,
- "Static": true,
- "Sealed": true,
- "ImplementedInterfaces": [],
- "Members": [],
- "GenericParameters": []
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs
index 46f84ee494..a51004fe9b 100644
--- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs
@@ -56,14 +56,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
}
else
{
- if (exception is HttpRequestException
-#if NET46
- || exception is System.Net.WebException
-#elif NETSTANDARD1_5
-#else
-#error Target frameworks need to be updated.
-#endif
- )
+ if (exception is HttpRequestException)
{
logger.LogWarning("Failed to complete the request : {0}.", exception.Message);
await Task.Delay(1 * 1000); //Wait for a while before retry.
diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj
index 7901a30fed..d5ec92df30 100644
--- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj
@@ -5,7 +5,7 @@
ASP.NET Core helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing.
0.4.0
- net46;netstandard1.5
+ netcoreapp2.0
$(NoWarn);CS1591
true
aspnetcore;testing
@@ -30,15 +30,4 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/baseline.net45.json b/src/Microsoft.AspNetCore.Server.IntegrationTesting/baseline.net45.json
deleted file mode 100644
index d67de60ec5..0000000000
--- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/baseline.net45.json
+++ /dev/null
@@ -1,1367 +0,0 @@
-{
- "AssemblyIdentity": "Microsoft.AspNetCore.Server.IntegrationTesting, Version=0.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
- "Types": [
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.ApplicationType",
- "Visibility": "Public",
- "Kind": "Enumeration",
- "Sealed": true,
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Field",
- "Name": "Portable",
- "Parameters": [],
- "GenericParameter": [],
- "Literal": "0"
- },
- {
- "Kind": "Field",
- "Name": "Standalone",
- "Parameters": [],
- "GenericParameter": [],
- "Literal": "1"
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.DeploymentParameters",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_ServerType",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.ServerType",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_RuntimeFlavor",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.RuntimeFlavor",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_RuntimeArchitecture",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.RuntimeArchitecture",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ApplicationBaseUriHint",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ApplicationBaseUriHint",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_EnvironmentName",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_EnvironmentName",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ServerConfigTemplateContent",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ServerConfigTemplateContent",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ServerConfigLocation",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ServerConfigLocation",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_SiteName",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_SiteName",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ApplicationPath",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_TargetFramework",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_TargetFramework",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_PublishApplicationBeforeDeployment",
- "Parameters": [],
- "ReturnType": "System.Boolean",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_PublishApplicationBeforeDeployment",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.Boolean"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ApplicationType",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.ApplicationType",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ApplicationType",
- "Parameters": [
- {
- "Name": "value",
- "Type": "Microsoft.AspNetCore.Server.Testing.ApplicationType"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_PublishedApplicationRootPath",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_PublishedApplicationRootPath",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_EnvironmentVariables",
- "Parameters": [],
- "ReturnType": "System.Collections.Generic.List>",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_UserAdditionalCleanup",
- "Parameters": [],
- "ReturnType": "System.Action",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_UserAdditionalCleanup",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.Action"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "ToString",
- "Parameters": [],
- "ReturnType": "System.String",
- "Virtual": true,
- "Override": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "applicationPath",
- "Type": "System.String"
- },
- {
- "Name": "serverType",
- "Type": "Microsoft.AspNetCore.Server.Testing.ServerType"
- },
- {
- "Name": "runtimeFlavor",
- "Type": "Microsoft.AspNetCore.Server.Testing.RuntimeFlavor"
- },
- {
- "Name": "runtimeArchitecture",
- "Type": "Microsoft.AspNetCore.Server.Testing.RuntimeArchitecture"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.DeploymentResult",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_ApplicationBaseUri",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ApplicationBaseUri",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ContentRoot",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ContentRoot",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_DeploymentParameters",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.DeploymentParameters",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_DeploymentParameters",
- "Parameters": [
- {
- "Name": "value",
- "Type": "Microsoft.AspNetCore.Server.Testing.DeploymentParameters"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_HostShutdownToken",
- "Parameters": [],
- "ReturnType": "System.Threading.CancellationToken",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_HostShutdownToken",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.Threading.CancellationToken"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.RetryHelper",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "RetryRequest",
- "Parameters": [
- {
- "Name": "retryBlock",
- "Type": "System.Func>"
- },
- {
- "Name": "logger",
- "Type": "Microsoft.Extensions.Logging.ILogger"
- },
- {
- "Name": "cancellationToken",
- "Type": "System.Threading.CancellationToken",
- "DefaultValue": "default(System.Threading.CancellationToken)"
- },
- {
- "Name": "retryCount",
- "Type": "System.Int32",
- "DefaultValue": "60"
- }
- ],
- "ReturnType": "System.Threading.Tasks.Task",
- "Static": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.RuntimeArchitecture",
- "Visibility": "Public",
- "Kind": "Enumeration",
- "Sealed": true,
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Field",
- "Name": "x64",
- "Parameters": [],
- "GenericParameter": [],
- "Literal": "0"
- },
- {
- "Kind": "Field",
- "Name": "x86",
- "Parameters": [],
- "GenericParameter": [],
- "Literal": "1"
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.RuntimeFlavor",
- "Visibility": "Public",
- "Kind": "Enumeration",
- "Sealed": true,
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Field",
- "Name": "Clr",
- "Parameters": [],
- "GenericParameter": [],
- "Literal": "0"
- },
- {
- "Kind": "Field",
- "Name": "CoreClr",
- "Parameters": [],
- "GenericParameter": [],
- "Literal": "1"
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.ServerType",
- "Visibility": "Public",
- "Kind": "Enumeration",
- "Sealed": true,
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Field",
- "Name": "IISExpress",
- "Parameters": [],
- "GenericParameter": [],
- "Literal": "0"
- },
- {
- "Kind": "Field",
- "Name": "IIS",
- "Parameters": [],
- "GenericParameter": [],
- "Literal": "1"
- },
- {
- "Kind": "Field",
- "Name": "WebListener",
- "Parameters": [],
- "GenericParameter": [],
- "Literal": "2"
- },
- {
- "Kind": "Field",
- "Name": "Kestrel",
- "Parameters": [],
- "GenericParameter": [],
- "Literal": "3"
- },
- {
- "Kind": "Field",
- "Name": "Nginx",
- "Parameters": [],
- "GenericParameter": [],
- "Literal": "4"
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.ApplicationDeployer",
- "Visibility": "Public",
- "Kind": "Class",
- "Abstract": true,
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Server.Testing.IApplicationDeployer"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_DeploymentParameters",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.DeploymentParameters",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_Logger",
- "Parameters": [],
- "ReturnType": "Microsoft.Extensions.Logging.ILogger",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Deploy",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.DeploymentResult",
- "Virtual": true,
- "Abstract": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Server.Testing.IApplicationDeployer",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "DotnetPublish",
- "Parameters": [
- {
- "Name": "publishRoot",
- "Type": "System.String",
- "DefaultValue": "null"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "CleanPublishedOutput",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "ShutDownIfAnyHostProcess",
- "Parameters": [
- {
- "Name": "hostProcess",
- "Type": "System.Diagnostics.Process"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "AddEnvironmentVariablesToProcess",
- "Parameters": [
- {
- "Name": "startInfo",
- "Type": "System.Diagnostics.ProcessStartInfo"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "SetEnvironmentVariable",
- "Parameters": [
- {
- "Name": "environment",
- "Type": "System.Collections.Specialized.StringDictionary"
- },
- {
- "Name": "name",
- "Type": "System.String"
- },
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "InvokeUserApplicationCleanup",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "TriggerHostShutdown",
- "Parameters": [
- {
- "Name": "hostShutdownSource",
- "Type": "System.Threading.CancellationTokenSource"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "StartTimer",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "StopTimer",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Dispose",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Abstract": true,
- "ImplementedInterface": "System.IDisposable",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "GetOSPrefix",
- "Parameters": [],
- "ReturnType": "System.String",
- "Static": true,
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "deploymentParameters",
- "Type": "Microsoft.AspNetCore.Server.Testing.DeploymentParameters"
- },
- {
- "Name": "logger",
- "Type": "Microsoft.Extensions.Logging.ILogger"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Field",
- "Name": "DotnetCommandName",
- "Parameters": [],
- "ReturnType": "System.String",
- "Static": true,
- "ReadOnly": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Field",
- "Name": "DotnetArgumentSeparator",
- "Parameters": [],
- "ReturnType": "System.String",
- "Static": true,
- "ReadOnly": true,
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.ApplicationDeployerFactory",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Create",
- "Parameters": [
- {
- "Name": "deploymentParameters",
- "Type": "Microsoft.AspNetCore.Server.Testing.DeploymentParameters"
- },
- {
- "Name": "logger",
- "Type": "Microsoft.Extensions.Logging.ILogger"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.IApplicationDeployer",
- "Static": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.IApplicationDeployer",
- "Visibility": "Public",
- "Kind": "Interface",
- "Abstract": true,
- "ImplementedInterfaces": [
- "System.IDisposable"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Deploy",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.DeploymentResult",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.IISDeployer",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "Microsoft.AspNetCore.Server.Testing.ApplicationDeployer",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Deploy",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.DeploymentResult",
- "Virtual": true,
- "Override": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Server.Testing.IApplicationDeployer",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Dispose",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Override": true,
- "ImplementedInterface": "System.IDisposable",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "startParameters",
- "Type": "Microsoft.AspNetCore.Server.Testing.DeploymentParameters"
- },
- {
- "Name": "logger",
- "Type": "Microsoft.Extensions.Logging.ILogger"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.IISExpressDeployer",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "Microsoft.AspNetCore.Server.Testing.ApplicationDeployer",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Deploy",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.DeploymentResult",
- "Virtual": true,
- "Override": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Server.Testing.IApplicationDeployer",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Dispose",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Override": true,
- "ImplementedInterface": "System.IDisposable",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "deploymentParameters",
- "Type": "Microsoft.AspNetCore.Server.Testing.DeploymentParameters"
- },
- {
- "Name": "logger",
- "Type": "Microsoft.Extensions.Logging.ILogger"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.NginxDeployer",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "Microsoft.AspNetCore.Server.Testing.SelfHostDeployer",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Deploy",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.DeploymentResult",
- "Virtual": true,
- "Override": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Server.Testing.IApplicationDeployer",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Dispose",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Override": true,
- "ImplementedInterface": "System.IDisposable",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "deploymentParameters",
- "Type": "Microsoft.AspNetCore.Server.Testing.DeploymentParameters"
- },
- {
- "Name": "logger",
- "Type": "Microsoft.Extensions.Logging.ILogger"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.SelfHostDeployer",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "Microsoft.AspNetCore.Server.Testing.ApplicationDeployer",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Deploy",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.DeploymentResult",
- "Virtual": true,
- "Override": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Server.Testing.IApplicationDeployer",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "StartSelfHost",
- "Parameters": [
- {
- "Name": "uri",
- "Type": "System.Uri"
- }
- ],
- "ReturnType": "System.Threading.CancellationToken",
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Dispose",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Override": true,
- "ImplementedInterface": "System.IDisposable",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "deploymentParameters",
- "Type": "Microsoft.AspNetCore.Server.Testing.DeploymentParameters"
- },
- {
- "Name": "logger",
- "Type": "Microsoft.Extensions.Logging.ILogger"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.RemoteWindowsDeployer",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "Microsoft.AspNetCore.Server.Testing.ApplicationDeployer",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "Deploy",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Server.Testing.DeploymentResult",
- "Virtual": true,
- "Override": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Server.Testing.IApplicationDeployer",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Dispose",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Virtual": true,
- "Override": true,
- "ImplementedInterface": "System.IDisposable",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "deploymentParameters",
- "Type": "Microsoft.AspNetCore.Server.Testing.RemoteWindowsDeploymentParameters"
- },
- {
- "Name": "logger",
- "Type": "Microsoft.Extensions.Logging.ILogger"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.RemoteWindowsDeploymentParameters",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "Microsoft.AspNetCore.Server.Testing.DeploymentParameters",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_ServerName",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ServerAccountName",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ServerAccountPassword",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_DotnetRuntimePath",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_RemoteServerFileSharePath",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "applicationPath",
- "Type": "System.String"
- },
- {
- "Name": "dotnetRuntimePath",
- "Type": "System.String"
- },
- {
- "Name": "serverType",
- "Type": "Microsoft.AspNetCore.Server.Testing.ServerType"
- },
- {
- "Name": "runtimeFlavor",
- "Type": "Microsoft.AspNetCore.Server.Testing.RuntimeFlavor"
- },
- {
- "Name": "runtimeArchitecture",
- "Type": "Microsoft.AspNetCore.Server.Testing.RuntimeArchitecture"
- },
- {
- "Name": "remoteServerFileSharePath",
- "Type": "System.String"
- },
- {
- "Name": "remoteServerName",
- "Type": "System.String"
- },
- {
- "Name": "remoteServerAccountName",
- "Type": "System.String"
- },
- {
- "Name": "remoteServerAccountPassword",
- "Type": "System.String"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.SkipIfCurrentRuntimeIsCoreClrAttribute",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "System.Attribute",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Testing.xunit.ITestCondition"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_IsMet",
- "Parameters": [],
- "ReturnType": "System.Boolean",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Testing.xunit.ITestCondition",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_SkipReason",
- "Parameters": [],
- "ReturnType": "System.String",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Testing.xunit.ITestCondition",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.SkipIfEnvironmentVariableNotEnabledAttribute",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "System.Attribute",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Testing.xunit.ITestCondition"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_IsMet",
- "Parameters": [],
- "ReturnType": "System.Boolean",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Testing.xunit.ITestCondition",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_SkipReason",
- "Parameters": [],
- "ReturnType": "System.String",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Testing.xunit.ITestCondition",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_AdditionalInfo",
- "Parameters": [],
- "ReturnType": "System.String",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_AdditionalInfo",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "environmentVariableName",
- "Type": "System.String"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.SkipOn32BitOSAttribute",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "System.Attribute",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Testing.xunit.ITestCondition"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_IsMet",
- "Parameters": [],
- "ReturnType": "System.Boolean",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Testing.xunit.ITestCondition",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_SkipReason",
- "Parameters": [],
- "ReturnType": "System.String",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "Microsoft.AspNetCore.Testing.xunit.ITestCondition",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.Server.Testing.Common.TestUriHelper",
- "Visibility": "Public",
- "Kind": "Class",
- "Abstract": true,
- "Static": true,
- "Sealed": true,
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "BuildTestUri",
- "Parameters": [],
- "ReturnType": "System.Uri",
- "Static": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "BuildTestUri",
- "Parameters": [
- {
- "Name": "hint",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Uri",
- "Static": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "FindFreePort",
- "Parameters": [],
- "ReturnType": "System.Int32",
- "Static": true,
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "FindFreePort",
- "Parameters": [
- {
- "Name": "initialPort",
- "Type": "System.Int32"
- }
- ],
- "ReturnType": "System.Int32",
- "Static": true,
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.csproj b/src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.csproj
index 24ec0ff0ab..81cee25977 100644
--- a/src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.csproj
+++ b/src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.csproj
@@ -4,7 +4,7 @@
ASP.NET Core web server for writing and running tests.
- netstandard1.3;net46
+ netcoreapp2.0
$(NoWarn);CS1591
true
aspnetcore;hosting;testing
@@ -14,8 +14,4 @@
-
-
-
-
diff --git a/src/Microsoft.AspNetCore.TestHost/ResponseStream.cs b/src/Microsoft.AspNetCore.TestHost/ResponseStream.cs
index f1c4e5eff3..9471e5e872 100644
--- a/src/Microsoft.AspNetCore.TestHost/ResponseStream.cs
+++ b/src/Microsoft.AspNetCore.TestHost/ResponseStream.cs
@@ -254,7 +254,6 @@ namespace Microsoft.AspNetCore.TestHost
}
}
-#if NET46
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
Write(buffer, offset, count);
@@ -271,10 +270,6 @@ namespace Microsoft.AspNetCore.TestHost
public override void EndWrite(IAsyncResult asyncResult)
{
}
-#elif NETSTANDARD1_3
-#else
-#error Target frameworks need to be updated.
-#endif
public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
diff --git a/src/Microsoft.AspNetCore.TestHost/baseline.netframework.json b/src/Microsoft.AspNetCore.TestHost/baseline.netframework.json
deleted file mode 100644
index 72c27a1dff..0000000000
--- a/src/Microsoft.AspNetCore.TestHost/baseline.netframework.json
+++ /dev/null
@@ -1,289 +0,0 @@
-{
- "AssemblyIdentity": "Microsoft.AspNetCore.TestHost, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
- "Types": [
- {
- "Name": "Microsoft.AspNetCore.TestHost.ClientHandler",
- "Visibility": "Public",
- "Kind": "Class",
- "BaseType": "System.Net.Http.HttpMessageHandler",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "SendAsync",
- "Parameters": [
- {
- "Name": "request",
- "Type": "System.Net.Http.HttpRequestMessage"
- },
- {
- "Name": "cancellationToken",
- "Type": "System.Threading.CancellationToken"
- }
- ],
- "ReturnType": "System.Threading.Tasks.Task",
- "Virtual": true,
- "Override": true,
- "Visibility": "Protected",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "pathBase",
- "Type": "Microsoft.AspNetCore.Http.PathString"
- },
- {
- "Name": "application",
- "Type": "Microsoft.AspNetCore.Hosting.Server.IHttpApplication"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.TestHost.RequestBuilder",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "And",
- "Parameters": [
- {
- "Name": "configure",
- "Type": "System.Action"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.TestHost.RequestBuilder",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "AddHeader",
- "Parameters": [
- {
- "Name": "name",
- "Type": "System.String"
- },
- {
- "Name": "value",
- "Type": "System.String"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.TestHost.RequestBuilder",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "SendAsync",
- "Parameters": [
- {
- "Name": "method",
- "Type": "System.String"
- }
- ],
- "ReturnType": "System.Threading.Tasks.Task",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "GetAsync",
- "Parameters": [],
- "ReturnType": "System.Threading.Tasks.Task",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "PostAsync",
- "Parameters": [],
- "ReturnType": "System.Threading.Tasks.Task",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "server",
- "Type": "Microsoft.AspNetCore.TestHost.TestServer"
- },
- {
- "Name": "path",
- "Type": "System.String"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.TestHost.TestServer",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [
- "Microsoft.AspNetCore.Hosting.Server.IServer"
- ],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_BaseAddress",
- "Parameters": [],
- "ReturnType": "System.Uri",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_BaseAddress",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.Uri"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_Host",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHost",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "CreateHandler",
- "Parameters": [],
- "ReturnType": "System.Net.Http.HttpMessageHandler",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "CreateClient",
- "Parameters": [],
- "ReturnType": "System.Net.Http.HttpClient",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "CreateWebSocketClient",
- "Parameters": [],
- "ReturnType": "Microsoft.AspNetCore.TestHost.WebSocketClient",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "CreateRequest",
- "Parameters": [
- {
- "Name": "path",
- "Type": "System.String"
- }
- ],
- "ReturnType": "Microsoft.AspNetCore.TestHost.RequestBuilder",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "Dispose",
- "Parameters": [],
- "ReturnType": "System.Void",
- "Sealed": true,
- "Virtual": true,
- "ImplementedInterface": "System.IDisposable",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Constructor",
- "Name": ".ctor",
- "Parameters": [
- {
- "Name": "builder",
- "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder"
- }
- ],
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- },
- {
- "Name": "Microsoft.AspNetCore.TestHost.WebSocketClient",
- "Visibility": "Public",
- "Kind": "Class",
- "ImplementedInterfaces": [],
- "Members": [
- {
- "Kind": "Method",
- "Name": "get_SubProtocols",
- "Parameters": [],
- "ReturnType": "System.Collections.Generic.IList",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "get_ConfigureRequest",
- "Parameters": [],
- "ReturnType": "System.Action",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "set_ConfigureRequest",
- "Parameters": [
- {
- "Name": "value",
- "Type": "System.Action"
- }
- ],
- "ReturnType": "System.Void",
- "Visibility": "Public",
- "GenericParameter": []
- },
- {
- "Kind": "Method",
- "Name": "ConnectAsync",
- "Parameters": [
- {
- "Name": "uri",
- "Type": "System.Uri"
- },
- {
- "Name": "cancellationToken",
- "Type": "System.Threading.CancellationToken"
- }
- ],
- "ReturnType": "System.Threading.Tasks.Task",
- "Visibility": "Public",
- "GenericParameter": []
- }
- ],
- "GenericParameters": []
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj
index aa217c7fb1..36d688f0ed 100644
--- a/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj
+++ b/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj
@@ -4,7 +4,7 @@
.NET Core hosting and startup abstractions for applications.
- netstandard1.3
+ netcoreapp2.0
$(NoWarn);CS1591
true
hosting
diff --git a/test/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj b/test/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj
index 3fd644197c..cb05129b5e 100644
--- a/test/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj
+++ b/test/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj
@@ -3,8 +3,7 @@
- netcoreapp2.0;net46
- netcoreapp2.0
+ netcoreapp2.0
Exe
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Internal/HostingEventSourceTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Internal/HostingEventSourceTests.cs
index 6f5cd1a6a6..64c0c1bf83 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Internal/HostingEventSourceTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Internal/HostingEventSourceTests.cs
@@ -43,12 +43,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
var eventData = eventListener.EventData;
Assert.NotNull(eventData);
Assert.Equal(expectedEventId, eventData.EventId);
-#if NETCOREAPP2_0
Assert.Equal("HostStart", eventData.EventName);
-#elif NET46
-#else
-#error Target framework needs to be updated
-#endif
Assert.Equal(EventLevel.Informational, eventData.Level);
Assert.Same(hostingEventSource, eventData.EventSource);
Assert.Null(eventData.Message);
@@ -71,12 +66,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
var eventData = eventListener.EventData;
Assert.NotNull(eventData);
Assert.Equal(expectedEventId, eventData.EventId);
-#if NETCOREAPP2_0
Assert.Equal("HostStop", eventData.EventName);
-#elif NET46
-#else
-#error Target framework needs to be updated
-#endif
Assert.Equal(EventLevel.Informational, eventData.Level);
Assert.Same(hostingEventSource, eventData.EventSource);
Assert.Null(eventData.Message);
@@ -132,12 +122,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
var eventData = eventListener.EventData;
Assert.NotNull(eventData);
Assert.Equal(expectedEventId, eventData.EventId);
-#if NETCOREAPP2_0
Assert.Equal("RequestStart", eventData.EventName);
-#elif NET46
-#else
-#error Target framework needs to be updated
-#endif
Assert.Equal(EventLevel.Informational, eventData.Level);
Assert.Same(hostingEventSource, eventData.EventSource);
Assert.Null(eventData.Message);
@@ -165,12 +150,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
// Assert
var eventData = eventListener.EventData;
Assert.Equal(expectedEventId, eventData.EventId);
-#if NETCOREAPP2_0
Assert.Equal("RequestStop", eventData.EventName);
-#elif NET46
-#else
-#error Target framework needs to be updated
-#endif
Assert.Equal(EventLevel.Informational, eventData.Level);
Assert.Same(hostingEventSource, eventData.EventSource);
Assert.Null(eventData.Message);
@@ -192,12 +172,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
// Assert
var eventData = eventListener.EventData;
Assert.Equal(expectedEventId, eventData.EventId);
-#if NETCOREAPP2_0
Assert.Equal("UnhandledException", eventData.EventName);
-#elif NET46
-#else
-#error Target framework needs to be updated
-#endif
Assert.Equal(EventLevel.Error, eventData.Level);
Assert.Same(hostingEventSource, eventData.EventSource);
Assert.Null(eventData.Message);
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj b/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj
index 7de02b4777..96de8da94f 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj
@@ -3,8 +3,7 @@
- netcoreapp2.0;net46
- netcoreapp2.0
+ netcoreapp2.0
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj b/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj
index 25079b63b1..a9423120c4 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj
@@ -3,8 +3,7 @@
- netcoreapp2.0;net46
- netcoreapp2.0
+ netcoreapp2.0
diff --git a/test/TestStartupAssembly1/TestStartupAssembly1.csproj b/test/TestStartupAssembly1/TestStartupAssembly1.csproj
index f2b53ef9f3..02ed725637 100644
--- a/test/TestStartupAssembly1/TestStartupAssembly1.csproj
+++ b/test/TestStartupAssembly1/TestStartupAssembly1.csproj
@@ -1,9 +1,9 @@
-
+
- netcoreapp2.0;net46
+ netcoreapp2.0