diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2015-11-15 17:17:32 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2015-11-15 17:17:32 +0700 |
| commit | fe87f597a0142e8ed9f7f8ef63e09770323937df (patch) | |
| tree | a51c475b15fd0acc1d2fbe70b2f171e4241ee7a4 | |
| parent | Merge branch 'master' of git.bouncycastle.org:bc-csharp into pcl (diff) | |
| download | BouncyCastle.NET-ed25519-fe87f597a0142e8ed9f7f8ef63e09770323937df.tar.xz | |
Switch to using the BouncyCastle.snk file from solution directory (from bc-csharp)
| -rw-r--r-- | crypto/BouncyCastle.snk | bin | 596 -> 0 bytes | |||
| -rw-r--r-- | crypto/crypto.dotnet.csproj | 6 | ||||
| -rw-r--r-- | crypto/crypto.pcl.csproj | 6 | ||||
| -rw-r--r-- | crypto/crypto.pcl2.csproj | 10 |
4 files changed, 14 insertions, 8 deletions
diff --git a/crypto/BouncyCastle.snk b/crypto/BouncyCastle.snk deleted file mode 100644 index b04ca9aae..000000000 --- a/crypto/BouncyCastle.snk +++ /dev/null Binary files differdiff --git a/crypto/crypto.dotnet.csproj b/crypto/crypto.dotnet.csproj index dfb1d16cb..d9ae0db87 100644 --- a/crypto/crypto.dotnet.csproj +++ b/crypto/crypto.dotnet.csproj @@ -10,7 +10,7 @@ <ApplicationIcon /> <AssemblyKeyContainerName /> <AssemblyName>crypto</AssemblyName> - <AssemblyOriginatorKeyFile>BouncyCastle.snk</AssemblyOriginatorKeyFile> + <AssemblyOriginatorKeyFile>..\BouncyCastle.snk</AssemblyOriginatorKeyFile> <DefaultClientScript>JScript</DefaultClientScript> <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> <DefaultTargetSchema>IE50</DefaultTargetSchema> @@ -81,7 +81,9 @@ <NuSpecTfm>dotnet;uap10.0;net46</NuSpecTfm> </PropertyGroup> <ItemGroup> - <None Include="BouncyCastle.snk" /> + <None Include="..\BouncyCastle.snk"> + <Link>BouncyCastle.snk</Link> + </None> <None Include="crypto.dotnet.project.json" /> </ItemGroup> <ItemGroup> diff --git a/crypto/crypto.pcl.csproj b/crypto/crypto.pcl.csproj index 30413b51e..1c3735177 100644 --- a/crypto/crypto.pcl.csproj +++ b/crypto/crypto.pcl.csproj @@ -10,7 +10,7 @@ <ApplicationIcon /> <AssemblyKeyContainerName /> <AssemblyName>crypto</AssemblyName> - <AssemblyOriginatorKeyFile>BouncyCastle.snk</AssemblyOriginatorKeyFile> + <AssemblyOriginatorKeyFile>..\BouncyCastle.snk</AssemblyOriginatorKeyFile> <DefaultClientScript>JScript</DefaultClientScript> <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> <DefaultTargetSchema>IE50</DefaultTargetSchema> @@ -94,7 +94,9 @@ <Compile Include="bzip2\**\*.cs" /> </ItemGroup> <ItemGroup> - <None Include="BouncyCastle.snk" /> + <None Include="..\BouncyCastle.snk"> + <Link>BouncyCastle.snk</Link> + </None> </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <PropertyGroup> diff --git a/crypto/crypto.pcl2.csproj b/crypto/crypto.pcl2.csproj index 62e76ee40..4edf1139e 100644 --- a/crypto/crypto.pcl2.csproj +++ b/crypto/crypto.pcl2.csproj @@ -10,7 +10,7 @@ <ApplicationIcon /> <AssemblyKeyContainerName /> <AssemblyName>crypto</AssemblyName> - <AssemblyOriginatorKeyFile>BouncyCastle.snk</AssemblyOriginatorKeyFile> + <AssemblyOriginatorKeyFile>..\BouncyCastle.snk</AssemblyOriginatorKeyFile> <DefaultClientScript>JScript</DefaultClientScript> <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> <DefaultTargetSchema>IE50</DefaultTargetSchema> @@ -76,12 +76,14 @@ <NuSpecFile Include="$(SolutionDir)Portable.BouncyCastle.nuspec" /> </ItemGroup> <ItemGroup> - <None Include="BouncyCastle.snk" /> - </ItemGroup> - <ItemGroup> <Compile Include="src\**\*.cs" /> <Compile Include="bzip2\**\*.cs" /> </ItemGroup> + <ItemGroup> + <None Include="..\BouncyCastle.snk"> + <Link>BouncyCastle.snk</Link> + </None> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <PropertyGroup> <PreBuildEvent /> |