Skip to content

Commit e54317b

Browse files
mattqsmattqs
committed
xamarin android changed directory structure
1 parent 733e8d3 commit e54317b

25 files changed

Lines changed: 155 additions & 2093 deletions

‎Src/SocketIoClientDotNet.Tests.Xamarin-Android.TestApp/MainActivity.cs‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
1-
using System.Reflection;
1+
using System;
2+
using System.Reflection;
23
using Android.App;
4+
using Android.Content;
5+
using Android.Runtime;
6+
using Android.Views;
7+
using Android.Widget;
38
using Android.OS;
4-
using Xunit.Runners.UI;
9+
510
using Xunit.Sdk;
11+
using Xunit.Runners.UI;
612

7-
namespace EngineIoClientDotNet.Tests.Xamarin_Android
13+
namespace SocketIoClientDotNet.Tests.XamarinAndroid
814
{
9-
[Activity(Label = "SocketIoClientDotNet.Tests.Xamarin_Android", MainLauncher = true, Icon = "@drawable/icon")]
15+
[Activity(Label = "xUnit Android Runner", MainLauncher = true, Theme= "@android:style/Theme.Material.Light")]
1016
public class MainActivity : RunnerActivity
1117
{
18+
1219
protected override void OnCreate(Bundle bundle)
1320
{
1421
// tests can be inside the main assembly
@@ -20,8 +27,17 @@ protected override void OnCreate(Bundle bundle)
2027
//AddTestAssembly(typeof(PortableTests).Assembly);
2128
// or in any assembly that you load (since JIT is available)
2229

30+
#if false
31+
// you can use the default or set your own custom writer (e.g. save to web site and tweet it ;-)
32+
Writer = new TcpTextWriter ("10.0.1.2", 16384);
33+
// start running the test suites as soon as the application is loaded
34+
AutoStart = true;
35+
// crash the application (to ensure it's ended) and return to springboard
36+
TerminateAfterExecution = true;
37+
#endif
2338
// you cannot add more assemblies once calling base
2439
base.OnCreate(bundle);
2540
}
2641
}
2742
}
43+

‎Src/SocketIoClientDotNet.Tests.Xamarin-Android.TestApp/MainActivity.cs.txt‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎Src/SocketIoClientDotNet.Tests.Xamarin-Android.TestApp/Resources/Resource.designer.cs‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,51 +42,48 @@
4242
<Reference Include="System.Xml" />
4343
<Reference Include="System.Core" />
4444
<Reference Include="Mono.Android" />
45+
<Reference Include="System.Xml.Linq" />
4546
<Reference Include="xunit.abstractions">
46-
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
47+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
4748
</Reference>
4849
<Reference Include="xunit.core">
49-
<HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
50+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
5051
</Reference>
5152
<Reference Include="xunit.assert">
52-
<HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
53+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
54+
</Reference>
55+
<Reference Include="xunit.execution.MonoAndroid">
56+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\xunit.extensibility.execution.2.0.0\lib\monoandroid\xunit.execution.MonoAndroid.dll</HintPath>
57+
</Reference>
58+
<Reference Include="xunit.runner.utility.MonoAndroid">
59+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\xunit.runner.utility.2.0.0\lib\monoandroid\xunit.runner.utility.MonoAndroid.dll</HintPath>
5360
</Reference>
5461
<Reference Include="WebSocket4Net">
55-
<HintPath>..\packages\WebSocket4Net.0.13.1\lib\monoandroid23\WebSocket4Net.dll</HintPath>
62+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\WebSocket4Net.0.13.1\lib\monoandroid23\WebSocket4Net.dll</HintPath>
5663
</Reference>
5764
<Reference Include="Newtonsoft.Json">
58-
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
65+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
5966
</Reference>
6067
<Reference Include="EngineIoClientDotNet">
61-
<HintPath>..\packages\EngineIoClientDotNet.0.9.21\lib\monoandroid10\EngineIoClientDotNet.dll</HintPath>
68+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\EngineIoClientDotNet.0.9.21\lib\monoandroid10\EngineIoClientDotNet.dll</HintPath>
6269
</Reference>
6370
<Reference Include="Xamarin.Android.Support.v4">
64-
<HintPath>..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
71+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
72+
</Reference>
73+
<Reference Include="Xamarin.Forms.Platform.Android">
74+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.0.6341\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
6575
</Reference>
66-
<Reference Include="System.Xml.Linq" />
6776
<Reference Include="FormsViewGroup">
68-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
77+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.0.6341\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
6978
</Reference>
7079
<Reference Include="Xamarin.Forms.Core">
71-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
72-
</Reference>
73-
<Reference Include="Xamarin.Forms.Platform.Android">
74-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
75-
</Reference>
76-
<Reference Include="Xamarin.Forms.Platform">
77-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
80+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.0.6341\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
7881
</Reference>
7982
<Reference Include="Xamarin.Forms.Xaml">
80-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
81-
</Reference>
82-
<Reference Include="xunit.execution.MonoAndroid">
83-
<HintPath>..\packages\xunit.extensibility.execution.2.0.0\lib\monoandroid\xunit.execution.MonoAndroid.dll</HintPath>
84-
</Reference>
85-
<Reference Include="xunit.runner.utility.MonoAndroid">
86-
<HintPath>..\packages\xunit.runner.utility.2.0.0\lib\monoandroid\xunit.runner.utility.MonoAndroid.dll</HintPath>
83+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.0.6341\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
8784
</Reference>
8885
<Reference Include="xunit.runner.devices">
89-
<HintPath>..\packages\xunit.runner.devices.1.0.0\lib\MonoAndroid\xunit.runner.devices.dll</HintPath>
86+
<HintPath>..\SocketIoClientDotNet.Xamarin-Android\packages\xunit.runner.devices.1.0.0\lib\MonoAndroid\xunit.runner.devices.dll</HintPath>
9087
</Reference>
9188
</ItemGroup>
9289
<ItemGroup>
@@ -132,13 +129,16 @@
132129
<Import Project="..\packages\xunit.core.2.0.0\build\monoandroid\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\monoandroid\xunit.core.props')" />
133130
<Import Project="..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
134131
<Import Project="..\packages\xunit.runner.devices.1.0.0\build\MonoAndroid\xunit.runner.devices.targets" Condition="Exists('..\packages\xunit.runner.devices.1.0.0\build\MonoAndroid\xunit.runner.devices.targets')" />
132+
<Import Project="..\SocketIoClientDotNet.Xamarin-Android\packages\xunit.core.2.0.0\build\monoandroid\xunit.core.props" Condition="Exists('..\SocketIoClientDotNet.Xamarin-Android\packages\xunit.core.2.0.0\build\monoandroid\xunit.core.props')" />
133+
<Import Project="..\SocketIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.0.6341\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\SocketIoClientDotNet.Xamarin-Android\packages\Xamarin.Forms.1.4.0.6341\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
134+
<Import Project="..\SocketIoClientDotNet.Xamarin-Android\packages\xunit.runner.devices.1.0.0\build\MonoAndroid\xunit.runner.devices.targets" Condition="Exists('..\SocketIoClientDotNet.Xamarin-Android\packages\xunit.runner.devices.1.0.0\build\MonoAndroid\xunit.runner.devices.targets')" />
135135
<ItemGroup>
136136
<Folder Include="ParserTests\" />
137137
<Folder Include="ClientTests\" />
138138
<Folder Include="ModuleTests\" />
139139
</ItemGroup>
140140
<ItemGroup>
141-
<ProjectReference Include="..\SocketIoClientDotNet.Xamarin-Android\SocketIoClientDotNet.Xamarin-Android\SocketIoClientDotNet.Xamarin-Android.csproj">
141+
<ProjectReference Include="..\SocketIoClientDotNet.Xamarin-Android\SocketIoClientDotNet.Xamarin-Android.csproj">
142142
<Project>{3571B0FE-E760-4BCD-B853-0FEBFBE945A4}</Project>
143143
<Name>SocketIoClientDotNet.Xamarin-Android</Name>
144144
</ProjectReference>

‎Src/SocketIoClientDotNet.Tests.Xamarin-Android.TestApp/packages.config‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="EngineIoClientDotNet" version="0.9.21" targetFramework="MonoAndroid50" />
4-
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="MonoAndroid50" />
5-
<package id="WebSocket4Net" version="0.13.1" targetFramework="MonoAndroid50" />
6-
<package id="Xamarin.Android.Support.v4" version="22.2.1.0" targetFramework="MonoAndroid50" />
7-
<package id="Xamarin.Forms" version="1.4.4.6392" targetFramework="MonoAndroid50" />
8-
<package id="xunit" version="2.0.0" targetFramework="MonoAndroid50" />
9-
<package id="xunit.abstractions" version="2.0.0" targetFramework="MonoAndroid50" />
10-
<package id="xunit.assert" version="2.0.0" targetFramework="MonoAndroid50" />
11-
<package id="xunit.core" version="2.0.0" targetFramework="MonoAndroid50" />
12-
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="MonoAndroid50" />
13-
<package id="xunit.extensibility.execution" version="2.0.0" targetFramework="MonoAndroid50" />
14-
<package id="xunit.runner.devices" version="1.0.0" targetFramework="MonoAndroid50" />
15-
<package id="xunit.runner.utility" version="2.0.0" targetFramework="MonoAndroid50" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="EngineIoClientDotNet" version="0.9.21" targetFramework="MonoAndroid50" />
4+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="MonoAndroid50" />
5+
<package id="WebSocket4Net" version="0.13.1" targetFramework="MonoAndroid50" />
6+
<package id="Xamarin.Android.Support.v4" version="21.0.3.0" targetFramework="MonoAndroid50" />
7+
<package id="Xamarin.Forms" version="1.4.0.6341" targetFramework="MonoAndroid50" />
8+
<package id="xunit" version="2.0.0" targetFramework="MonoAndroid50" />
9+
<package id="xunit.abstractions" version="2.0.0" targetFramework="MonoAndroid50" />
10+
<package id="xunit.assert" version="2.0.0" targetFramework="MonoAndroid50" />
11+
<package id="xunit.core" version="2.0.0" targetFramework="MonoAndroid50" />
12+
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="MonoAndroid50" />
13+
<package id="xunit.extensibility.execution" version="2.0.0" targetFramework="MonoAndroid50" />
14+
<package id="xunit.runner.devices" version="1.0.0" targetFramework="MonoAndroid50" />
15+
<package id="xunit.runner.utility" version="2.0.0" targetFramework="MonoAndroid50" />
1616
</packages>

‎Src/SocketIoClientDotNet.Xamarin-Android/.nuget/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="xunit.runners" version="2.0.0" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="xunit.runners" version="2.0.0" />
44
</packages>

Src/SocketIoClientDotNet.Xamarin-Android/SocketIoClientDotNet.Xamarin-Android/Properties/AssemblyInfo.cs renamed to Src/SocketIoClientDotNet.Xamarin-Android/Properties/AssemblyInfo.cs

File renamed without changes.

Src/SocketIoClientDotNet.Xamarin-Android/SocketIoClientDotNet.Xamarin-Android/Resources/Resource.designer.cs renamed to Src/SocketIoClientDotNet.Xamarin-Android/Resources/Resource.designer.cs

File renamed without changes.

Src/SocketIoClientDotNet.Xamarin-Android/SocketIoClientDotNet.Xamarin-Android/SocketIoClientDotNet.Xamarin-Android.csproj renamed to Src/SocketIoClientDotNet.Xamarin-Android/SocketIoClientDotNet.Xamarin-Android.csproj

Lines changed: 49 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,34 +40,63 @@
4040
<Reference Include="System.Xml" />
4141
<Reference Include="System.Core" />
4242
<Reference Include="Mono.Android" />
43-
<Reference Include="EngineIoClientDotNet, Version=0.9.21.0, Culture=neutral, PublicKeyToken=null">
44-
<HintPath>..\packages\EngineIoClientDotNet.0.9.21\lib\monoandroid10\EngineIoClientDotNet.dll</HintPath>
43+
<Reference Include="WebSocket4Net">
44+
<HintPath>packages\WebSocket4Net.0.13.1\lib\monoandroid23\WebSocket4Net.dll</HintPath>
4545
</Reference>
46-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
47-
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
46+
<Reference Include="Newtonsoft.Json">
47+
<HintPath>packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
4848
</Reference>
49-
<Reference Include="WebSocket4Net, Version=0.12.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a">
50-
<HintPath>..\packages\WebSocket4Net.0.13.1\lib\monoandroid23\WebSocket4Net.dll</HintPath>
49+
<Reference Include="EngineIoClientDotNet">
50+
<HintPath>packages\EngineIoClientDotNet.0.9.21\lib\monoandroid10\EngineIoClientDotNet.dll</HintPath>
5151
</Reference>
5252
</ItemGroup>
5353
<ItemGroup>
54-
<Compile Include="Client\AckImpl.cs" />
55-
<Compile Include="Client\IAck.cs" />
56-
<Compile Include="Client\IO.cs" />
57-
<Compile Include="Client\Manager.cs" />
58-
<Compile Include="Client\On.cs" />
59-
<Compile Include="Client\Socket.cs" />
60-
<Compile Include="Client\SocketIOException.cs" />
61-
<Compile Include="Client\Url.cs" />
62-
<Compile Include="Modules\HasBinaryData.cs" />
63-
<Compile Include="Parsers\Binary.cs" />
64-
<Compile Include="Parsers\Packet.cs" />
65-
<Compile Include="Parsers\Parser.cs" />
6654
<Compile Include="Properties\AssemblyInfo.cs" />
55+
<Compile Include="..\SocketIoClientDotNet.net45\Client\AckImpl.cs">
56+
<Link>Client\AckImpl.cs</Link>
57+
</Compile>
58+
<Compile Include="..\SocketIoClientDotNet.net45\Client\IAck.cs">
59+
<Link>Client\IAck.cs</Link>
60+
</Compile>
61+
<Compile Include="..\SocketIoClientDotNet.net45\Client\IO.cs">
62+
<Link>Client\IO.cs</Link>
63+
</Compile>
64+
<Compile Include="..\SocketIoClientDotNet.net45\Client\Manager.cs">
65+
<Link>Client\Manager.cs</Link>
66+
</Compile>
67+
<Compile Include="..\SocketIoClientDotNet.net45\Client\On.cs">
68+
<Link>Client\On.cs</Link>
69+
</Compile>
70+
<Compile Include="..\SocketIoClientDotNet.net45\Client\Socket.cs">
71+
<Link>Client\Socket.cs</Link>
72+
</Compile>
73+
<Compile Include="..\SocketIoClientDotNet.net45\Client\SocketIOException.cs">
74+
<Link>Client\SocketIOException.cs</Link>
75+
</Compile>
76+
<Compile Include="..\SocketIoClientDotNet.net45\Client\Url.cs">
77+
<Link>Client\Url.cs</Link>
78+
</Compile>
79+
<Compile Include="..\SocketIoClientDotNet.net45\Modules\HasBinaryData.cs">
80+
<Link>Modules\HasBinaryData.cs</Link>
81+
</Compile>
82+
<Compile Include="..\SocketIoClientDotNet.net45\Parser\Binary.cs">
83+
<Link>Parsers\Binary.cs</Link>
84+
</Compile>
85+
<Compile Include="..\SocketIoClientDotNet.net45\Parser\Packet.cs">
86+
<Link>Parsers\Packet.cs</Link>
87+
</Compile>
88+
<Compile Include="..\SocketIoClientDotNet.net45\Parser\Parser.cs">
89+
<Link>Parsers\Parser.cs</Link>
90+
</Compile>
91+
</ItemGroup>
92+
<ItemGroup />
93+
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
94+
<ItemGroup>
95+
<Folder Include="Client\" />
96+
<Folder Include="Modules\" />
97+
<Folder Include="Parsers\" />
6798
</ItemGroup>
6899
<ItemGroup>
69100
<None Include="packages.config" />
70101
</ItemGroup>
71-
<ItemGroup />
72-
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
73102
</Project>

0 commit comments

Comments
 (0)