summary refs log tree commit diff
path: root/crypto/src
diff options
context:
space:
mode:
authorOren Novotny <oren@novotny.org>2017-01-10 11:31:21 -0500
committerOren Novotny <oren@novotny.org>2017-01-10 11:31:21 -0500
commit4045482a34a992a7fdca4cd754e5cb7b180f2892 (patch)
treed2e9095faf91854937907288e88cac0b2d9f2091 /crypto/src
parentmerge from master (diff)
downloadBouncyCastle.NET-ed25519-4045482a34a992a7fdca4cd754e5cb7b180f2892.tar.xz
update to VS 2017 RC2
Diffstat (limited to 'crypto/src')
-rw-r--r--crypto/src/AssemblyInfo.cs3
-rw-r--r--crypto/src/crypto.csproj10
2 files changed, 4 insertions, 9 deletions
diff --git a/crypto/src/AssemblyInfo.cs b/crypto/src/AssemblyInfo.cs

index bb9811d83..053364594 100644 --- a/crypto/src/AssemblyInfo.cs +++ b/crypto/src/AssemblyInfo.cs
@@ -1,5 +1,6 @@ using System; using System.Reflection; +using System.Runtime.CompilerServices; //using System.Security.Permissions; #if PORTABLE @@ -72,6 +73,8 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] #endif +[assembly: InternalsVisibleTo("crypto.test, PublicKey=002400000480000094000000060200000024000052534131000400000100010083A6A1D0D41B8A0FD3061C8DD2BA14DA98F9BF53576AD386A4D021ABD235EE41BC5416683314816908765FAC4951301E159153CF02BF1B31BEC8A2CE6C0110C30CC7BEF54E514D530B703D37629078AB3ECCE1AFA5ED3F9D63F3B50398188A811ADA59827B9E1A4EEEB87D05E4AFE45BEFD69BF2CDFD37F38334B748C8CB7FBC")] + // Start with no permissions //[assembly: PermissionSet(SecurityAction.RequestOptional, Unrestricted=false)] //...and explicitly add those we need diff --git a/crypto/src/crypto.csproj b/crypto/src/crypto.csproj
index 30d331468..0059535cc 100644 --- a/crypto/src/crypto.csproj +++ b/crypto/src/crypto.csproj
@@ -1,5 +1,4 @@ -<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFrameworks>netstandard1.3;netstandard1.0;portable-net4+sl5+wp8+win8+wpa81;net4</TargetFrameworks> <AssemblyName>BouncyCastle.Crypto</AssemblyName> @@ -46,12 +45,6 @@ <Link>BouncyCastle.snk</Link> </None> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Sdk"> - <Version>1.0.0-alpha-20161104-2</Version> - <PrivateAssets>All</PrivateAssets> - </PackageReference> - </ItemGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard1.0' "> <PackageReference Include="NETStandard.Library"> <Version>1.6.0</Version> @@ -69,5 +62,4 @@ <Reference Include="System.Core" /> <Reference Include="System.Xml" /> </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> </Project> \ No newline at end of file