Skip to content
This repository was archived by the owner on Dec 20, 2018. It is now read-only.

Commit 401cbcc

Browse files
pakrympakrym
committed
netcoreapp2.0
1 parent 5e82e3f commit 401cbcc

File tree

18 files changed

+12
-147
lines changed

18 files changed

+12
-147
lines changed

‎samples/HttpOverridesSample/HttpOverridesSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\build\dependencies.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>

‎samples/ResponseBufferingSample/ResponseBufferingSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\build\dependencies.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>

‎samples/ResponseCompressionSample/ResponseCompressionSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\build\dependencies.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>

‎samples/RewriteSample/RewriteSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\build\dependencies.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>

‎src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -160,34 +160,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati
160160
return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);
161161
}
162162
}
163-
#if NET46
164-
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
165-
{
166-
if (_isBuffering)
167-
{
168-
return _buffer.BeginWrite(buffer, offset, count, callback, state);
169-
}
170-
else
171-
{
172-
return _innerStream.BeginWrite(buffer, offset, count, callback, state);
173-
}
174-
}
175163

176-
public override void EndWrite(IAsyncResult asyncResult)
177-
{
178-
if (_isBuffering)
179-
{
180-
_buffer.EndWrite(asyncResult);
181-
}
182-
else
183-
{
184-
_innerStream.EndWrite(asyncResult);
185-
}
186-
}
187-
#elif NETSTANDARD1_3
188-
#else
189-
#error target frameworks need to be updated
190-
#endif
191164
public override void Flush()
192165
{
193166
_isBuffering = false;

‎src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<VersionPrefix>0.3.0</VersionPrefix>
77
<Description>ASP.NET Core middleware for buffering response bodies.</Description>
8-
<TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
8+
<TargetFramework>netcoreapp2.0</TargetFramework>
99
<NoWarn>$(NoWarn);CS1591</NoWarn>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
<PackageTags>aspnetcore;buffer;buffering</PackageTags>

‎src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Description>ASP.NET Core basic middleware for supporting HTTP method overrides. Includes:
88
* X-Forwarded-* headers to forward headers from a proxy.
99
* HTTP method override header.</Description>
10-
<TargetFramework>netstandard1.3</TargetFramework>
10+
<TargetFramework>netcoreapp2.0</TargetFramework>
1111
<NoWarn>$(NoWarn);CS1591</NoWarn>
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1313
<PackageTags>aspnetcore;proxy;headers;xforwarded</PackageTags>

‎src/Microsoft.AspNetCore.ResponseCompression/BodyWrapperStream.cs

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -137,58 +137,6 @@ public override void Write(byte[] buffer, int offset, int count)
137137
}
138138
}
139139

140-
#if NET46
141-
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, Object state)
142-
{
143-
var tcs = new TaskCompletionSource<object>(state);
144-
InternalWriteAsync(buffer, offset, count, callback, tcs);
145-
return tcs.Task;
146-
}
147-
148-
private async void InternalWriteAsync(byte[] buffer, int offset, int count, AsyncCallback callback, TaskCompletionSource<object> tcs)
149-
{
150-
try
151-
{
152-
await WriteAsync(buffer, offset, count);
153-
tcs.TrySetResult(null);
154-
}
155-
catch (Exception ex)
156-
{
157-
tcs.TrySetException(ex);
158-
}
159-
160-
if (callback != null)
161-
{
162-
// Offload callbacks to avoid stack dives on sync completions.
163-
var ignored = Task.Run(() =>
164-
{
165-
try
166-
{
167-
callback(tcs.Task);
168-
}
169-
catch (Exception)
170-
{
171-
// Suppress exceptions on background threads.
172-
}
173-
});
174-
}
175-
}
176-
177-
public override void EndWrite(IAsyncResult asyncResult)
178-
{
179-
if (asyncResult == null)
180-
{
181-
throw new ArgumentNullException(nameof(asyncResult));
182-
}
183-
184-
var task = (Task)asyncResult;
185-
task.GetAwaiter().GetResult();
186-
}
187-
#elif NETSTANDARD1_3
188-
#else
189-
#error target frameworks need to be updated
190-
#endif
191-
192140
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
193141
{
194142
OnWrite();

‎src/Microsoft.AspNetCore.ResponseCompression/CompressionProviderCollection.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33

44
using System;
55
using System.Collections.ObjectModel;
6-
#if NETSTANDARD1_3
76
using System.Reflection;
8-
#endif
97

108
namespace Microsoft.AspNetCore.ResponseCompression
119
{

‎src/Microsoft.AspNetCore.ResponseCompression/GzipCompressionProvider.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,7 @@ public bool SupportsFlush
3737
{
3838
get
3939
{
40-
#if NET46
41-
return false;
42-
#elif NETSTANDARD1_3
4340
return true;
44-
#else
45-
#error target frameworks need to be updated
46-
#endif
4741
}
4842
}
4943

‎src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<VersionPrefix>2.0.0</VersionPrefix>
77
<Description>ASP.NET Core middleware for HTTP Response compression.</Description>
8-
<TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
8+
<TargetFramework>netcoreapp2.0</TargetFramework>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<PackageTags>aspnetcore</PackageTags>
1111
</PropertyGroup>

‎src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Support for custom URL rewrite rules
99
* Support for running IIS URL Rewrite module rules
1010
* Support for running Apache mod_rewrite rules.</Description>
11-
<TargetFramework>netstandard1.3</TargetFramework>
11+
<TargetFramework>netcoreapp2.0</TargetFramework>
1212
<NoWarn>$(NoWarn);CS1591</NoWarn>
1313
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1414
<PackageTags>aspnetcore;urlrewrite;mod_rewrite</PackageTags>

‎test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
7-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
87
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
98
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
109
</PropertyGroup>

‎test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
7-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
87
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
98
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
109
</PropertyGroup>

‎test/Microsoft.AspNetCore.ResponseCompression.Tests/BodyWrapperStreamTests.cs

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -108,36 +108,6 @@ public async Task SendFileAsync_IsPassedToUnderlyingStream_WhenDisableResponseBu
108108
Assert.Equal(File.ReadAllBytes(path), written);
109109
}
110110

111-
#if NET46
112-
[Theory]
113-
[InlineData(true)]
114-
[InlineData(false)]
115-
public void BeginWrite_IsPassedToUnderlyingStream_WhenDisableResponseBuffering(bool flushable)
116-
{
117-
var buffer = new byte[] { 1 };
118-
byte[] written = null;
119-
120-
var mock = new Mock<Stream>();
121-
mock.SetupGet(s => s.CanWrite).Returns(true);
122-
mock.Setup(s => s.WriteAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()))
123-
.Callback<byte[], int, int, CancellationToken>((b, o, c, t) =>
124-
{
125-
written = new ArraySegment<byte>(b, 0, c).ToArray();
126-
})
127-
.Returns(Task.FromResult(0));
128-
129-
var stream = new BodyWrapperStream(new DefaultHttpContext(), mock.Object, new MockResponseCompressionProvider(flushable), null, null);
130-
131-
stream.DisableResponseBuffering();
132-
stream.BeginWrite(buffer, 0, buffer.Length, (o) => {}, null);
133-
134-
Assert.Equal(buffer, written);
135-
}
136-
#elif NETCOREAPP2_0
137-
#else
138-
#error Target framework needs to be updated
139-
#endif
140-
141111
private class MockResponseCompressionProvider: IResponseCompressionProvider
142112
{
143113
private readonly bool _flushable;

‎test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
7-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
87
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
98
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
109
</PropertyGroup>

‎test/Microsoft.AspNetCore.ResponseCompression.Tests/ResponseCompressionMiddlewareTest.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -505,16 +505,9 @@ public async Task TrickleWriteAndFlush_FlushesEachWrite()
505505

506506
var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
507507

508-
#if NET46 // Flush not supported, compression disabled
509-
Assert.NotNull(response.Headers.GetValues(HeaderNames.ContentMD5));
510-
Assert.Empty(response.Content.Headers.ContentEncoding);
511-
#elif NETCOREAPP2_0 // Flush supported, compression enabled
512508
IEnumerable<string> contentMD5 = null;
513509
Assert.False(response.Headers.TryGetValues(HeaderNames.ContentMD5, out contentMD5));
514510
Assert.Single(response.Content.Headers.ContentEncoding, "gzip");
515-
#else
516-
#error Target frameworks need to be updated.
517-
#endif
518511

519512
var body = await response.Content.ReadAsStreamAsync();
520513

@@ -570,16 +563,9 @@ public async Task TrickleWriteAndFlushAsync_FlushesEachWrite()
570563

571564
var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
572565

573-
#if NET46 // Flush not supported, compression disabled
574-
Assert.NotNull(response.Headers.GetValues(HeaderNames.ContentMD5));
575-
Assert.Empty(response.Content.Headers.ContentEncoding);
576-
#elif NETCOREAPP2_0 // Flush supported, compression enabled
577566
IEnumerable<string> contentMD5 = null;
578567
Assert.False(response.Headers.TryGetValues(HeaderNames.ContentMD5, out contentMD5));
579568
Assert.Single(response.Content.Headers.ContentEncoding, "gzip");
580-
#else
581-
#error Target framework needs to be updated
582-
#endif
583569

584570
var body = await response.Content.ReadAsStreamAsync();
585571

‎test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
7-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
87
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
98
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
109
</PropertyGroup>

0 commit comments

Comments
 (0)