diff options
author | Oren Novotny <oren@novotny.org> | 2014-08-27 16:09:15 -0400 |
---|---|---|
committer | Oren Novotny <oren@novotny.org> | 2014-08-27 16:09:15 -0400 |
commit | 1c2e70bb5d4614eeff3948594067c339ec51e04c (patch) | |
tree | 011cb661a4cf4302e7ec806eb2790d5795ec2cb4 | |
parent | Merge in bc-git to this repo (diff) | |
download | BouncyCastle.NET-ed25519-1c2e70bb5d4614eeff3948594067c339ec51e04c.tar.xz |
Add VS 2013 sln
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | BouncyCastle-PCL.sln | 20 | ||||
-rw-r--r-- | crypto.tests.Net45/Properties/AssemblyInfo.cs | 36 | ||||
-rw-r--r-- | crypto.tests.Net45/crypto.tests.Net45.csproj | 81 | ||||
-rw-r--r-- | crypto.tests.Net45/packages.config | 4 | ||||
-rw-r--r-- | crypto/crypto.Net45.csproj | 54 | ||||
-rw-r--r-- | crypto/src/crypto/tls/LegacyTlsAuthentication.cs | 2 | ||||
-rw-r--r-- | crypto/src/crypto/tls/LegacyTlsClient.cs | 4 | ||||
-rw-r--r-- | crypto/src/math/ec/multiplier/FpNafMultiplier.cs | 2 | ||||
-rw-r--r-- | crypto/src/math/ec/multiplier/WNafMultiplier.cs | 2 | ||||
-rw-r--r-- | crypto/test/src/util/test/SimpleTest.cs | 4 |
11 files changed, 201 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 8bb56e9e2..c6e54ef1b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ doc/ obj/ _Resharper.*/ +packages/ \ No newline at end of file diff --git a/BouncyCastle-PCL.sln b/BouncyCastle-PCL.sln index 624b845fe..3ab7a13e6 100644 --- a/BouncyCastle-PCL.sln +++ b/BouncyCastle-PCL.sln @@ -1,13 +1,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30723.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{43196EF9-B75F-4ABB-8967-DAFD621A7D05}" ProjectSection(SolutionItems) = preProject Portable.BouncyCastle.nuspec = Portable.BouncyCastle.nuspec README.md = README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crypto", "Crypto\crypto.csproj", "{38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crypto.Net45", "crypto\crypto.Net45.csproj", "{45473847-8AF8-4BAF-B768-442C6875B8CF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crypto.tests.Net45", "crypto.tests.Net45\crypto.tests.Net45.csproj", "{45473847-8AF8-4BAF-B768-442C6875B8CE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,10 +19,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Release|Any CPU.Build.0 = Release|Any CPU + {45473847-8AF8-4BAF-B768-442C6875B8CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {45473847-8AF8-4BAF-B768-442C6875B8CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45473847-8AF8-4BAF-B768-442C6875B8CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {45473847-8AF8-4BAF-B768-442C6875B8CF}.Release|Any CPU.Build.0 = Release|Any CPU + {45473847-8AF8-4BAF-B768-442C6875B8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {45473847-8AF8-4BAF-B768-442C6875B8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45473847-8AF8-4BAF-B768-442C6875B8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {45473847-8AF8-4BAF-B768-442C6875B8CE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/crypto.tests.Net45/Properties/AssemblyInfo.cs b/crypto.tests.Net45/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..52472faf8 --- /dev/null +++ b/crypto.tests.Net45/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("crypto.tests.Net45")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("crypto.tests.Net45")] +[assembly: AssemblyCopyright("Copyright © 2014")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("22ae3209-5ce9-448c-9212-04b9e8f6361e")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/crypto.tests.Net45/crypto.tests.Net45.csproj b/crypto.tests.Net45/crypto.tests.Net45.csproj new file mode 100644 index 000000000..3d751b1ff --- /dev/null +++ b/crypto.tests.Net45/crypto.tests.Net45.csproj @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{45473847-8AF8-4BAF-B768-442C6875B8CE}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>crypto.tests</RootNamespace> + <AssemblyName>crypto.tests.Net45</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>TRACE;DEBUG;LIB;PCL;SILVERLIGHT</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE;LIB;PCL;SILVERLIGHT</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="nunit.core"> + <HintPath>..\crypto\test\lib\nunit.core.dll</HintPath> + </Reference> + <Reference Include="nunit.core.interfaces"> + <HintPath>..\crypto\test\lib\nunit.core.interfaces.dll</HintPath> + </Reference> + <Reference Include="nunit.framework"> + <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <Compile Include="..\crypto\test\src\**\*.cs" Exclude="..\**\examples\**\*.cs;"> + <Link>%(RecursiveDir)%(Filename)%(Extension)</Link> + </Compile> + <EmbeddedResource Include="..\crypto\test\data\**\*.*"> + <Link>%(RecursiveDir)%(Filename)%(Extension)</Link> + </EmbeddedResource> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\crypto\crypto.Net45.csproj"> + <Project>{45473847-8af8-4baf-b768-442c6875b8cf}</Project> + <Name>crypto.Net45</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> +</Project> \ No newline at end of file diff --git a/crypto.tests.Net45/packages.config b/crypto.tests.Net45/packages.config new file mode 100644 index 000000000..ad37a5282 --- /dev/null +++ b/crypto.tests.Net45/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="NUnit" version="2.6.3" targetFramework="net45" /> +</packages> \ No newline at end of file diff --git a/crypto/crypto.Net45.csproj b/crypto/crypto.Net45.csproj new file mode 100644 index 000000000..14b3581f5 --- /dev/null +++ b/crypto/crypto.Net45.csproj @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{45473847-8AF8-4BAF-B768-442C6875B8CF}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>crypto</RootNamespace> + <AssemblyName>crypto</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>TRACE;DEBUG;LIB;PCL;SILVERLIGHT</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE;LIB;PCL;SILVERLIGHT</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="src\**\*.cs" /> + <Compile Include="bzip2\**\*.cs" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> +</Project> \ No newline at end of file diff --git a/crypto/src/crypto/tls/LegacyTlsAuthentication.cs b/crypto/src/crypto/tls/LegacyTlsAuthentication.cs index 395f94208..5da9576af 100644 --- a/crypto/src/crypto/tls/LegacyTlsAuthentication.cs +++ b/crypto/src/crypto/tls/LegacyTlsAuthentication.cs @@ -1,3 +1,4 @@ +#if FALSE using System; namespace Org.BouncyCastle.Crypto.Tls @@ -28,3 +29,4 @@ namespace Org.BouncyCastle.Crypto.Tls } } } +#endif \ No newline at end of file diff --git a/crypto/src/crypto/tls/LegacyTlsClient.cs b/crypto/src/crypto/tls/LegacyTlsClient.cs index fbb9a732e..98a8bcbfc 100644 --- a/crypto/src/crypto/tls/LegacyTlsClient.cs +++ b/crypto/src/crypto/tls/LegacyTlsClient.cs @@ -1,3 +1,4 @@ +#if FALSE using System; namespace Org.BouncyCastle.Crypto.Tls @@ -23,4 +24,5 @@ namespace Org.BouncyCastle.Crypto.Tls return new LegacyTlsAuthentication(verifyer); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/crypto/src/math/ec/multiplier/FpNafMultiplier.cs b/crypto/src/math/ec/multiplier/FpNafMultiplier.cs index f5a98501a..7c034ce6e 100644 --- a/crypto/src/math/ec/multiplier/FpNafMultiplier.cs +++ b/crypto/src/math/ec/multiplier/FpNafMultiplier.cs @@ -1,3 +1,4 @@ +#if FALSE namespace Org.BouncyCastle.Math.EC.Multiplier { /** @@ -37,3 +38,4 @@ namespace Org.BouncyCastle.Math.EC.Multiplier } } } +#endif \ No newline at end of file diff --git a/crypto/src/math/ec/multiplier/WNafMultiplier.cs b/crypto/src/math/ec/multiplier/WNafMultiplier.cs index b5cf34ba8..484bb30e7 100644 --- a/crypto/src/math/ec/multiplier/WNafMultiplier.cs +++ b/crypto/src/math/ec/multiplier/WNafMultiplier.cs @@ -1,3 +1,4 @@ +#if FALSE using System; namespace Org.BouncyCastle.Math.EC.Multiplier @@ -239,3 +240,4 @@ namespace Org.BouncyCastle.Math.EC.Multiplier } } } +#endif \ No newline at end of file diff --git a/crypto/test/src/util/test/SimpleTest.cs b/crypto/test/src/util/test/SimpleTest.cs index be846e20f..10c83374d 100644 --- a/crypto/test/src/util/test/SimpleTest.cs +++ b/crypto/test/src/util/test/SimpleTest.cs @@ -119,7 +119,7 @@ namespace Org.BouncyCastle.Utilities.Test #if BC_BUILD_MONODEVELOP return "test.data." + name; #else - return "crypto.test.data." + name; + return "crypto.tests." + name; #endif } @@ -130,7 +130,7 @@ namespace Org.BouncyCastle.Utilities.Test #if BC_BUILD_MONODEVELOP return fullName.Substring("test.data.".Length); #else - return fullName.Substring("crypto.test.data.".Length); + return fullName.Substring("crypto.tests.".Length); #endif } |