summary refs log tree commit diff
path: root/crypto
diff options
context:
space:
mode:
authorOren Novotny <oren@novotny.org>2019-05-28 12:01:11 -0400
committerOren Novotny <oren@novotny.org>2019-05-28 12:01:11 -0400
commit6d3a6530c547b1d60bb86bdde315d0bf6b346e35 (patch)
treeaa679ff461854c4015867af088be65eac5f883ce /crypto
parentMerge branch 'master' into netstandard (diff)
downloadBouncyCastle.NET-ed25519-6d3a6530c547b1d60bb86bdde315d0bf6b346e35.tar.xz
Update deps
Diffstat (limited to 'crypto')
-rw-r--r--crypto/src/crypto.csproj6
-rw-r--r--crypto/test/crypto.test.csproj7
-rw-r--r--crypto/test/src/crypto/tls/test/PskTlsServerTest.cs2
3 files changed, 6 insertions, 9 deletions
diff --git a/crypto/src/crypto.csproj b/crypto/src/crypto.csproj
index 78a4b89df..557002835 100644
--- a/crypto/src/crypto.csproj
+++ b/crypto/src/crypto.csproj
@@ -6,7 +6,7 @@
     <AssemblyOriginatorKeyFile>..\..\BouncyCastle.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <Product>Bouncy Castle for .NET ($(TargetFramework))</Product>
-    <Copyright>© 2000-2018 Legion of the Bouncy Castle Inc. </Copyright>
+    <Copyright>© 2000-2019 Legion of the Bouncy Castle Inc. </Copyright>
     <Company>The Legion of the Bouncy Castle Inc.</Company>
     <Authors>Oren Novotny</Authors>
     <Title>Bouncy Castle Portable</Title>
@@ -36,8 +36,8 @@
   <ItemGroup>
     <Compile Include="..\bzip2\src\**\*.cs" LinkBase="bzip2" />
     <None Include="..\..\BouncyCastle.snk" />
-    <PackageReference Include="NerdBank.GitVersioning" Version="2.3.105" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
+    <PackageReference Include="NerdBank.GitVersioning" Version="2.3.151" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19270-01" PrivateAssets="All" />
   </ItemGroup>
   
   <Target Name="SetBuildVer" AfterTargets="GetBuildVersion" BeforeTargets="SetCloudBuildVersionVars;SetCloudBuildNumberWithVersion">
diff --git a/crypto/test/crypto.test.csproj b/crypto/test/crypto.test.csproj
index a110bb11e..38d974b92 100644
--- a/crypto/test/crypto.test.csproj
+++ b/crypto/test/crypto.test.csproj
@@ -1,20 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp1.1;net462</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net462</TargetFrameworks>
     <DefineConstants>$(DefineConstants);LIB</DefineConstants>
     <AssemblyOriginatorKeyFile>..\..\BouncyCastle.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <DefineConstants>$(DefineConstants);PORTABLE</DefineConstants>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\**\*.cs" Exclude="**\examples\**\*.cs" />
     <EmbeddedResource Include="data\**\*.*" Exclude="**\README.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0-preview-20180816-01" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
     <PackageReference Include="NUnit" Version="3.10.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
   </ItemGroup>
diff --git a/crypto/test/src/crypto/tls/test/PskTlsServerTest.cs b/crypto/test/src/crypto/tls/test/PskTlsServerTest.cs
index 15766f0a4..8e04eae50 100644
--- a/crypto/test/src/crypto/tls/test/PskTlsServerTest.cs
+++ b/crypto/test/src/crypto/tls/test/PskTlsServerTest.cs
@@ -19,7 +19,7 @@ namespace Org.BouncyCastle.Crypto.Tls.Tests
     {
         private static readonly SecureRandom secureRandom = new SecureRandom();
 
-        public static void Main(string[] args)
+        public static void MainOld(string[] args)
         {
             int port = 5556;