Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

WIP: Adding new SslStream API #11265

Closed
CIPop wants to merge 5 commits into from
Closed

WIP: Adding new SslStream API #11265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a381f7c
Adding new API.
Aug 30, 2016
2712fc8
Fixing contract.
Sep 1, 2016
5336bfa
Switching to netcoreapp1.1. Removing 4.0.0 folder.
Sep 2, 2016
9aa6ed5
Changing test project.json
Sep 2, 2016
3594a3d
Removing net46 added during rebase.
Sep 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/Microsoft.Private.PackageBaseline/packageIndex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,7 +1343,8 @@
"BaselineVersion": "4.0.0",
"AssemblyVersionInPackageVersion": {
"4.0.0.0": "4.0.0",
"4.0.1.0": "4.0.1"
"4.0.1.0": "4.0.1",
"4.1.0.0": "4.3.0"
}
},
"System.Net.Sockets": {
Expand Down
2 changes: 1 addition & 1 deletion src/System.Net.Security/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.1.0</AssemblyVersion>
<AssemblyVersion>4.1.0.0</AssemblyVersion>
</PropertyGroup>
</Project>

2 changes: 1 addition & 1 deletion src/System.Net.Security/pkg/System.Net.Security.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Net.Security.csproj">
<SupportedFramework>net46;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>netcoreapp1.1</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Net.Security.builds" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/System.Net.Security/ref/System.Net.Security.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ public override void Flush() { }
public override int Read(byte[] buffer, int offset, int count) { return default(int); }
public override long Seek(long offset, System.IO.SeekOrigin origin) { return default(long); }
public override void SetLength(long value) { }
public virtual System.Threading.Tasks.Task ShutdownAsync() { return default(System.Threading.Tasks.Task); }
Copy link
Copy Markdown
Member

@weshaggard weshaggard Sep 1, 2016

Choose a reason for hiding this comment

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

Has this going through the API review process?

Copy link
Copy Markdown
Author

@CIPop CIPop Sep 1, 2016

Choose a reason for hiding this comment

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

Not yet, why this is marked as WIP, do not merge.

Copy link
Copy Markdown
Member

@weshaggard weshaggard Sep 2, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

Yes that is why I marked it as WIP/do not merge.
edit: Sorry I see you marked this one as such, I confused that with another PR I marked. For reference on the api process see http://aka.ms/apireview

Copy link
Copy Markdown
Author

@CIPop CIPop Sep 2, 2016

Choose a reason for hiding this comment

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

Thanks @weshaggard : will follow the process as soon as I can get it to build / test using the new package.

public void Write(byte[] buffer) { }
public override void Write(byte[] buffer, int offset, int count) { }
}
Expand Down
3 changes: 2 additions & 1 deletion src/System.Net.Security/ref/System.Net.Security.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
<PackageTargetFramework Condition="'$(TargetGroup)' == ''">netcoreapp1.1</PackageTargetFramework>
<NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
</PropertyGroup>
<ItemGroup>
<Compile Include="System.Net.Security.cs" />
Expand Down
4 changes: 2 additions & 2 deletions src/System.Net.Security/ref/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"System.Threading.Tasks": "4.0.0"
},
"frameworks": {
"netstandard1.3": {
"netstandard1.6": {
Copy link
Copy Markdown
Contributor

@davidsh davidsh Sep 1, 2016

Choose a reason for hiding this comment

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

See #11321.

Looks like this should be netstandard1.7 instead of netstandard1.6. (Currently docs are wrong).

Copy link
Copy Markdown
Member

@weshaggard weshaggard Sep 1, 2016

Choose a reason for hiding this comment

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

Correct you cannot add more apis to netstandard16. Given this API doesn't exist anywhere else you actually should add it to only .NET Core similar to what @ericstj is doing in #11272.

Copy link
Copy Markdown
Contributor

@davidsh davidsh Sep 1, 2016

Choose a reason for hiding this comment

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

Correct you cannot add more apis to netstandard16. Given this API doesn't exist anywhere else you actually should add it to only .NET Core similar to what @ericstj is doing in #11272.

@weshaggard We just found out that the docs are wrong and that we should have listed it as netstandard1.7. Since that maps to .NET Framework 4.6.3 (vNext) and we plan to add this API there as well.

Copy link
Copy Markdown
Member

@weshaggard weshaggard Sep 1, 2016

Choose a reason for hiding this comment

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

Currently all the netstandard17 work is happening in the dev/api branch and is only a placeholder for now. We are going to soon be shifting to exposing APIs in .NET Core specifically first and then later adding them to netstandard. This enables people to add APIs just for .NET Core much more agile and not be blocked by our restrictions on .NET Standard.

"imports": [
"dotnet5.4"
"dotnet5.5"
]
}
}
Expand Down
3 changes: 0 additions & 3 deletions src/System.Net.Security/src/System.Net.Security.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
<Project Include="System.Net.Security.csproj">
<OSGroup>Windows_NT</OSGroup>
</Project>
<Project Include="System.Net.Security.csproj">
<TargetGroup>net46</TargetGroup>
</Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>
Expand Down
5 changes: 1 addition & 4 deletions src/System.Net.Security/src/System.Net.Security.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
<ProjectGuid>{89F37791-6254-4D60-AB96-ACD3CCA0E771}</ProjectGuid>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);FEATURE_CORECLR</DefineConstants>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
<ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
<NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
<NuGetTargetMoniker Condition="'$(TargetsUnix)' == 'true'">.NETStandard,Version=v1.6</NuGetTargetMoniker>
<NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.6</NuGetTargetMoniker>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetsWindows)' == 'true' and '$(ProjectJson)' == '' ">
<ProjectJson>win/project.json</ProjectJson>
Expand Down
6 changes: 6 additions & 0 deletions src/System.Net.Security/src/System/Net/SecureProtocols/SslStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,12 @@ public virtual Task AuthenticateAsServerAsync(X509Certificate serverCertificate,

return Task.Factory.FromAsync((callback, state) => BeginAuthenticateAsServer(serverCertificate, clientCertificateRequired, enabledSslProtocols, checkCertificateRevocation, callback, state), EndAuthenticateAsServer, null);
}

public virtual Task ShutdownAsync()
{
throw new PlatformNotSupportedException();
}

#endregion

public override bool IsAuthenticated
Expand Down
9 changes: 2 additions & 7 deletions src/System.Net.Security/src/win/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"frameworks": {
"netstandard1.3": {
"netstandard1.6": {
"imports": [
"dotnet5.4"
"dotnet5.5"
],
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
Expand All @@ -24,11 +24,6 @@
"System.Threading.Tasks": "4.0.10",
"System.Threading.ThreadPool": "4.0.10"
}
},
"net46": {
"dependencies": {
"Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
}
}
}
}
4 changes: 3 additions & 1 deletion src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}</ProjectGuid>
<OutputType>Library</OutputType>
<NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker>
<NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker>
Copy link
Copy Markdown
Member

@weshaggard weshaggard Sep 2, 2016

Choose a reason for hiding this comment

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

If this is set to netcoreapp1.1 you need to have the matching section in your project.json file.

<!-- <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> -->
<!-- <NugetTargetMoniker>.NETStandard,Version=v1.6</NugetTargetMoniker>-->
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetsUnix)' == 'true' ">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
8 changes: 2 additions & 6 deletions src/System.Net.Security/tests/FunctionalTests/unix/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,9 @@
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
},
"frameworks": {
"netstandard1.3": {}
"netstandard1.6": {}
},
"supports": {
"coreFx.Test.netcoreapp1.0": {},
"coreFx.Test.net46": {},
"coreFx.Test.net461": {},
"coreFx.Test.net462": {},
"coreFx.Test.net463": {}
"coreFx.Test.netcoreapp1.1": {}
}
}
9 changes: 1 addition & 8 deletions src/System.Net.Security/tests/FunctionalTests/win/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,7 @@
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
},
"frameworks": {
"netstandard1.3": {}
},
"supports": {
"coreFx.Test.netcoreapp1.0": {},
"coreFx.Test.net46": {},
"coreFx.Test.net461": {},
"coreFx.Test.net462": {},
"coreFx.Test.net463": {}
"coreFx.Test.netcoreapp1.1": {}
}
}