From 7330878834b967b177519b05b771d34a4a172e53 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Thu, 17 Aug 2017 17:39:38 -0400
Subject: Add netstandard2.0 version

---
 appveyor.yml                   | 7 +++++--
 crypto/src/crypto.csproj       | 4 ++--
 crypto/test/crypto.test.csproj | 3 +--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b7b7df4a8..af3bd513c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,10 +14,13 @@ install:
 build_script:
   - cmd: msbuild /t:restore BouncyCastle.sln
   - cmd: msbuild /t:build BouncyCastle.sln 
-  - cmd: msbuild /t:pack crypto\src\crypto.csproj /p:PackageId="Portable.BouncyCastle" /p:PackageOutputPath="%APPVEYOR_BUILD_FOLDER%"
+  - cmd: msbuild /t:pack crypto\src\crypto.csproj /p:PackageId="Portable.BouncyCastle" /p:PackageOutputPath="%APPVEYOR_BUILD_FOLDER%"  
   
 after_build:  
   - ps: '.\scripts\Sign-Package.ps1'  
+  - cmd: dotnet test crypto\test\crypto.test.csproj --no-build
 
 artifacts:
-  - path: '*.nupkg'
\ No newline at end of file
+  - path: '*.nupkg'
+
+test: off
diff --git a/crypto/src/crypto.csproj b/crypto/src/crypto.csproj
index 441623289..c910c64f3 100644
--- a/crypto/src/crypto.csproj
+++ b/crypto/src/crypto.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard1.0;portable-net4+sl5+wp8+win8+wpa81;net4</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard1.3;netstandard1.0;portable-net4+sl5+wp8+win8+wpa81;net4</TargetFrameworks>
     <AssemblyName>BouncyCastle.Crypto</AssemblyName>
     <RootNamespace>crypto</RootNamespace>
     <AssemblyOriginatorKeyFile>..\..\BouncyCastle.snk</AssemblyOriginatorKeyFile>
@@ -21,7 +21,7 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <DefineConstants>$(DefineConstants);PORTABLE;NO_THREADS;NEW_REFLECTION;SYS_RUNTIME;DOTNET</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net4' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net4' or '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);LIB</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'portable-net4+sl5+wp8+win8+wpa81' ">
diff --git a/crypto/test/crypto.test.csproj b/crypto/test/crypto.test.csproj
index 1e8962717..8446f71a9 100644
--- a/crypto/test/crypto.test.csproj
+++ b/crypto/test/crypto.test.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;netcoreapp1.1;net462</TargetFrameworks>
     <DefineConstants>$(DefineConstants);LIB</DefineConstants>
     <AssemblyOriginatorKeyFile>..\..\BouncyCastle.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
     <DefineConstants>$(DefineConstants);PORTABLE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-- 
cgit 1.5.1