diff --git a/samples/LargeResponseApp/LargeResponseApp.csproj b/samples/LargeResponseApp/LargeResponseApp.csproj
index 6aad6e781e..be9cd35512 100644
--- a/samples/LargeResponseApp/LargeResponseApp.csproj
+++ b/samples/LargeResponseApp/LargeResponseApp.csproj
@@ -3,7 +3,7 @@
- net46;netcoreapp2.0
+ netcoreapp2.0
false
diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj
index f8ee813b62..0387c8a91d 100644
--- a/samples/SampleApp/SampleApp.csproj
+++ b/samples/SampleApp/SampleApp.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.0;net46
+ netcoreapp2.0
false
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/LoggingStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/LoggingStream.cs
index 520b456d3b..584bf6301d 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/LoggingStream.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/LoggingStream.cs
@@ -132,7 +132,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal
_logger.LogDebug(builder.ToString());
}
-#if NET46
// The below APM methods call the underlying Read/WriteAsync methods which will still be logged.
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
@@ -209,9 +208,5 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal
}, tcs, cancellationToken);
return tcs.Task;
}
-#elif NETSTANDARD1_3
-#else
-#error target frameworks need to be updated.
-#endif
}
}
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/RawStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/RawStream.cs
index 9c32f272a9..0b5d31f3b3 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/RawStream.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Adapter/Internal/RawStream.cs
@@ -134,7 +134,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal
}
}
-#if NET46
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
var task = ReadAsync(buffer, offset, count, default(CancellationToken), state);
@@ -210,9 +209,5 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal
}, tcs, cancellationToken);
return tcs.Task;
}
-#elif NETSTANDARD1_3
-#else
-#error target frameworks need to be updated.
-#endif
}
}
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameDuplexStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameDuplexStream.cs
index d1b7cab14d..13bce2447c 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameDuplexStream.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameDuplexStream.cs
@@ -1,9 +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 NET46
using System;
-#endif
using System.IO;
using System.Threading;
using System.Threading.Tasks;
@@ -116,7 +114,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
return _responseStream.FlushAsync(cancellationToken);
}
-#if NET46
public override void Close()
{
_requestStream.Close();
@@ -142,10 +139,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
{
_responseStream.EndWrite(asyncResult);
}
-#elif NETSTANDARD1_3
-#else
-#error target frameworks need to be updated.
-#endif
public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestStream.cs
index 4fa42fef79..772668cf2c 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestStream.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameRequestStream.cs
@@ -61,7 +61,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
return ReadAsync(buffer, offset, count).Result;
}
-#if NET46
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
var task = ReadAsync(buffer, offset, count, default(CancellationToken), state);
@@ -99,10 +98,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
}, tcs, cancellationToken);
return tcs.Task;
}
-#elif NETSTANDARD1_3
-#else
-#error target frameworks need to be updated
-#endif
public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameResponseStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameResponseStream.cs
index 5f0931759b..23712d5cb4 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameResponseStream.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Http/FrameResponseStream.cs
@@ -65,7 +65,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
_frameControl.Write(new ArraySegment(buffer, offset, count));
}
-#if NET46
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
{
var task = WriteAsync(buffer, offset, count, default(CancellationToken), state);
@@ -103,10 +102,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
}, tcs, cancellationToken);
return tcs.Task;
}
-#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.Server.Kestrel.Core/Internal/Infrastructure/WrappingStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/WrappingStream.cs
index 64fbd85526..a1c87ad8c8 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/WrappingStream.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/WrappingStream.cs
@@ -3,9 +3,6 @@
using System;
using System.IO;
-#if NET46
-using System.Runtime.Remoting;
-#endif
using System.Threading;
using System.Threading.Tasks;
@@ -92,7 +89,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken)
=> _inner.CopyToAsync(destination, bufferSize, cancellationToken);
-#if NET46
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
=> _inner.BeginRead(buffer, offset, count, callback, state);
@@ -105,20 +101,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
public override void EndWrite(IAsyncResult asyncResult)
=> _inner.EndWrite(asyncResult);
- public override ObjRef CreateObjRef(Type requestedType)
- => _inner.CreateObjRef(requestedType);
-
public override object InitializeLifetimeService()
=> _inner.InitializeLifetimeService();
public override void Close()
=> _inner.Close();
-#elif NETSTANDARD1_3
-#else
-#error Target framework should be updated
-#endif
-
public override bool Equals(object obj)
=> _inner.Equals(obj);
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
index 3e9d1e703d..f9f23ff830 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
@@ -4,7 +4,7 @@
Core components of ASP.NET Core Kestrel cross-platform web server.
- netstandard1.3;net46
+ netcoreapp2.0
true
aspnetcore;kestrel
true
@@ -19,21 +19,12 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionAdapter.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionAdapter.cs
index f87d05e8e8..c231d38625 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionAdapter.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/HttpsConnectionAdapter.cs
@@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Https
}
}
- var certificate2 = ConvertToX509Certificate2(certificate);
+ var certificate2 = (X509Certificate2)certificate;
if (certificate2 == null)
{
return false;
@@ -106,28 +106,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Https
return new HttpsAdaptedConnection(sslStream);
}
- private static X509Certificate2 ConvertToX509Certificate2(X509Certificate certificate)
- {
- if (certificate == null)
- {
- return null;
- }
-
- X509Certificate2 certificate2 = certificate as X509Certificate2;
- if (certificate2 != null)
- {
- return certificate2;
- }
-
-#if NETSTANDARD1_3
- // conversion X509Certificate to X509Certificate2 not supported
- // https://github.com/dotnet/corefx/issues/4510
- return null;
-#else
- return new X509Certificate2(certificate);
-#endif
- }
-
private class HttpsAdaptedConnection : IAdaptedConnection
{
private readonly SslStream _sslStream;
@@ -141,7 +119,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Https
public void PrepareRequest(IFeatureCollection requestFeatures)
{
- var clientCertificate = ConvertToX509Certificate2(_sslStream.RemoteCertificate);
+ var clientCertificate = (X509Certificate2)_sslStream.RemoteCertificate;
if (clientCertificate != null)
{
requestFeatures.Set(new TlsConnectionFeature { ClientCertificate = clientCertificate });
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj
index 6205bd9037..dc24ad8885 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj
@@ -4,7 +4,7 @@
HTTPS support for the ASP.NET Core Kestrel cross-platform web server.
- netstandard1.3;net46
+ netcoreapp2.0
true
aspnetcore;kestrel
CS1591;$(NoWarn)
@@ -20,10 +20,6 @@
-
-
-
-
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj
index 8ea0de0a32..45adabecd7 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj
@@ -4,7 +4,7 @@
Transport abstractions for the ASP.NET Core Kestrel cross-platform web server.
- netstandard1.3
+ netcoreapp2.0
true
aspnetcore;kestrel
CS1570;CS1571;CS1572;CS1573;CS1574;CS1591;$(NoWarn)
@@ -14,7 +14,6 @@
-
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj
index 664ae179b1..25552ef74c 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj
@@ -4,7 +4,7 @@
Libuv transport for the ASP.NET Core Kestrel cross-platform web server.
- netstandard1.3
+ netcoreapp2.0
true
aspnetcore;kestrel
true
@@ -13,8 +13,6 @@
-
-
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj
index 960578b878..69ce23ca38 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj
@@ -4,7 +4,7 @@
Managed socket transport for the ASP.NET Core Kestrel cross-platform web server.
- netstandard1.3
+ netcoreapp2.0
true
aspnetcore;kestrel
true
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Microsoft.AspNetCore.Server.Kestrel.csproj b/src/Microsoft.AspNetCore.Server.Kestrel/Microsoft.AspNetCore.Server.Kestrel.csproj
index 8823cf1db8..24171c9ed6 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Microsoft.AspNetCore.Server.Kestrel.csproj
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Microsoft.AspNetCore.Server.Kestrel.csproj
@@ -4,7 +4,7 @@
ASP.NET Core Kestrel cross-platform web server.
- netstandard1.3;net46
+ netcoreapp2.0
true
aspnetcore;kestrel
CS1591;$(NoWarn)
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameResponseStreamTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameResponseStreamTests.cs
index c6a3ec8a4d..12f0e0019c 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameResponseStreamTests.cs
+++ b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/FrameResponseStreamTests.cs
@@ -54,17 +54,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
await Assert.ThrowsAsync(() => stream.ReadAsync(new byte[1], 0, 1));
}
-#if NET46
[Fact]
public void BeginReadThrows()
{
var stream = new FrameResponseStream(new MockFrameControl());
Assert.Throws(() => stream.BeginRead(new byte[1], 0, 1, null, null));
}
-#elif NETCOREAPP2_0
-#else
-#error Target framework needs to be updated
-#endif
[Fact]
public void SeekThrows()
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
index be64007718..22e86958d9 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
+++ b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
@@ -3,16 +3,8 @@
- netcoreapp2.0;net46
- netcoreapp2.0
- x64
+ netcoreapp2.0
true
-
-
- exe
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/GeneratedCodeTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/GeneratedCodeTests.cs
index 983a18b5c8..637756f2ba 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/GeneratedCodeTests.cs
+++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/GeneratedCodeTests.cs
@@ -1,8 +1,6 @@
// 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 NETCOREAPP2_0
-
using System.IO;
using Xunit;
@@ -46,9 +44,4 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
}
}
}
-}
-
-#elif NET46
-#else
-#error Target framework needs to be updated
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj
index cd10cab0df..a3057f5317 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj
+++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj
@@ -3,11 +3,7 @@
- netcoreapp2.0;net46
- netcoreapp2.0
- x64
- true
- true
+ netcoreapp2.0
true
- exe
diff --git a/test/shared/TestResources.cs b/test/shared/TestResources.cs
index 19341db11a..84a6880497 100644
--- a/test/shared/TestResources.cs
+++ b/test/shared/TestResources.cs
@@ -8,14 +8,7 @@ namespace Microsoft.AspNetCore.Testing
{
public static class TestResources
{
- private static readonly string _testCertificatePath =
-#if NET46
- Path.Combine(Directory.GetCurrentDirectory(), "testCert.pfx");
-#elif NETCOREAPP2_0
- Path.Combine(AppContext.BaseDirectory, "testCert.pfx");
-#else
-#error Target framework needs to be updated
-#endif
+ private static readonly string _testCertificatePath = Path.Combine(AppContext.BaseDirectory, "testCert.pfx");
public static string TestCertificatePath => _testCertificatePath;
}
diff --git a/tools/CodeGenerator/CodeGenerator.csproj b/tools/CodeGenerator/CodeGenerator.csproj
index 5a7bd30966..1569f84cbd 100644
--- a/tools/CodeGenerator/CodeGenerator.csproj
+++ b/tools/CodeGenerator/CodeGenerator.csproj
@@ -3,7 +3,7 @@
- netcoreapp1.1
+ netcoreapp2.0
Exe
false
true