Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support netstandard #248

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support netstandard #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43f9810
Support netstandard
heytherewill May 6, 2017
38b46d7
Update nuget
heytherewill May 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,26 @@ MDTOOL ?= /Applications/Xamarin\ Studio.app/Contents/MacOS/mdtool

.PHONY: all clean

all: ModernHttpClient.iOS.dll ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll
all: ModernHttpClient.iOS.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll

package: ModernHttpClient.iOS.dll ModernHttpClient.iOS64.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll
package: ModernHttpClient.iOS.dll ModernHttpClient.Android.dll ModernHttpClient.Portable.dll
mono vendor/nuget/NuGet.exe pack ./ModernHttpClient.nuspec
mv modernhttpclient*.nupkg ./build/

ModernHttpClient.Android.dll:
$(MDTOOL) build -c:Release ./src/ModernHttpClient/ModernHttpClient.Android.csproj
mkdir -p ./build/MonoAndroid
mv ./src/ModernHttpClient/bin/Release/MonoAndroid/Modern* ./build/MonoAndroid
$(MDTOOL) build -c:Release ./src/ModernHttpClient.Android/ModernHttpClient.Android.csproj
mkdir -p ./build/monoandroid
mv ./src/ModernHttpClient.Android/bin/Release/Modern* ./build/monoandroid

ModernHttpClient.iOS.dll:
$(MDTOOL) build -c:Release ./src/ModernHttpClient/ModernHttpClient.iOS.csproj
mkdir -p ./build/MonoTouch
mv ./src/ModernHttpClient/bin/Release/MonoTouch/Modern* ./build/MonoTouch

ModernHttpClient.iOS64.dll:
$(MDTOOL) build -c:Release ./src/ModernHttpClient/ModernHttpClient.iOS64.csproj
mkdir -p ./build/Xamarin.iOS10
mv ./src/ModernHttpClient/bin/Release/Xamarin.iOS10/Modern* ./build/Xamarin.iOS10
$(MDTOOL) build -c:Release ./src/ModernHttpClient.iOS/ModernHttpClient.iOS.csproj
mkdir -p ./build/xamarinios
mv ./src/ModernHttpClient.iOS/bin/Release/Modern* ./build/xamarinios

ModernHttpClient.Portable.dll:
$(MDTOOL) build -c:Release ./src/ModernHttpClient/ModernHttpClient.Portable.csproj
mkdir -p ./build/Portable-Net45+WinRT45+WP8+WPA81
mv ./src/ModernHttpClient/bin/Release/Portable-Net45+WinRT45+WP8+WPA81/Modern* ./build/Portable-Net45+WinRT45+WP8+WPA81
$(MDTOOL) build -c:Release ./src/ModernHttpClient/ModernHttpClient.csproj
mkdir -p ./build/netstandard1.6
mv ./src/ModernHttpClient/bin/Release/Modern* ./build/netstandard1.6

clean:
$(MDTOOL) build -t:Clean ModernHttpClient.sln
Expand Down
90 changes: 36 additions & 54 deletions ModernHttpClient.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.iOS", "src\ModernHttpClient\ModernHttpClient.iOS.csproj", "{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.Android", "src\ModernHttpClient\ModernHttpClient.Android.csproj", "{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground.Android", "src\Playground.Android\Playground.Android.csproj", "{90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground.iOS", "src\Playground.iOS\Playground.iOS.csproj", "{2CE837CD-9B97-4058-9156-339697EEE228}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.Portable", "src\ModernHttpClient\ModernHttpClient.Portable.csproj", "{6DD98593-4498-463D-B16E-F6CC5A928B79}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient", "src\ModernHttpClient\ModernHttpClient.csproj", "{6DD98593-4498-463D-B16E-F6CC5A928B79}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.Android", "src\ModernHttpClient.Android\ModernHttpClient.Android.csproj", "{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.iOS64", "src\ModernHttpClient\ModernHttpClient.iOS64.csproj", "{6941F069-AC02-40EE-BBF3-9FE3331030EF}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernHttpClient.iOS", "src\ModernHttpClient.iOS\ModernHttpClient.iOS.csproj", "{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -25,22 +23,6 @@ Global
AppStore|iPhone = AppStore|iPhone
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.AppStore|iPhone.Build.0 = Debug|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Debug|iPhone.Build.0 = Debug|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Release|Any CPU.Build.0 = Release|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Release|iPhone.ActiveCfg = Release|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Release|iPhone.Build.0 = Release|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{0F2A1CC8-4168-4CB4-B334-28C28BA51ECB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{2CE837CD-9B97-4058-9156-339697EEE228}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
{2CE837CD-9B97-4058-9156-339697EEE228}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
{2CE837CD-9B97-4058-9156-339697EEE228}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
Expand All @@ -57,22 +39,6 @@ Global
{2CE837CD-9B97-4058-9156-339697EEE228}.Release|iPhone.Build.0 = Release|iPhone
{2CE837CD-9B97-4058-9156-339697EEE228}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{2CE837CD-9B97-4058-9156-339697EEE228}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.AppStore|iPhone.Build.0 = Debug|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhone.Build.0 = Debug|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|Any CPU.Build.0 = Release|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhone.ActiveCfg = Release|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhone.Build.0 = Release|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{6941F069-AC02-40EE-BBF3-9FE3331030EF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{6DD98593-4498-463D-B16E-F6CC5A928B79}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{6DD98593-4498-463D-B16E-F6CC5A928B79}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{6DD98593-4498-463D-B16E-F6CC5A928B79}.AppStore|iPhone.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -105,22 +71,38 @@ Global
{90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|iPhone.Build.0 = Release|Any CPU
{90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{90F8D67C-8D81-4DCE-BAE7-1ABA136A4C60}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.AppStore|iPhone.Build.0 = Debug|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhone.Build.0 = Debug|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|Any CPU.Build.0 = Release|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhone.ActiveCfg = Release|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhone.Build.0 = Release|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F7290B9E-C821-4DA7-A4E5-824D9B0F70F2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Release|Any CPU.Build.0 = Release|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Debug|iPhone.Build.0 = Debug|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Release|iPhone.ActiveCfg = Release|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Release|iPhone.Build.0 = Release|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{1A9312F0-C002-44A4-B6BA-AE4897EF2BBC}.AppStore|iPhone.Build.0 = Debug|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Release|Any CPU.Build.0 = Release|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Debug|iPhone.Build.0 = Debug|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Release|iPhone.ActiveCfg = Release|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Release|iPhone.Build.0 = Release|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{E8EC3E3C-AEBE-4226-9837-0DC674C2CA8E}.AppStore|iPhone.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
Expand Down
Binary file removed ext/portable-headers/System.Net.Http.dll
View file
Open in desktop
Binary file not shown.
28 changes: 13 additions & 15 deletions ...ttpClient/ModernHttpClient.Android.csproj → ...t.Android/ModernHttpClient.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\MonoAndroid</OutputPath>
<OutputPath>bin\Debug\</OutputPath>
<IntermediateOutputPath>obj\Debug\MonoAndroid</IntermediateOutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
Expand All @@ -32,7 +32,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\MonoAndroid</OutputPath>
<OutputPath>bin\Release\</OutputPath>
<IntermediateOutputPath>obj\Release\MonoAndroid</IntermediateOutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -45,25 +45,23 @@
<Reference Include="System.Core" />
<Reference Include="System.Net.Http" />
<Reference Include="Mono.Android" />
<Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Android\OkHttpNetworkHandler.cs" />
<None Include="Resources\AboutResources.txt" />
<AndroidResource Include="Resources\values\Strings.xml" />
<Folder Include="Android\Properties\" />
<Compile Include="Android\ConcatenatingStream.cs" />
<Folder Include="Properties\" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ProgressStreamContent.cs" />
<Compile Include="Utility.cs" />
<Compile Include="CaptiveNetworkException.cs" />
<Compile Include="Android\NativeCookieHandler.cs" />
<Compile Include="..\Shared\\AssemblyInfo.cs" />
<Compile Include="..\Shared\ProgressStreamContent.cs" />
<Compile Include="..\Shared\Utility.cs" />
<Compile Include="..\Shared\CaptiveNetworkException.cs" />
<Reference Include="Square.OkIO">
<HintPath>..\..\packages\Square.OkIO.1.5.0.0\lib\MonoAndroid\Square.OkIO.dll</HintPath>
</Reference>
<None Include="packages.config" />
<Reference Include="Square.OkHttp">
<HintPath>..\..\packages\Square.OkHttp.2.4.0.3\lib\MonoAndroid\Square.OkHttp.dll</HintPath>
</Reference>
<Compile Include="Platform\NativeCookieHandler.cs" />
<Compile Include="Platform\OkHttpNetworkHandler.cs" />
<Compile Include="Platform\ConcatenatingStream.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
<ItemGroup>
<Folder Include="Platform\" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project>
0 ...HttpClient/Android/ConcatenatingStream.cs → ...t.Android/Platform/ConcatenatingStream.cs
View file
Open in desktop
File renamed without changes.
0 ...HttpClient/Android/NativeCookieHandler.cs → ...t.Android/Platform/NativeCookieHandler.cs
View file
Open in desktop
File renamed without changes.
21 changes: 1 addition & 20 deletions ...ttpClient/Android/OkHttpNetworkHandler.cs → ....Android/Platform/OkHttpNetworkHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
using System.Text.RegularExpressions;
using Java.IO;
using System.Security.Cryptography.X509Certificates;
using System.Globalization;
using Android.OS;

namespace ModernHttpClient
{
Expand Down Expand Up @@ -198,7 +196,7 @@ class HostnameVerifier : Java.Lang.Object, IHostnameVerifier

public bool Verify(string hostname, ISSLSession session)
{
return verifyServerCertificate(hostname, session) & verifyClientCiphers(hostname, session);
return verifyServerCertificate(hostname, session);
}

/// <summary>
Expand Down Expand Up @@ -261,22 +259,5 @@ static bool verifyServerCertificate(string hostname, ISSLSession session)
// Call the delegate to validate
return ServicePointManager.ServerCertificateValidationCallback(hostname, root, chain, errors);
}

/// <summary>
/// Verifies client ciphers and is only available in Mono and Xamarin products.
/// </summary>
/// <returns><c>true</c>, if client ciphers was verifyed, <c>false</c> otherwise.</returns>
/// <param name="hostname"></param>
/// <param name="session"></param>
static bool verifyClientCiphers(string hostname, ISSLSession session)
{
var callback = ServicePointManager.ClientCipherSuitesCallback;
if (callback == null) return true;

var protocol = session.Protocol.StartsWith("SSL", StringComparison.InvariantCulture) ? SecurityProtocolType.Ssl3 : SecurityProtocolType.Tls;
var acceptedCiphers = callback(protocol, new[] { session.CipherSuite });

return acceptedCiphers.Contains(session.CipherSuite);
}
}
}
Empty file added src/ModernHttpClient.Android/Resources/Resource.designer.cs
View file
Open in desktop
Empty file.
5 changes: 5 additions & 0 deletions src/ModernHttpClient.Android/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Square.OkHttp" version="2.4.0.3" targetFramework="MonoAndroid23" />
<package id="Square.OkIO" version="1.5.0.0" targetFramework="MonoAndroid23" />
</packages>
23 changes: 12 additions & 11 deletions ...nHttpClient/ModernHttpClient.iOS64.csproj → ...ttpClient.iOS/ModernHttpClient.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\Xamarin.iOS10</OutputPath>
<OutputPath>bin\Debug\</OutputPath>
<IntermediateOutputPath>obj\Debug\Xamarin.iOS10</IntermediateOutputPath>
<DefineConstants>DEBUG;UIKIT;UNIFIED</DefineConstants>
<ErrorReport>prompt</ErrorReport>
Expand All @@ -27,7 +27,7 @@
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<DefineConstants>UIKIT;UNIFIED</DefineConstants>
<OutputPath>bin\Release\Xamarin.iOS10</OutputPath>
<OutputPath>bin\Release\</OutputPath>
<IntermediateOutputPath>obj\Release\Xamarin.iOS10</IntermediateOutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -41,18 +41,19 @@
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup>
<Compile Include="iOS\NSUrlSessionHandler.cs" />
<Compile Include="iOS\AsyncLock.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="CaptiveNetworkException.cs" />
<Compile Include="ProgressStreamContent.cs" />
<Compile Include="Utility.cs" />
<Compile Include="iOS\NativeCookieHandler.cs" />
<Compile Include="iOS\CFNetworkErrors.cs" />
<Compile Include="iOS\NSErrorExtended.cs" />
<Compile Include="..\Shared\AssemblyInfo.cs" />
<Compile Include="..\Shared\CaptiveNetworkException.cs" />
<Compile Include="..\Shared\ProgressStreamContent.cs" />
<Compile Include="..\Shared\Utility.cs" />
<Compile Include="Platform\AsyncLock.cs" />
<Compile Include="Platform\CFNetworkErrors.cs" />
<Compile Include="Platform\NativeCookieHandler.cs" />
<Compile Include="Platform\NSErrorExtended.cs" />
<Compile Include="Platform\NSUrlSessionHandler.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
<Folder Include="Platform\" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
0 src/ModernHttpClient/iOS/AsyncLock.cs → ...odernHttpClient.iOS/Platform/AsyncLock.cs
View file
Open in desktop
File renamed without changes.
7 changes: 1 addition & 6 deletions src/ModernHttpClient/iOS/CFNetworkErrors.cs → ...ttpClient.iOS/Platform/CFNetworkErrors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
#if UNIFIED
using Foundation;
#else
using MonoTouch.Foundation;
using System.Globalization;
#endif
using Foundation;

// These definitions are not currently provided by Xamarin.
// To avoid a potential conflict, these are in a namespace specific to this library.
Expand Down
0 src/ModernHttpClient/iOS/NSErrorExtended.cs → ...ttpClient.iOS/Platform/NSErrorExtended.cs
View file
Open in desktop
File renamed without changes.
7 changes: 0 additions & 7 deletions ...dernHttpClient/iOS/NSUrlSessionHandler.cs → ...lient.iOS/Platform/NSUrlSessionHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,8 @@
using System.Text.RegularExpressions;
using ModernHttpClient.CoreFoundation;
using ModernHttpClient.Foundation;

#if UNIFIED
using Foundation;
using Security;
#else
using MonoTouch.Foundation;
using MonoTouch.Security;
using System.Globalization;
#endif

namespace ModernHttpClient
{
Expand Down
5 changes: 0 additions & 5 deletions ...dernHttpClient/iOS/NativeCookieHandler.cs → ...lient.iOS/Platform/NativeCookieHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Net;

#if UNIFIED
using Foundation;
#else
using MonoTouch.Foundation;
#endif

namespace ModernHttpClient
{
Expand Down
Loading