.NET Core 2.0

chronoxor · Nov 9, 2019 · ae86bd7 · ae86bd7
1 parent 92bd305
commit ae86bd7
Show file tree

Hide file tree

Showing 24 changed files with 57 additions and 72 deletions.
diff --git a/examples/SslChatClient/SslChatClient.csproj b/examples/SslChatClient/SslChatClient.csproj
@@ -2,18 +2,18 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\..\tools\certificates\client.pfx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/examples/SslChatServer/SslChatServer.csproj b/examples/SslChatServer/SslChatServer.csproj
@@ -2,18 +2,18 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\..\tools\certificates\server.pfx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/examples/TcpChatClient/TcpChatClient.csproj b/examples/TcpChatClient/TcpChatClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/examples/TcpChatServer/TcpChatServer.csproj b/examples/TcpChatServer/TcpChatServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/examples/UdpEchoClient/UdpEchoClient.csproj b/examples/UdpEchoClient/UdpEchoClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/examples/UdpEchoServer/UdpEchoServer.csproj b/examples/UdpEchoServer/UdpEchoServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/examples/UdpMulticastClient/UdpMulticastClient.csproj b/examples/UdpMulticastClient/UdpMulticastClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/examples/UdpMulticastServer/UdpMulticastServer.csproj b/examples/UdpMulticastServer/UdpMulticastServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/performance/SslEchoClient/SslEchoClient.csproj b/performance/SslEchoClient/SslEchoClient.csproj
@@ -2,22 +2,22 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NDesk.Options.Core" Version="1.2.5" />
+    <None Include="..\..\tools\certificates\client.pfx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
+    <PackageReference Include="NDesk.Options.Core" Version="1.2.5" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\tools\certificates\client.pfx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/performance/SslEchoServer/SslEchoServer.csproj b/performance/SslEchoServer/SslEchoServer.csproj
@@ -2,22 +2,22 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NDesk.Options.Core" Version="1.2.5" />
+    <None Include="..\..\tools\certificates\server.pfx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
+    <PackageReference Include="NDesk.Options.Core" Version="1.2.5" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\tools\certificates\server.pfx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/performance/SslMulticastClient/SslMulticastClient.csproj b/performance/SslMulticastClient/SslMulticastClient.csproj
@@ -2,22 +2,22 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NDesk.Options.Core" Version="1.2.5" />
+    <None Include="..\..\tools\certificates\client.pfx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
+    <PackageReference Include="NDesk.Options.Core" Version="1.2.5" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\tools\certificates\client.pfx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/performance/SslMulticastServer/SslMulticastServer.csproj b/performance/SslMulticastServer/SslMulticastServer.csproj
@@ -2,22 +2,22 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NDesk.Options.Core" Version="1.2.5" />
+    <None Include="..\..\tools\certificates\server.pfx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
+    <PackageReference Include="NDesk.Options.Core" Version="1.2.5" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\tools\certificates\server.pfx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <ProjectReference Include="..\..\source\NetCoreServer\NetCoreServer.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/performance/TcpEchoClient/TcpEchoClient.csproj b/performance/TcpEchoClient/TcpEchoClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/performance/TcpEchoServer/TcpEchoServer.csproj b/performance/TcpEchoServer/TcpEchoServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/performance/TcpMulticastClient/TcpMulticastClient.csproj b/performance/TcpMulticastClient/TcpMulticastClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/performance/TcpMulticastServer/TcpMulticastServer.csproj b/performance/TcpMulticastServer/TcpMulticastServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/performance/UdpEchoClient/UdpEchoClient.csproj b/performance/UdpEchoClient/UdpEchoClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/performance/UdpEchoServer/UdpEchoServer.csproj b/performance/UdpEchoServer/UdpEchoServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/performance/UdpMulticastClient/UdpMulticastClient.csproj b/performance/UdpMulticastClient/UdpMulticastClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/performance/UdpMulticastServer/UdpMulticastServer.csproj b/performance/UdpMulticastServer/UdpMulticastServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 

diff --git a/source/NetCoreServer/NetCoreServer.csproj b/source/NetCoreServer/NetCoreServer.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>1.8.0</Version>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Version>2.0.0</Version>
     <Authors>Ivan Shynkarenka</Authors>
     <Copyright>Copyright (c) 2019 Ivan Shynkarenka</Copyright>
     <RepositoryUrl>https://github.com/chronoxor/NetCoreServer</RepositoryUrl>
@@ -14,6 +14,8 @@
   <PropertyGroup>
     <IncludeSymbols>true</IncludeSymbols>	
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>	
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>	
+    <FileVersion>2.0.0.0</FileVersion>	
   </PropertyGroup>
 
 </Project>
diff --git a/source/NetCoreServer/SslClient.cs b/source/NetCoreServer/SslClient.cs
@@ -246,14 +246,6 @@ public virtual bool Disconnect()
 
             try
             {
-                try
-                {
-                    // Shutdown the SSL stream
-                    _sslStream.ShutdownAsync().Wait();
-                }
-                catch (AggregateException) {}
-                catch (IOException) {}
-
                 // Dispose the SSL stream & buffer
                 _sslStream.Dispose();
                 _sslStreamId = null;

diff --git a/source/NetCoreServer/SslSession.cs b/source/NetCoreServer/SslSession.cs
@@ -159,14 +159,6 @@ public virtual bool Disconnect()
 
             try
             {
-                try
-                {
-                    // Shutdown the SSL stream
-                    _sslStream.ShutdownAsync().Wait();
-                }
-                catch (AggregateException) {}
-                catch (IOException) {}
-
                 // Dispose the SSL stream & buffer
                 _sslStream.Dispose();
                 _sslStreamId = null;

diff --git a/tests/tests.csproj b/tests/tests.csproj
@@ -1,24 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\source\NetCoreServer\NetCoreServer.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\tools\certificates\client.pfx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -28,4 +23,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\source\NetCoreServer\NetCoreServer.csproj" />
+  </ItemGroup>
+
 </Project>