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

netcoreapp2.0 #228

Merged
merged 5 commits into from
May 5, 2017
Merged

netcoreapp2.0 #228

merged 5 commits into from
May 5, 2017

Conversation

pakrym
Copy link
Contributor

@pakrym pakrym commented May 4, 2017

No description provided.

@pakrym pakrym requested review from Tratcher and kichalla May 4, 2017 23:14
@pakrym pakrym changed the base branch from dev to rel/2.0.0-preview1 May 4, 2017 23:14
@@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" />

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove the following 2 elements cc @pranavkm

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seem to be other files with similar content.

@@ -160,34 +160,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati
return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);
}
}
#if NET46
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep these APIs

@@ -3,9 +3,7 @@

using System;
using System.Collections.ObjectModel;
#if NETSTANDARD1_3
using System.Reflection;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

@@ -137,58 +137,6 @@ public override void Write(byte[] buffer, int offset, int count)
}
}

#if NET46
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert

@@ -108,36 +108,6 @@ public void Write_IsPassedToUnderlyingStream_WhenDisableResponseBuffering(bool f
Assert.Equal(File.ReadAllBytes(path), written);
}

#if NET46
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert

@@ -570,16 +563,9 @@ public void Options_HttpsDisabledByDefault()

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

#if NET46 // Flush not supported, compression disabled
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flush is supported on core

@pakrym
Copy link
Contributor Author

pakrym commented May 5, 2017

@pranavkm 🆙📅

@pakrym pakrym merged commit 733e24f into rel/2.0.0-preview1 May 5, 2017
@JunTaoLuo JunTaoLuo deleted the pakrym/nca20 branch March 25, 2018 05:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants