зеркало из https://github.com/mono/mono-tls.git
Use the new Xamarin.AsyncTests.PortableImpl and remove unneeded dependencies.
This commit is contained in:
Martin Baulig
Родитель
d99eb528ea
Коммит
fa0a713091
|
|
@ -31,7 +31,6 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
|
|
@ -40,8 +39,8 @@
|
|||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<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="..\..\external\web-tests\support\Xamarin.AsyncTests.PortableImpl\Xamarin.AsyncTests.PortableImpl.projitems" Label="Shared" Condition="Exists('..\..\external\web-tests\support\Xamarin.AsyncTests.PortableImpl\Xamarin.AsyncTests.PortableImpl.projitems')" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\external\web-tests\Xamarin.AsyncTests\Xamarin.AsyncTests.csproj">
|
||||
|
|
@ -72,14 +71,6 @@
|
|||
<Project>{E471C608-9CA8-4787-B5A8-363CDADD9E82}</Project>
|
||||
<Name>Mono.Security.NewTls.Interface</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\external\web-tests\Xamarin.WebTests\Xamarin.WebTests.csproj">
|
||||
<Project>{E93E8622-665B-44D6-B36A-89C93B5B3532}</Project>
|
||||
<Name>Xamarin.WebTests</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\external\web-tests\support\Xamarin.WebTests.Portable\Xamarin.WebTests.Portable.csproj">
|
||||
<Project>{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}</Project>
|
||||
<Name>Xamarin.WebTests.Portable</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>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ using System.Net.Sockets;
|
|||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using NDesk.Options;
|
||||
using Xamarin.WebTests.Portable;
|
||||
using System.Security.Cryptography;
|
||||
|
||||
namespace Mono.Security.NewTls.Console
|
||||
|
|
@ -68,10 +67,6 @@ namespace Mono.Security.NewTls.Console
|
|||
get { return framework; }
|
||||
}
|
||||
|
||||
public IPortableSupport PortableSupport {
|
||||
get { return support; }
|
||||
}
|
||||
|
||||
public int LogLevel {
|
||||
get;
|
||||
private set;
|
||||
|
|
@ -88,7 +83,6 @@ namespace Mono.Security.NewTls.Console
|
|||
}
|
||||
|
||||
TestSession session;
|
||||
IPortableSupport support;
|
||||
SettingsBag settings;
|
||||
TestFramework framework;
|
||||
TestLogger logger;
|
||||
|
|
@ -99,9 +93,9 @@ namespace Mono.Security.NewTls.Console
|
|||
SD.Debug.AutoFlush = true;
|
||||
SD.Debug.Listeners.Add (new SD.ConsoleTraceListener ());
|
||||
|
||||
var support = PortableSupportImpl.Initialize ();
|
||||
PortableSupportImpl.Initialize ();
|
||||
|
||||
var program = new Program (support, args);
|
||||
var program = new Program (args);
|
||||
|
||||
try {
|
||||
var task = program.Run ();
|
||||
|
|
@ -111,9 +105,8 @@ namespace Mono.Security.NewTls.Console
|
|||
}
|
||||
}
|
||||
|
||||
Program (IPortableSupport support, string[] args)
|
||||
Program (string[] args)
|
||||
{
|
||||
this.support = support;
|
||||
rng = RandomNumberGenerator.Create ();
|
||||
|
||||
DependencyInjector.Register<ICryptoProvider> (this);
|
||||
|
|
|
|||
|
|
@ -19,11 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Console", "Console", "{DEBB
|
|||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Security.NewTls.Console", "..\Console\Mono.Security.NewTls.Console\Mono.Security.NewTls.Console.csproj", "{8F077534-F58A-4390-A972-B93161381C84}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.WebTests", "..\external\web-tests\Xamarin.WebTests\Xamarin.WebTests.csproj", "{E93E8622-665B-44D6-B36A-89C93B5B3532}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.WebTests.Portable", "..\external\web-tests\support\Xamarin.WebTests.Portable\Xamarin.WebTests.Portable.csproj", "{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}"
|
||||
EndProject
|
||||
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.WebTests.PortableImpl", "..\external\web-tests\support\Xamarin.WebTests.PortableImpl\Xamarin.WebTests.PortableImpl.shproj", "{751E9E00-2330-4A9D-938B-FF7C86B55E22}"
|
||||
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.AsyncTests.PortableImpl", "..\external\web-tests\support\Xamarin.AsyncTests.PortableImpl\Xamarin.AsyncTests.PortableImpl.shproj", "{4D53941A-ABBE-4B89-A362-C56F7BC0B20A}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.AsyncTests", "..\external\web-tests\Xamarin.AsyncTests\Xamarin.AsyncTests.csproj", "{CE125B3F-AD36-4EDD-B3D5-4CDBE430924A}"
|
||||
EndProject
|
||||
|
|
@ -114,16 +110,6 @@ Global
|
|||
{96EBF2A3-C7E8-4295-9715-938E3A1CA4AD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{96EBF2A3-C7E8-4295-9715-938E3A1CA4AD}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{96EBF2A3-C7E8-4295-9715-938E3A1CA4AD}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}.DebugWin|Any CPU.ActiveCfg = DebugWin|Any CPU
|
||||
{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}.DebugWin|Any CPU.Build.0 = DebugWin|Any CPU
|
||||
{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9A328159-EF48-4082-B8FA-FB4FC2E44B0C}.Release|x86.Build.0 = Release|Any CPU
|
||||
{BEC2B807-EF3B-4013-B828-B3BB2AC1620D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BEC2B807-EF3B-4013-B828-B3BB2AC1620D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BEC2B807-EF3B-4013-B828-B3BB2AC1620D}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -164,16 +150,6 @@ Global
|
|||
{E471C608-9CA8-4787-B5A8-363CDADD9E82}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{E471C608-9CA8-4787-B5A8-363CDADD9E82}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{E471C608-9CA8-4787-B5A8-363CDADD9E82}.Release|x86.Build.0 = Release|Any CPU
|
||||
{E93E8622-665B-44D6-B36A-89C93B5B3532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{E93E8622-665B-44D6-B36A-89C93B5B3532}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{E93E8622-665B-44D6-B36A-89C93B5B3532}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{E93E8622-665B-44D6-B36A-89C93B5B3532}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{E93E8622-665B-44D6-B36A-89C93B5B3532}.DebugWin|Any CPU.ActiveCfg = DebugWin|Any CPU
|
||||
{E93E8622-665B-44D6-B36A-89C93B5B3532}.DebugWin|Any CPU.Build.0 = DebugWin|Any CPU
|
||||
{E93E8622-665B-44D6-B36A-89C93B5B3532}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E93E8622-665B-44D6-B36A-89C93B5B3532}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{E93E8622-665B-44D6-B36A-89C93B5B3532}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{E93E8622-665B-44D6-B36A-89C93B5B3532}.Release|x86.Build.0 = Release|Any CPU
|
||||
{EA1D2205-446B-4B54-823A-94985CC36A17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{EA1D2205-446B-4B54-823A-94985CC36A17}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{EA1D2205-446B-4B54-823A-94985CC36A17}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -187,8 +163,6 @@ Global
|
|||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{8F077534-F58A-4390-A972-B93161381C84} = {DEBB60D9-0226-481E-8743-82EABBF38546}
|
||||
{E93E8622-665B-44D6-B36A-89C93B5B3532} = {DEBB60D9-0226-481E-8743-82EABBF38546}
|
||||
{9A328159-EF48-4082-B8FA-FB4FC2E44B0C} = {DEBB60D9-0226-481E-8743-82EABBF38546}
|
||||
{751E9E00-2330-4A9D-938B-FF7C86B55E22} = {DEBB60D9-0226-481E-8743-82EABBF38546}
|
||||
{4D53941A-ABBE-4B89-A362-C56F7BC0B20A} = {DEBB60D9-0226-481E-8743-82EABBF38546}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 56cebedc2f34f5257d79dd95739cadfe98b14190
|
||||
Subproject commit dbfe6fd54fffa0ef7f8e5386d4587a241c2cee43
|
||||
Загрузка…
Ссылка в новой задаче