Skip to content

Commit 84cb279

Browse files
mattqsmattqs
committed
0.9.19 netcore45: Retargeted to Windows 8.1, MonoAndroid, MonoTouch, Xamarin.iOS
1 parent 89a0676 commit 84cb279

34 files changed

+2349
-144
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ In linux this will stop after starting test server. Start xunit tests within a n
6868
grunt testClient
6969
```
7070
## Framework Versions
71-
.Net Framework 3.5, .Net Framework 4.5, Windows 8, Windows 8.1, Windows Phone 8, Windows Phone 8.1, Mono, Unity
71+
.Net Framework 3.5, .Net Framework 4.5, Windows 8, Windows 8.1, Windows Phone 8, Windows Phone 8.1, Mono, Unity, MonoAndroid, MonoTouch, Xamarin.iOS
7272

7373

7474
## License

‎Src/EngineIOClientDotNet.Tests.netcore45.UnitTestLibrary/EngineIOClientDotNet.Tests.netcore45.UnitTestLibrary.csproj‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,6 +15,10 @@
1515
<FileAlignment>512</FileAlignment>
1616
<ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1717
<PackageCertificateKeyFile>EngineIOClientDotNet.Tests.netcore45.UnitTestLibrary_TemporaryKey.pfx</PackageCertificateKeyFile>
18+
<TargetPlatformVersion>8.1</TargetPlatformVersion>
19+
<MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
20+
<TargetFrameworkVersion />
21+
<AppxBundle>Never</AppxBundle>
1822
</PropertyGroup>
1923
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2024
<DebugSymbols>true</DebugSymbols>
@@ -103,11 +107,6 @@
103107
<AppXPackage>True</AppXPackage>
104108
<AppxPackageIncludePrivateSymbols>true</AppxPackageIncludePrivateSymbols>
105109
</PropertyGroup>
106-
<ItemGroup>
107-
<!--A reference to the entire .Net Framework and Windows SDK are automatically included-->
108-
<SDKReference Include="MSTestFramework, Version=11.0" />
109-
<SDKReference Include="TestPlatform, Version=11.0" />
110-
</ItemGroup>
111110
<ItemGroup>
112111
<Compile Include="ClientTests\BinaryPollingTest.cs" />
113112
<Compile Include="ClientTests\BinaryWebSocketTest.cs" />
@@ -161,8 +160,16 @@
161160
<ItemGroup>
162161
<None Include="packages.config" />
163162
</ItemGroup>
164-
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
165-
<VisualStudioVersion>11.0</VisualStudioVersion>
163+
<ItemGroup>
164+
<SDKReference Include="MSTestFramework, Version=14.0">
165+
<Name>MSTest for Managed Projects</Name>
166+
</SDKReference>
167+
<SDKReference Include="TestPlatform, Version=14.0">
168+
<Name>Microsoft Visual Studio Test Core</Name>
169+
</SDKReference>
170+
</ItemGroup>
171+
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
172+
<VisualStudioVersion>12.0</VisualStudioVersion>
166173
</PropertyGroup>
167174
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
168175
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎Src/EngineIOClientDotNet.Tests.netcore45.UnitTestLibrary/Package.appxmanifest‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
3-
<Identity Name="44353e40-ac2b-4026-b592-050441ca92d2" Publisher="CN=Matthias" Version="1.0.0.0" />
2+
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
3+
<Identity Name="44353e40-ac2b-4026-b592-050441ca92d2" Publisher="CN=Matthias" Version="1.1.0.0" />
44
<Properties>
55
<DisplayName>EngineIOClientDotNet.Tests.netcore45.UnitTestLibrary</DisplayName>
66
<PublisherDisplayName>Matthias</PublisherDisplayName>
77
<Logo>Images\UnitTestStoreLogo.png</Logo>
88
<Description>EngineIOClientDotNet.Tests.netcore45.UnitTestLibrary</Description>
99
</Properties>
1010
<Prerequisites>
11-
<OSMinVersion>6.2.1</OSMinVersion>
12-
<OSMaxVersionTested>6.2.1</OSMaxVersionTested>
11+
<OSMinVersion>6.3.0</OSMinVersion>
12+
<OSMaxVersionTested>6.3.0</OSMaxVersionTested>
1313
</Prerequisites>
1414
<Resources>
1515
<Resource Language="x-generate" />
1616
</Resources>
1717
<Applications>
1818
<Application Id="vstest.executionengine.App" Executable="vstest.executionengine.appcontainer.exe" EntryPoint="vstest.executionengine.App">
19-
<VisualElements DisplayName="NoUIEntryPoints" Logo="Images\UnitTestLogo.png" SmallLogo="Images\UnitTestSmallLogo.png" Description="vstest.executionengine.App" ForegroundText="light" BackgroundColor="#0084FF">
20-
<SplashScreen Image="Images\UnitTestSplashScreen.png" />
21-
</VisualElements>
19+
<m2:VisualElements DisplayName="NoUIEntryPoints" Description="vstest.executionengine.App" BackgroundColor="#0084FF" ForegroundText="light" Square150x150Logo="Images\UnitTestLogo.png" Square30x30Logo="Images\UnitTestSmallLogo.png">
20+
<m2:SplashScreen Image="Images\UnitTestSplashScreen.png" />
21+
</m2:VisualElements>
2222
</Application>
2323
<Application Id="vstest.executionengine.x86.App" Executable="vstest.executionengine.appcontainer.x86.exe" EntryPoint="vstest.executionengine.x86.App">
2424
<VisualElements DisplayName="NoUIEntryPoints" Logo="Images\UnitTestLogo.png" SmallLogo="Images\UnitTestSmallLogo.png" Description="vstest.executionengine.x86.App" ForegroundText="light" BackgroundColor="#0084FF">

‎Src/EngineIoClientDotNet.Tests.Xamarin-Android/ClientTests/Connection.cs‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
using System.Windows;
2+
3+
using Newtonsoft.Json;
4+
using Quobject.EngineIoClientDotNet.Client;
5+
using System;
6+
using System.IO;
7+
using Quobject.EngineIoClientDotNet.Modules;
8+
9+
10+
namespace Quobject.EngineIoClientDotNet_Tests.ClientTests
11+
{
12+
public class Connection
13+
{
14+
public static readonly int TIMEOUT = 300000;
15+
16+
protected Socket.Options CreateOptions()
17+
{
18+
LogManager.SetupLogManager();
19+
var log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod());
20+
21+
22+
var config = ConfigBase.Load();
23+
var options = new Socket.Options();
24+
options.Port = config.server.port;
25+
options.Hostname = config.server.hostname;
26+
log.Info("Please add to your hosts file: 127.0.0.1 " + options.Hostname);
27+
28+
return options;
29+
}
30+
31+
32+
protected Socket.Options CreateOptionsSecure()
33+
{
34+
LogManager.SetupLogManager();
35+
var log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod());
36+
37+
var config = ConfigBase.Load();
38+
var options = new Socket.Options();
39+
options.Port = config.server.ssl_port;
40+
options.Hostname = config.server.hostname;
41+
log.Info("Please add to your hosts file: 127.0.0.1 " + options.Hostname);
42+
options.Secure = true;
43+
options.IgnoreServerCertificateValidation = true;
44+
return options;
45+
}
46+
}
47+
48+
public class ConfigBase
49+
{
50+
public string version { get; set; }
51+
public ConfigServer server { get; set; }
52+
53+
public static ConfigBase Load()
54+
{
55+
//var configString = File.ReadAllText("./../../../../grunt/config.json");
56+
var configString = @"{""version"":""0.1.0.0"",""server"":{""port"":80,""ssl_port"":443,""hostname"":""192.168.178.59""},""win"":{""powershell"":""C:/WINDOWS/System32/WindowsPowerShell/v1.0/powershell.exe"",""msbuild"":""C:/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe"",""xunit_path"":""C:/vendors/xunit"",""nuget"":""C:/vendors/nuget/nuget.exe""},""linux"":{""msbuild"":""xbuild"",""xunit_path"":""/home/apollo/vendors/xunit""}}";
57+
58+
var config = JsonConvert.DeserializeObject<ConfigBase>(configString);
59+
return config;
60+
}
61+
62+
}
63+
64+
public class ConfigServer
65+
{
66+
public string hostname { get; set; }
67+
public int port { get; set; }
68+
public int ssl_port { get; set; }
69+
}
70+
}

‎Src/EngineIoClientDotNet.Tests.Xamarin-Android/EngineIoClientDotNet.Tests.Xamarin-Android.TestApp.csproj‎

Lines changed: 21 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProductVersion>8.0.30703</ProductVersion>
8-
<SchemaVersion>2.0</SchemaVersion>
97
<ProjectGuid>{C5CD5898-63A6-46CB-A1D0-B6FBCE505DC3}</ProjectGuid>
108
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
119
<OutputType>Library</OutputType>
@@ -16,7 +14,7 @@
1614
<AndroidApplication>true</AndroidApplication>
1715
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1816
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
19-
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
17+
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
2018
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
2119
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
2220
<NuGetPackageImportStamp>e1a141c4</NuGetPackageImportStamp>
@@ -29,7 +27,6 @@
2927
<DefineConstants>DEBUG;TRACE</DefineConstants>
3028
<ErrorReport>prompt</ErrorReport>
3129
<WarningLevel>4</WarningLevel>
32-
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
3330
<AndroidLinkMode>None</AndroidLinkMode>
3431
</PropertyGroup>
3532
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -40,70 +37,55 @@
4037
<ErrorReport>prompt</ErrorReport>
4138
<WarningLevel>4</WarningLevel>
4239
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
43-
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
4440
</PropertyGroup>
4541
<ItemGroup>
46-
<Reference Include="FormsViewGroup, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
48-
<Private>True</Private>
49-
</Reference>
5042
<Reference Include="Mono.Android" />
5143
<Reference Include="mscorlib" />
52-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
53-
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
54-
<Private>True</Private>
55-
</Reference>
5644
<Reference Include="System" />
5745
<Reference Include="System.Core" />
5846
<Reference Include="System.Xml.Linq" />
5947
<Reference Include="System.Xml" />
60-
<Reference Include="WebSocket4Net, Version=0.12.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
48+
<Reference Include="FormsViewGroup, Version=1.4.0.0, Culture=neutral, PublicKeyToken=null">
49+
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
50+
</Reference>
51+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
52+
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
53+
</Reference>
54+
<Reference Include="WebSocket4Net, Version=0.12.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a">
6155
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\WebSocket4Net.0.13.1\lib\monoandroid23\WebSocket4Net.dll</HintPath>
62-
<Private>True</Private>
6356
</Reference>
64-
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
57+
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
6558
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
66-
<Private>True</Private>
6759
</Reference>
68-
<Reference Include="Xamarin.Forms.Core, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
60+
<Reference Include="Xamarin.Forms.Core, Version=1.4.0.0, Culture=neutral, PublicKeyToken=null">
6961
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
70-
<Private>True</Private>
7162
</Reference>
72-
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
63+
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
7364
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
74-
<Private>True</Private>
7565
</Reference>
76-
<Reference Include="Xamarin.Forms.Platform.Android, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
66+
<Reference Include="Xamarin.Forms.Platform.Android, Version=1.4.0.0, Culture=neutral, PublicKeyToken=null">
7767
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
78-
<Private>True</Private>
7968
</Reference>
80-
<Reference Include="Xamarin.Forms.Xaml, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
69+
<Reference Include="Xamarin.Forms.Xaml, Version=1.4.0.0, Culture=neutral, PublicKeyToken=null">
8170
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
82-
<Private>True</Private>
8371
</Reference>
84-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
72+
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
8573
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
86-
<Private>True</Private>
8774
</Reference>
88-
<Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
75+
<Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
8976
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
90-
<Private>True</Private>
9177
</Reference>
92-
<Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
78+
<Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
9379
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
94-
<Private>True</Private>
9580
</Reference>
96-
<Reference Include="xunit.execution.MonoAndroid, Version=2.0.0.2929, Culture=neutral, processorArchitecture=MSIL">
81+
<Reference Include="xunit.execution.MonoAndroid, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=null">
9782
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\xunit.extensibility.execution.2.0.0\lib\monoandroid\xunit.execution.MonoAndroid.dll</HintPath>
98-
<Private>True</Private>
9983
</Reference>
100-
<Reference Include="xunit.runner.devices, Version=2.0.0.1062, Culture=neutral, processorArchitecture=MSIL">
84+
<Reference Include="xunit.runner.devices, Version=2.0.0.1062, Culture=neutral, PublicKeyToken=null">
10185
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\xunit.runner.devices.1.0.0\lib\MonoAndroid\xunit.runner.devices.dll</HintPath>
102-
<Private>True</Private>
10386
</Reference>
104-
<Reference Include="xunit.runner.utility.MonoAndroid, Version=2.0.0.2929, Culture=neutral, processorArchitecture=MSIL">
87+
<Reference Include="xunit.runner.utility.MonoAndroid, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=null">
10588
<HintPath>..\EngineIoClientDotNet.Xamarin-Android\packages\xunit.runner.utility.2.0.0\lib\monoandroid\xunit.runner.utility.MonoAndroid.dll</HintPath>
106-
<Private>True</Private>
10789
</Reference>
10890
</ItemGroup>
10991
<ItemGroup>
@@ -113,9 +95,6 @@
11395
<Compile Include="..\EngineIoClientDotNet.Tests.mono\clienttests\BinaryWebSocketTest.cs">
11496
<Link>ClientTests\BinaryWebSocketTest.cs</Link>
11597
</Compile>
116-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\clienttests\Connection.cs">
117-
<Link>ClientTests\Connection.cs</Link>
118-
</Compile>
11998
<Compile Include="..\EngineIoClientDotNet.Tests.mono\clienttests\ConnectionTest.cs">
12099
<Link>ClientTests\ConnectionTest.cs</Link>
121100
</Compile>
@@ -155,6 +134,7 @@
155134
<Compile Include="MainActivity.cs" />
156135
<Compile Include="Resources\Resource.Designer.cs" />
157136
<Compile Include="Properties\AssemblyInfo.cs" />
137+
<Compile Include="ClientTests\Connection.cs" />
158138
</ItemGroup>
159139
<ItemGroup>
160140
<None Include="packages.config" />
@@ -167,7 +147,7 @@
167147
</ItemGroup>
168148
<ItemGroup>
169149
<ProjectReference Include="..\EngineIoClientDotNet.Xamarin-Android\EngineIoClientDotNet.Xamarin-Android.csproj">
170-
<Project>{491f98d3-b919-452a-a604-f087061403b8}</Project>
150+
<Project>{491F98D3-B919-452A-A604-F087061403B8}</Project>
171151
<Name>EngineIoClientDotNet.Xamarin-Android</Name>
172152
</ProjectReference>
173153
</ItemGroup>

0 commit comments

Comments
 (0)