diff --git a/crypto/src/crypto.csproj b/crypto/src/crypto.csproj
index 7a246c171..c03c1dc88 100644
--- a/crypto/src/crypto.csproj
+++ b/crypto/src/crypto.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/1.5.4">
+<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.0;netstandard1.3;netstandard1.0;portable-net4+sl5+wp8+win8+wpa81;net4</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netstandard1.3;netstandard1.0;net4</TargetFrameworks>
<AssemblyName>BouncyCastle.Crypto</AssemblyName>
<RootNamespace>crypto</RootNamespace>
<AssemblyOriginatorKeyFile>..\..\BouncyCastle.snk</AssemblyOriginatorKeyFile>
@@ -11,7 +11,7 @@
<Authors>Oren Novotny</Authors>
<Title>Bouncy Castle Portable</Title>
<PackageId>Portable.BouncyCastle</PackageId>
- <Description>BouncyCastle portable version with support for .NET 4, .NET Standard 1.0-2.0, WP, Silverlight, MonoAndroid, Xamarin.iOS, .NET Core</Description>
+ <Description>BouncyCastle portable version with support for .NET 4, .NET Standard 1.0-2.0, .NET Core</Description>
<DebugType>embedded</DebugType>
<PackageLicenseUrl>https://www.bouncycastle.org/csharp/licence.html</PackageLicenseUrl>
<PackageProjectUrl>https://www.bouncycastle.org/csharp/</PackageProjectUrl>
@@ -34,9 +34,6 @@
<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' ">
- <DefineConstants>$(DefineConstants);PORTABLE;NO_THREADS;LEGACY_PCL</DefineConstants>
- </PropertyGroup>
<ItemGroup>
<Compile Include="..\bzip2\src\**\*.cs" LinkBase="bzip2" />
<None Include="..\..\BouncyCastle.snk" />
diff --git a/crypto/src/crypto/generators/OpenBsdBCrypt.cs b/crypto/src/crypto/generators/OpenBsdBCrypt.cs
index 399d12391..49f79f95b 100644
--- a/crypto/src/crypto/generators/OpenBsdBCrypt.cs
+++ b/crypto/src/crypto/generators/OpenBsdBCrypt.cs
@@ -174,11 +174,7 @@ namespace Org.BouncyCastle.Crypto.Generators
}
catch (Exception nfe)
{
-#if LEGACY_PCL
- throw new ArgumentException("Invalid cost factor (bcryptString): " + bcryptString.Substring(4, 2), nfe);
-#else
throw new ArgumentException("Invalid cost factor: " + bcryptString.Substring(4, 2), "bcryptString", nfe);
-#endif
}
if (cost < 4 || cost > 31)
throw new ArgumentException("Invalid cost factor: " + cost + ", 4 < cost < 31 expected.");
|
