xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[tests] Fix System.Net.Http and link sdk tests (#4731) 

* [bcl-test] Fix System.Net.Http tests after new NSUrlSession default

The tests did not like the new HttpClient default option. See: 6cfc8b5a60

* [link-sdk] Use https for AsyncTest

Potential fix for https://github.com/xamarin/maccore/issues/977.
This commit is contained in:
Vincent Dondain 2018-09-03 05:08:35 -04:00 коммит произвёл Rolf Bjarne Kvinge
Родитель 1a6e382ee9
Коммит 982074c42c
2 изменённых файлов: 10 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
tests/bcl-test/System.Net.Http/System.Net.Http.csproj.template
Просмотреть файл

@ -28,6 +28,7 @@
<MtouchLink>None</MtouchLink>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<MtouchArch>i386, x86_64</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
@ -39,6 +40,7 @@
<MtouchLink>None</MtouchLink>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<MtouchArch>i386, x86_64</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>True</DebugSymbols>
@ -52,6 +54,7 @@
<MtouchDebug>True</MtouchDebug>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<MtouchArch>ARMv7, ARM64</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|iPhone' ">
<DebugSymbols>True</DebugSymbols>
@ -65,6 +68,7 @@
<MtouchDebug>True</MtouchDebug>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<MtouchArch>ARMv7</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug64|iPhone' ">
<DebugSymbols>True</DebugSymbols>
@ -78,6 +82,7 @@
<MtouchDebug>True</MtouchDebug>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<MtouchArch>ARM64</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@ -91,6 +96,7 @@
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_2_1;MOBILE;MONOTOUCH;FULL_AOT_RUNTIME;DISABLE_CAS_USE;$(DefineConstants)</DefineConstants>
<MtouchArch>ARMv7, ARM64</MtouchArch>
<MtouchUseLlvm>true</MtouchUseLlvm>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release32|iPhone' ">
<DebugType>none</DebugType>
@ -104,6 +110,7 @@
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_2_1;MOBILE;MONOTOUCH;FULL_AOT_RUNTIME;DISABLE_CAS_USE;$(DefineConstants)</DefineConstants>
<MtouchArch>ARMv7</MtouchArch>
<MtouchUseLlvm>true</MtouchUseLlvm>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release64|iPhone' ">
<DebugType>none</DebugType>
@ -117,6 +124,7 @@
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_2_1;MOBILE;MONOTOUCH;FULL_AOT_RUNTIME;DISABLE_CAS_USE;$(DefineConstants)</DefineConstants>
<MtouchArch>ARM64</MtouchArch>
<MtouchUseLlvm>true</MtouchUseLlvm>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-bitcode|iPhone' ">
<DebugType>none</DebugType>
@ -131,6 +139,7 @@
<MtouchArch>ARMv7, ARM64</MtouchArch>
<MtouchExtraArgs>--bitcode:full</MtouchExtraArgs>
<MtouchUseLlvm>true</MtouchUseLlvm>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

2
tests/linker/ios/link sdk/AsyncTest.cs
Просмотреть файл

@ -16,7 +16,7 @@ namespace LinkSdk {
public Task<string> LoadCategories ()
{
return Task.Run (async () => await (new HttpClient ()).GetStringAsync ("http://google.com"));
return Task.Run (async () => await (new HttpClient ()).GetStringAsync ("https://google.com"));
}
[Test]