Reflect latest web-tests changes.

This commit is contained in:
Martin Baulig 2015-03-09 19:46:34 +01:00
Родитель 9f7443c2ac
Коммит b1d67c3e21
3 изменённых файлов: 11 добавлений и 12 удалений

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

@ -95,7 +95,7 @@ namespace Mono.Security.NewTls.Console
SD.Debug.AutoFlush = true; SD.Debug.AutoFlush = true;
SD.Debug.Listeners.Add (new SD.ConsoleTraceListener ()); SD.Debug.Listeners.Add (new SD.ConsoleTraceListener ());
PortableSupportImpl.Initialize (); new PortableSupportImpl ().Initialize ();
var program = new Program (args); var program = new Program (args);

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

@ -24,6 +24,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
using System; using System;
using System.Threading;
using Xamarin.AsyncTests; using Xamarin.AsyncTests;
using Mono.Security.Interface; using Mono.Security.Interface;
using Mono.Security.Providers.NewTls; using Mono.Security.Providers.NewTls;
@ -36,14 +37,11 @@ namespace Mono.Security.NewTls.TestProvider
public class DependencyProvider : IDependencyProvider public class DependencyProvider : IDependencyProvider
{ {
public static DependencyProvider Instance = new DependencyProvider (); static int initialized;
DependencyProvider ()
{
}
public void Initialize () public void Initialize ()
{ {
if (Interlocked.CompareExchange (ref initialized, 1, 0) == 0) {
var newTlsProvider = new NewTlsProvider (); var newTlsProvider = new NewTlsProvider ();
DependencyInjector.Register<NewTlsProvider> (newTlsProvider); DependencyInjector.Register<NewTlsProvider> (newTlsProvider);
MonoTlsProviderFactory.InstallProvider (newTlsProvider); MonoTlsProviderFactory.InstallProvider (newTlsProvider);
@ -53,4 +51,5 @@ namespace Mono.Security.NewTls.TestProvider
} }
} }
} }
}

2
external/web-tests поставляемый

@ -1 +1 @@
Subproject commit 0be16c0e2fed3d42ca322834c007134483cc4841 Subproject commit 5e394df87f40049184835dc1c50e23f952b57731