diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2016-02-03 23:52:01 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2016-02-03 23:52:01 +0700 |
| commit | 2adeda929867d1327ee875f497de889f0485e7e8 (patch) | |
| tree | bbea2e898ab9b84a046bca01c164c46eed888046 | |
| parent | Update release notes for bcrypt addition (diff) | |
| parent | Merge branch 'ios-android-fixes' of https://github.com/jstedfast/bc-csharp in... (diff) | |
| download | BouncyCastle.NET-ed25519-2adeda929867d1327ee875f497de889f0485e7e8.tar.xz | |
Merge branch 'jstedfast-ios-android-fixes'
| -rw-r--r-- | crypto/BouncyCastle.Android.csproj | 7 | ||||
| -rw-r--r-- | crypto/BouncyCastle.csproj | 1 | ||||
| -rw-r--r-- | crypto/BouncyCastle.iOS.csproj | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/crypto/BouncyCastle.Android.csproj b/crypto/BouncyCastle.Android.csproj index 70d09cc6e..d028b8b31 100644 --- a/crypto/BouncyCastle.Android.csproj +++ b/crypto/BouncyCastle.Android.csproj @@ -2,6 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == 'Any CPU' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> @@ -745,6 +746,7 @@ <Compile Include="src\crypto\engines\Cast5Engine.cs" /> <Compile Include="src\crypto\engines\Cast6Engine.cs" /> <Compile Include="src\crypto\engines\ChaChaEngine.cs" /> + <Compile Include="src\crypto\engines\ChaCha7539Engine.cs" /> <Compile Include="src\crypto\engines\DesEdeEngine.cs" /> <Compile Include="src\crypto\engines\DesEdeWrapEngine.cs" /> <Compile Include="src\crypto\engines\DesEngine.cs" /> @@ -1445,6 +1447,7 @@ <Compile Include="src\util\io\pem\PemReader.cs" /> <Compile Include="src\util\io\pem\PemWriter.cs" /> <Compile Include="src\util\net\IPAddress.cs" /> + <Compile Include="src\util\TypeExtensions.cs" /> <Compile Include="src\util\zlib\Adler32.cs" /> <Compile Include="src\util\zlib\Deflate.cs" /> <Compile Include="src\util\zlib\InfBlocks.cs" /> @@ -1506,5 +1509,5 @@ <None Include="Readme.html" /> <None Include="checklist.txt" /> </ItemGroup> - <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> -</Project> \ No newline at end of file + <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> +</Project> diff --git a/crypto/BouncyCastle.csproj b/crypto/BouncyCastle.csproj index aa7f7780e..5f0a58ad8 100644 --- a/crypto/BouncyCastle.csproj +++ b/crypto/BouncyCastle.csproj @@ -2,6 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == 'Any CPU' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> diff --git a/crypto/BouncyCastle.iOS.csproj b/crypto/BouncyCastle.iOS.csproj index 4c499db46..65f710b8a 100644 --- a/crypto/BouncyCastle.iOS.csproj +++ b/crypto/BouncyCastle.iOS.csproj @@ -2,6 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == 'Any CPU' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> @@ -740,6 +741,7 @@ <Compile Include="src\crypto\engines\Cast5Engine.cs" /> <Compile Include="src\crypto\engines\Cast6Engine.cs" /> <Compile Include="src\crypto\engines\ChaChaEngine.cs" /> + <Compile Include="src\crypto\engines\ChaCha7539Engine.cs" /> <Compile Include="src\crypto\engines\DesEdeEngine.cs" /> <Compile Include="src\crypto\engines\DesEdeWrapEngine.cs" /> <Compile Include="src\crypto\engines\DesEngine.cs" /> @@ -1440,6 +1442,7 @@ <Compile Include="src\util\io\pem\PemReader.cs" /> <Compile Include="src\util\io\pem\PemWriter.cs" /> <Compile Include="src\util\net\IPAddress.cs" /> + <Compile Include="src\util\TypeExtensions.cs" /> <Compile Include="src\util\zlib\Adler32.cs" /> <Compile Include="src\util\zlib\Deflate.cs" /> <Compile Include="src\util\zlib\InfBlocks.cs" /> @@ -1502,4 +1505,4 @@ <None Include="checklist.txt" /> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> -</Project> \ No newline at end of file +</Project> |