зеркало из https://github.com/mono/mono-tls.git
Include the OpenSSL backend in the Mac UI.
This commit is contained in:
Родитель
5459bbe93f
Коммит
5444b0ce2a
|
@ -19,7 +19,7 @@
|
||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>false</Optimize>
|
||||||
<OutputPath>bin\Debug</OutputPath>
|
<OutputPath>bin\Debug</OutputPath>
|
||||||
<DefineConstants>DEBUG;MACUI</DefineConstants>
|
<DefineConstants>DEBUG;MACUI;HAVE_OPENSSL</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<ConsolePause>false</ConsolePause>
|
<ConsolePause>false</ConsolePause>
|
||||||
|
@ -29,6 +29,8 @@
|
||||||
<CreatePackage>false</CreatePackage>
|
<CreatePackage>false</CreatePackage>
|
||||||
<EnableCodeSigning>false</EnableCodeSigning>
|
<EnableCodeSigning>false</EnableCodeSigning>
|
||||||
<EnablePackageSigning>false</EnablePackageSigning>
|
<EnablePackageSigning>false</EnablePackageSigning>
|
||||||
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
|
<XamMacArch>i386</XamMacArch>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<Optimize>true</Optimize>
|
<Optimize>true</Optimize>
|
||||||
|
@ -42,7 +44,7 @@
|
||||||
<CreatePackage>false</CreatePackage>
|
<CreatePackage>false</CreatePackage>
|
||||||
<EnableCodeSigning>false</EnableCodeSigning>
|
<EnableCodeSigning>false</EnableCodeSigning>
|
||||||
<EnablePackageSigning>false</EnablePackageSigning>
|
<EnablePackageSigning>false</EnablePackageSigning>
|
||||||
<DefineConstants>MACUI</DefineConstants>
|
<DefineConstants>MACUI;HAVE_OPENSSL</DefineConstants>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
|
@ -158,6 +160,27 @@
|
||||||
<Link>AppDelegate.designer.cs</Link>
|
<Link>AppDelegate.designer.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="BuiltinTestServer.cs" />
|
<Compile Include="BuiltinTestServer.cs" />
|
||||||
|
<Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\NativeCryptoProvider.cs">
|
||||||
|
<Link>Mono.Security.NewTls.TestProvider\NativeCryptoProvider.cs</Link>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\NativeOpenSsl.cs">
|
||||||
|
<Link>Mono.Security.NewTls.TestProvider\NativeOpenSsl.cs</Link>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\NativeOpenSslError.cs">
|
||||||
|
<Link>Mono.Security.NewTls.TestProvider\NativeOpenSslError.cs</Link>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\NativeOpenSslException.cs">
|
||||||
|
<Link>Mono.Security.NewTls.TestProvider\NativeOpenSslException.cs</Link>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\OpenSslClient.cs">
|
||||||
|
<Link>Mono.Security.NewTls.TestProvider\OpenSslClient.cs</Link>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\OpenSslConnection.cs">
|
||||||
|
<Link>Mono.Security.NewTls.TestProvider\OpenSslConnection.cs</Link>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\OpenSslServer.cs">
|
||||||
|
<Link>Mono.Security.NewTls.TestProvider\OpenSslServer.cs</Link>
|
||||||
|
</Compile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="..\..\external\web-tests\Xamarin.AsyncTests.PortableImpl\Xamarin.AsyncTests.PortableImpl.projitems" Label="Shared" Condition="Exists('..\..\external\web-tests\Xamarin.AsyncTests.PortableImpl\Xamarin.AsyncTests.PortableImpl.projitems')" />
|
<Import Project="..\..\external\web-tests\Xamarin.AsyncTests.PortableImpl\Xamarin.AsyncTests.PortableImpl.projitems" Label="Shared" Condition="Exists('..\..\external\web-tests\Xamarin.AsyncTests.PortableImpl\Xamarin.AsyncTests.PortableImpl.projitems')" />
|
||||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
|
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
|
||||||
|
@ -222,4 +245,18 @@
|
||||||
<Link>MainMenu.xib</Link>
|
<Link>MainMenu.xib</Link>
|
||||||
</InterfaceDefinition>
|
</InterfaceDefinition>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<BundleResource Include="..\..\lib\libcrypto.1.0.0.dylib">
|
||||||
|
<Link>libcrypto.1.0.0.dylib</Link>
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\..\lib\libNativeOpenSsl.dylib">
|
||||||
|
<Link>libNativeOpenSsl.dylib</Link>
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\..\lib\libssl.1.0.0.dylib">
|
||||||
|
<Link>libssl.1.0.0.dylib</Link>
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</BundleResource>
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
|
@ -1 +1 @@
|
||||||
Subproject commit f1ecef52752db315dad3a4a5c93b40028dd3cfa7
|
Subproject commit 7a234d93c7bae62e3304995f96b62897dbc4e8cc
|
Загрузка…
Ссылка в новой задаче