Turn Mono.Security.NewTls.TestProvider into a shared project.

It will be used on Desktop and Mobile.
This commit is contained in:
Martin Baulig 2015-03-05 03:00:16 +01:00
Родитель 8a72aa66d1
Коммит 78ed69fa5e
13 изменённых файлов: 58 добавлений и 112 удалений

Просмотреть файл

@ -8,6 +8,8 @@
<RootNamespace>Mono.Security.NewTls.Console</RootNamespace>
<AssemblyName>Mono.Security.NewTls.Console</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\new-tls.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -39,6 +41,7 @@
<Compile Include="NDeskOptions.cs" />
</ItemGroup>
<Import Project="..\..\external\web-tests\support\Xamarin.WebTests.PortableImpl\Xamarin.WebTests.PortableImpl.projitems" Label="Shared" Condition="Exists('..\..\external\web-tests\support\Xamarin.WebTests.PortableImpl\Xamarin.WebTests.PortableImpl.projitems')" />
<Import Project="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.projitems" Label="Shared" Condition="Exists('..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.projitems')" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\external\web-tests\Xamarin.AsyncTests\Xamarin.AsyncTests.csproj">
@ -57,10 +60,6 @@
<Project>{4B5EDBC8-F8EA-48E4-AA87-A3FC52202F01}</Project>
<Name>Mono.Security.Providers.NewTls</Name>
</ProjectReference>
<ProjectReference Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.csproj">
<Project>{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}</Project>
<Name>Mono.Security.NewTls.TestProvider</Name>
</ProjectReference>
<ProjectReference Include="..\..\Mono.Security.NewTls.Tests\Mono.Security.NewTls.Tests.csproj">
<Project>{96EBF2A3-C7E8-4295-9715-938E3A1CA4AD}</Project>
<Name>Mono.Security.NewTls.Tests</Name>
@ -85,5 +84,9 @@
<Project>{2106FB71-AA81-49C5-89F2-445A6C7DF9E6}</Project>
<Name>Mono.Security.NewTls.TestProvider.OpenSsl</Name>
</ProjectReference>
<ProjectReference Include="..\..\Mono.Security.NewTls\Mono.Security.NewTls.csproj">
<Project>{C577448D-707B-4DDD-83DC-9CB758FC6DE5}</Project>
<Name>Mono.Security.NewTls</Name>
</ProjectReference>
</ItemGroup>
</Project>

Просмотреть файл

@ -71,6 +71,7 @@
<Compile Include="CryptoTestFactory.cs" />
<Compile Include="MonoCryptoContext.cs" />
</ItemGroup>
<Import Project="..\..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.projitems" Label="Shared" Condition="Exists('..\..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.projitems')" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<MonoDevelop>
@ -114,10 +115,6 @@
<Project>{EA1D2205-446B-4B54-823A-94985CC36A17}</Project>
<Name>Mono.Security.NewTls.TestFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.csproj">
<Project>{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}</Project>
<Name>Mono.Security.NewTls.TestProvider</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\external\web-tests\Xamarin.AsyncTests\Xamarin.AsyncTests.csproj">
<Project>{CE125B3F-AD36-4EDD-B3D5-4CDBE430924A}</Project>
<Name>Xamarin.AsyncTests</Name>
@ -126,6 +123,10 @@
<Project>{E93E8622-665B-44D6-B36A-89C93B5B3532}</Project>
<Name>Xamarin.WebTests</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Mono.Security.NewTls.TestProvider.OpenSsl\Mono.Security.NewTls.TestProvider.OpenSsl.csproj">
<Project>{2106FB71-AA81-49C5-89F2-445A6C7DF9E6}</Project>
<Name>Mono.Security.NewTls.TestProvider.OpenSsl</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="..\Framework\CA\" />

Просмотреть файл

@ -48,6 +48,7 @@
<Compile Include="ConnectionFactoryParametersAttribute.cs" />
<Compile Include="ICryptoTestContext.cs" />
</ItemGroup>
<Import Project="..\..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.projitems" Label="Shared" Condition="Exists('..\..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.projitems')" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<MonoDevelop>
@ -72,10 +73,6 @@
<Project>{EA1D2205-446B-4B54-823A-94985CC36A17}</Project>
<Name>Mono.Security.NewTls.TestFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.csproj">
<Project>{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}</Project>
<Name>Mono.Security.NewTls.TestProvider</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\external\web-tests\Xamarin.AsyncTests\Xamarin.AsyncTests.csproj">
<Project>{CE125B3F-AD36-4EDD-B3D5-4CDBE430924A}</Project>
<Name>Xamarin.AsyncTests</Name>

Просмотреть файл

@ -98,10 +98,6 @@
<Project>{EA1D2205-446B-4B54-823A-94985CC36A17}</Project>
<Name>Mono.Security.NewTls.TestFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.csproj">
<Project>{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}</Project>
<Name>Mono.Security.NewTls.TestProvider</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\external\web-tests\Xamarin.AsyncTests\Xamarin.AsyncTests.csproj">
<Project>{CE125B3F-AD36-4EDD-B3D5-4CDBE430924A}</Project>
<Name>Xamarin.AsyncTests</Name>

Просмотреть файл

@ -76,10 +76,6 @@
<Project>{EA1D2205-446B-4B54-823A-94985CC36A17}</Project>
<Name>Mono.Security.NewTls.TestFramework</Name>
</ProjectReference>
<ProjectReference Include="..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.csproj">
<Project>{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}</Project>
<Name>Mono.Security.NewTls.TestProvider</Name>
</ProjectReference>
<ProjectReference Include="..\external\web-tests\Xamarin.AsyncTests\Xamarin.AsyncTests.csproj">
<Project>{CE125B3F-AD36-4EDD-B3D5-4CDBE430924A}</Project>
<Name>Xamarin.AsyncTests</Name>

Просмотреть файл

@ -100,7 +100,7 @@ namespace Mono.Security.NewTls.TestProvider
protected void Debug (string message, params object[] args)
{
if (Parameters.EnableDebugging)
Console.WriteLine ("[{0}]: {1}", GetType ().Name, string.Format (message, args));
global::System.Console.WriteLine ("[{0}]: {1}", GetType ().Name, string.Format (message, args));
}
#region ITestInstance implementation

Просмотреть файл

@ -1,78 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Mono.Security.NewTls.TestProvider</RootNamespace>
<AssemblyName>Mono.Security.NewTls.TestProvider</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\new-tls.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="PrivateFile.cs" />
<Compile Include="ServerCertificate.cs" />
<Compile Include="CertificateAndKeyAsPFX.cs" />
<Compile Include="CertificateAsPEM.cs" />
<Compile Include="ClientCertificate.cs" />
<Compile Include="MonoCryptoProvider.cs" />
<Compile Include="SymmetricAlgorithmProxy.cs" />
<Compile Include="Connection.cs" />
<Compile Include="DotNetClient.cs" />
<Compile Include="DotNetConnection.cs" />
<Compile Include="DotNetServer.cs" />
<Compile Include="ClientAndServer.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<MonoDevelop>
<Properties>
<Policies>
<DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedFlat" ResourceNamePolicy="FileFormatDefault" />
</Policies>
</Properties>
</MonoDevelop>
</ProjectExtensions>
<ItemGroup>
<ProjectReference Include="..\Mono.Security.NewTls.TestFramework\Mono.Security.NewTls.TestFramework.csproj">
<Project>{EA1D2205-446B-4B54-823A-94985CC36A17}</Project>
<Name>Mono.Security.NewTls.TestFramework</Name>
</ProjectReference>
<ProjectReference Include="..\Mono.Security.NewTls.Interface\Mono.Security.NewTls.Interface.csproj">
<Project>{E471C608-9CA8-4787-B5A8-363CDADD9E82}</Project>
<Name>Mono.Security.NewTls.Interface</Name>
</ProjectReference>
<ProjectReference Include="..\Mono.Security.NewTls\Mono.Security.NewTls.csproj">
<Project>{C577448D-707B-4DDD-83DC-9CB758FC6DE5}</Project>
<Name>Mono.Security.NewTls</Name>
</ProjectReference>
<ProjectReference Include="..\external\web-tests\Xamarin.AsyncTests\Xamarin.AsyncTests.csproj">
<Project>{CE125B3F-AD36-4EDD-B3D5-4CDBE430924A}</Project>
<Name>Xamarin.AsyncTests</Name>
</ProjectReference>
</ItemGroup>
</Project>

Просмотреть файл

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>{648D351C-B6F7-4BFC-9BD2-1F82C6869EC2}</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>TempShared</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)CertificateAndKeyAsPFX.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CertificateAsPEM.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ClientAndServer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ClientCertificate.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Connection.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DotNetClient.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DotNetConnection.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DotNetServer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)MonoCryptoProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)PrivateFile.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ServerCertificate.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SymmetricAlgorithmProxy.cs" />
</ItemGroup>
</Project>

Просмотреть файл

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{648D351C-B6F7-4BFC-9BD2-1F82C6869EC2}</ProjectGuid>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<Import Project="Mono.Security.NewTls.TestProvider.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
</Project>

Просмотреть файл

@ -10,6 +10,8 @@
<AssemblyName>Mono.Security.NewTls.Tests</AssemblyName>
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\new-tls.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

Просмотреть файл

@ -19,8 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Security.NewTls.TestFr
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Security.NewTls.Interface", "..\Mono.Security.NewTls.Interface\Mono.Security.NewTls.Interface.csproj", "{E471C608-9CA8-4787-B5A8-363CDADD9E82}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Security.NewTls.TestProvider", "..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.csproj", "{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Security.NewTls.Tests", "..\Mono.Security.NewTls.Tests\Mono.Security.NewTls.Tests.csproj", "{96EBF2A3-C7E8-4295-9715-938E3A1CA4AD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Console", "Console", "{DEBB60D9-0226-481E-8743-82EABBF38546}"
@ -41,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.AsyncTests.Remoting
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Security.NewTls.TestProvider.OpenSsl", "..\Mono.Security.NewTls.TestProvider.OpenSsl\Mono.Security.NewTls.TestProvider.OpenSsl.csproj", "{2106FB71-AA81-49C5-89F2-445A6C7DF9E6}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Mono.Security.NewTls.TestProvider", "..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider.shproj", "{648D351C-B6F7-4BFC-9BD2-1F82C6869EC2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -60,16 +60,6 @@ Global
{2106FB71-AA81-49C5-89F2-445A6C7DF9E6}.Release|Any CPU.Build.0 = Release|Any CPU
{2106FB71-AA81-49C5-89F2-445A6C7DF9E6}.Release|x86.ActiveCfg = Release|Any CPU
{2106FB71-AA81-49C5-89F2-445A6C7DF9E6}.Release|x86.Build.0 = Release|Any CPU
{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}.Debug|x86.ActiveCfg = Debug|Any CPU
{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}.Debug|x86.Build.0 = Debug|Any CPU
{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}.DebugWin|Any CPU.ActiveCfg = Debug|Any CPU
{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}.DebugWin|Any CPU.Build.0 = Debug|Any CPU
{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}.Release|Any CPU.Build.0 = Release|Any CPU
{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}.Release|x86.ActiveCfg = Release|Any CPU
{3A7EAE09-A0A6-49EC-B75B-E38DFE649EF1}.Release|x86.Build.0 = Release|Any CPU
{43272ABC-8798-4B6F-A8CA-D7F082DBB440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43272ABC-8798-4B6F-A8CA-D7F082DBB440}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43272ABC-8798-4B6F-A8CA-D7F082DBB440}.Debug|x86.ActiveCfg = Debug|Any CPU

Просмотреть файл

@ -29,4 +29,7 @@
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<DisabledProjects>
<String>../MartinsPlayground/Instrumentation/Console/Mono.Security.Instrumentation.Console.csproj</String>
</DisabledProjects>
</Properties>

Просмотреть файл

@ -50,4 +50,4 @@ using System.Runtime.InteropServices;
[assembly: InternalsVisibleTo ("Mono.Security.Instrumentation.Console, PublicKey=0024000004800000940000000602000000240000525341310004000011000000990dad24771188a27bb12112dff736fc75d80d42b0ad009366b859ec62a4b628d65e99bfae957c3907c4e728ba933316727b16ca62ea951b9ce6050ecdc8daf04613befedbc99007f1210fee0f22e8b822a05cd889241bb12324a9907962adf7e2e976bca92702eddee917b440aff54af6f8511f4863379fac442cf72b01e2a8")]
#endif
[assembly: InternalsVisibleTo ("Mono.Security.NewTls.TestProvider, PublicKey=002400000480000094000000060200000024000052534131000400001100000003336d6aed41624ca156ab579881fe90a576f1dfec48378fc94e4e440f4556776224e2d70c18996d91f36227f539fdb44340e07651f1455a489b29a7e6219a8f85e52b0f8588b4f8a857746a8468d37b556223d1452f3fcbaf0f269cdf1900ceb68f69485dc5887750d19571030c732331e00387d9b813a9ad52891087301793")]
[assembly: InternalsVisibleTo ("Mono.Security.NewTls.Console, PublicKey=002400000480000094000000060200000024000052534131000400001100000003336d6aed41624ca156ab579881fe90a576f1dfec48378fc94e4e440f4556776224e2d70c18996d91f36227f539fdb44340e07651f1455a489b29a7e6219a8f85e52b0f8588b4f8a857746a8468d37b556223d1452f3fcbaf0f269cdf1900ceb68f69485dc5887750d19571030c732331e00387d9b813a9ad52891087301793")]