Remove net451 as a cross-compile target

.gitignore

@@ -29,3 +29,4 @@ project.lock.json
 .vscode/
 .build/
 .testPublish/
+global.json

samples/SampleStartups/SampleStartups.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\build\dependencies.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net451;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core hosting and startup abstractions for web applications.</Description>
-    <TargetFrameworks>net451;netstandard1.3</TargetFrameworks>
+    <TargetFramework>netstandard1.3</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;hosting</PackageTags>

src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core hosting server abstractions for web applications.</Description>
-    <TargetFrameworks>net451;netstandard1.3</TargetFrameworks>
+    <TargetFramework>netstandard1.3</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;hosting</PackageTags>

src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core hosting infrastructure and startup logic for web applications running within a Windows service.</Description>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFramework>net46</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;hosting</PackageTags>

src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs

@@ -207,8 +207,10 @@ namespace Microsoft.AspNetCore.Hosting.Internal
                 var systemRuntimeAssembly = typeof(System.ComponentModel.DefaultValueAttribute).GetTypeInfo().Assembly;
                 var assemblyVersion = new AssemblyName(systemRuntimeAssembly.FullName).Version.ToString();
                 var clrVersion = assemblyVersion;
-#else
+#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;

src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core hosting infrastructure and startup logic for web applications.</Description>
-    <TargetFrameworks>net451;netstandard1.3;netstandard1.5</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3;netstandard1.5</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;hosting</PackageTags>
@@ -31,11 +31,8 @@
     <PackageReference Include="Microsoft.Extensions.StackTrace.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/>
     <PackageReference Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/>
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' != 'net451'">
     <PackageReference Include="System.Diagnostics.StackTrace" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">

src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs

@@ -37,6 +37,9 @@ namespace Microsoft.AspNetCore.Hosting
 #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) =>
                 {

src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/RetryHelper.cs

@@ -57,8 +57,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
                     else
                     {
                         if (exception is HttpRequestException
-#if NET452
+#if NET46
                         || exception is System.Net.WebException
+#elif NETSTANDARD1_3
+#else
+#error Target frameworks need to be updated.
 #endif
                         )
                         {

src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployer.cs

@@ -125,13 +125,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
 
         protected void AddEnvironmentVariablesToProcess(ProcessStartInfo startInfo, List<KeyValuePair<string, string>> environmentVariables)
         {
-            var environment =
+            var environment = startInfo.Environment;
-#if NET452
-                startInfo.EnvironmentVariables;
-#else
-                startInfo.Environment;
-#endif
-
             SetEnvironmentVariable(environment, "ASPNETCORE_ENVIRONMENT", DeploymentParameters.EnvironmentName);
 
             foreach (var environmentVariable in environmentVariables)
@@ -140,13 +134,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
             }
         }
 
-#if NET452
+        protected void SetEnvironmentVariable(IDictionary<string, string> environment, string name, string value)
-        protected void SetEnvironmentVariable(System.Collections.Specialized.StringDictionary environment, string name, string value)
         {
-#else
-        protected void SetEnvironmentVariable(System.Collections.Generic.IDictionary<string, string> environment, string name, string value)
-        {
-#endif
             if (value == null)
             {
                 Logger.LogInformation("Removing environment variable {name}", name);

src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/ApplicationDeployerFactory.cs

@@ -33,9 +33,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
             {
                 case ServerType.IISExpress:
                     return new IISExpressDeployer(deploymentParameters, logger);
-#if NET452
+#if NET46
                 case ServerType.IIS:
                     return new IISDeployer(deploymentParameters, logger);
+#elif NETSTANDARD1_3
+#else
+#error Target framework needs to be updated.
 #endif
                 case ServerType.WebListener:
                 case ServerType.Kestrel:

src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISDeployer.cs

@@ -1,7 +1,7 @@
 // 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.
 
-#if NET452
+#if NET46
 
 using System;
 using System.Linq;
@@ -148,5 +148,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
         }
     }
 }
-
+#elif NETSTANDARD1_3
+#else
+#error Target framework needs to be updated.
 #endif

src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs

@@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
             else
             {
                 workingDirectory = DeploymentParameters.ApplicationPath;
-                var targetFramework = DeploymentParameters.TargetFramework ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.1");
+                var targetFramework = DeploymentParameters.TargetFramework ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0");
 
                 executableName = DotnetCommandName;
                 executableArgs = $"run --framework {targetFramework} {DotnetArgumentSeparator}";

src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj

@@ -5,11 +5,10 @@
   <PropertyGroup>
     <Description>ASP.NET Core helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing.</Description>
     <VersionPrefix>0.3.0</VersionPrefix>
-    <TargetFrameworks>net452;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;testing</PackageTags>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
     <EnableApiCheck>false</EnableApiCheck>
   </PropertyGroup>
 
@@ -27,7 +26,7 @@
     <PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="$(WindowsApiSetsVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
     <PackageReference Include="Microsoft.Web.Administration" Version="$(WebAdministrationVersion)" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />

src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core web server for writing and running tests.</Description>
-    <TargetFrameworks>net451;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3;net46</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;hosting;testing</PackageTags>

src/Microsoft.AspNetCore.TestHost/ResponseStream.cs

@@ -168,20 +168,7 @@ namespace Microsoft.AspNetCore.TestHost
                 _readLock.Release();
             }
         }
-#if NET451
-        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
-        {
-            // TODO: This option doesn't preserve the state object.
-            // return ReadAsync(buffer, offset, count);
-            return base.BeginRead(buffer, offset, count, callback, state);
-        }
 
-        public override int EndRead(IAsyncResult asyncResult)
-        {
-            // return ((Task<int>)asyncResult).Result;
-            return base.EndRead(asyncResult);
-        }
-#endif
         public async override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
             VerifyBuffer(buffer, offset, count, allowEmpty: false);
@@ -266,7 +253,8 @@ namespace Microsoft.AspNetCore.TestHost
                 _writeLock.Release();
             }
         }
-#if NET451
+
+#if NET46
         public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             Write(buffer, offset, count);
@@ -283,7 +271,11 @@ 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)
         {
             VerifyBuffer(buffer, offset, count, allowEmpty: true);

test/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 

test/Microsoft.AspNetCore.Hosting.Tests/Internal/HostingEventSourceTests.cs

@@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
             Assert.Equal(expectedEventId, eventData.EventId);
 #if NETCOREAPP2_0
             Assert.Equal("HostStart", eventData.EventName);
-#elif NET452
+#elif NET46
 #else
 #error Target framework needs to be updated
 #endif
@@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
             Assert.Equal(expectedEventId, eventData.EventId);
 #if NETCOREAPP2_0
             Assert.Equal("HostStop", eventData.EventName);
-#elif NET452
+#elif NET46
 #else
 #error Target framework needs to be updated
 #endif
@@ -134,7 +134,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
             Assert.Equal(expectedEventId, eventData.EventId);
 #if NETCOREAPP2_0
             Assert.Equal("RequestStart", eventData.EventName);
-#elif NET452
+#elif NET46
 #else
 #error Target framework needs to be updated
 #endif
@@ -167,7 +167,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
             Assert.Equal(expectedEventId, eventData.EventId);
 #if NETCOREAPP2_0
             Assert.Equal("RequestStop", eventData.EventName);
-#elif NET452
+#elif NET46
 #else
 #error Target framework needs to be updated
 #endif
@@ -194,7 +194,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
             Assert.Equal(expectedEventId, eventData.EventId);
 #if NETCOREAPP2_0
             Assert.Equal("UnhandledException", eventData.EventName);
-#elif NET452
+#elif NET46
 #else
 #error Target framework needs to be updated
 #endif

test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 

test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>