Merge commit '0592f480da9b4f41ec662cff66883c1f6eba4ee1' into nick

prs.mobile/ConnectionTestApp/ConnectionTest.sln

@@ -1,148 +1,158 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 25.0.1705.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33530.505
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectionTest.iOS", "ConnectionTest\ConnectionTest.iOS\ConnectionTest.iOS.csproj", "{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8} = {2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED} = {4057A462-4A28-46D6-BF75-12E1D494F3ED}
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D} = {60CCCF76-EC6F-4088-8BEA-745E0492171D}
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF} = {B1DE96C8-6A4C-4958-8224-443BB5F570BF}
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6} = {C1E889A2-FD8C-424A-A491-7D16057C23A6}
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D} = {C4E61F3A-1DF8-46D3-9C62-09881499930D}
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectionTest", "ConnectionTest\ConnectionTest\ConnectionTest.csproj", "{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectionTest", "ConnectionTest\ConnectionTest\ConnectionTest.csproj", "{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InABox.Remote.Shared", "..\inabox\InABox.Remote.Shared\InABox.Remote.Shared.shproj", "{EAC7B383-2EEA-4256-9E65-7883BF148A6B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectionTest.Android", "ConnectionTest\ConnectionTest.Android\ConnectionTest.Android.csproj", "{82FA30D9-EB69-46BA-8DBB-1635A07987AD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InABox.Core", "..\inabox\InABox.Core\InABox.Core.csproj", "{D864DA96-2C91-42CC-B39A-6DF863443DEC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InABox.Client.Remote.Json", "..\..\..\inabox\InABox.Client.Remote.Json\InABox.Client.Remote.Json.csproj", "{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InABox.Client.Remote.Shared", "..\inabox\InABox.Client.Remote.Shared\InABox.Client.Remote.Shared.shproj", "{803042CA-E67E-44E6-B73C-244AE5BB2A09}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InABox.Client.Remote.Shared", "..\..\..\inabox\InABox.Client.Remote.Shared\InABox.Client.Remote.Shared.shproj", "{803042CA-E67E-44E6-B73C-244AE5BB2A09}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InABox.Client.Remote.Json", "..\inabox\InABox.Client.Remote.Json\InABox.Client.Remote.Json.csproj", "{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InABox.Client.WebSocket", "..\..\..\inabox\inabox.client.websocket\InABox.Client.WebSocket.csproj", "{C4E61F3A-1DF8-46D3-9C62-09881499930D}"
 EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "ConnectionTest.Android", "ConnectionTest\ConnectionTest.Android\ConnectionTest.Android.csproj", "{B339D20B-926A-4192-B3F7-ED0BF5E866D4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InABox.Configuration", "..\..\..\inabox\InABox.Configuration\InABox.Configuration.csproj", "{60CCCF76-EC6F-4088-8BEA-745E0492171D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InABox.Configuration", "..\inabox\InABox.Configuration\InABox.Configuration.csproj", "{350FACC1-39B9-4FD5-834A-621532EE7426}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InABox.Core", "..\..\..\inabox\InABox.Core\InABox.Core.csproj", "{C1E889A2-FD8C-424A-A491-7D16057C23A6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InABox.Logging.Shared", "..\inabox\inabox.logging.shared\InABox.Logging.Shared.csproj", "{519E7D22-F055-487A-93A3-6AE47EFC931D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InABox.Logging.Shared", "..\..\..\inabox\inabox.logging.shared\InABox.Logging.Shared.csproj", "{B1DE96C8-6A4C-4958-8224-443BB5F570BF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InABox.WebSocket.Shared", "..\inabox\inabox.websocket.shared\InABox.WebSocket.Shared.csproj", "{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InABox.Remote.Shared", "..\..\..\inabox\InABox.Remote.Shared\InABox.Remote.Shared.shproj", "{EAC7B383-2EEA-4256-9E65-7883BF148A6B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InABox.Client.WebSocket", "..\inabox\inabox.client.websocket\InABox.Client.WebSocket.csproj", "{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InABox.WebSocket.Shared", "..\..\..\inabox\inabox.websocket.shared\InABox.WebSocket.Shared.csproj", "{4057A462-4A28-46D6-BF75-12E1D494F3ED}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
-		Release|iPhoneSimulator = Release|iPhoneSimulator
 		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Release|Any CPU = Release|Any CPU
 		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
 		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
-		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
-		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Debug|iPhone.Build.0 = Debug|iPhone
+		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
 		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Release|iPhone.ActiveCfg = Release|iPhone
 		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Release|iPhone.Build.0 = Release|iPhone
+		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{2B679E7E-0DDB-47E2-9395-4D4842CB27B5}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Release|iPhone.Build.0 = Release|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{D864DA96-2C91-42CC-B39A-6DF863443DEC}.Release|iPhone.Build.0 = Release|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}.Release|iPhone.Build.0 = Release|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B339D20B-926A-4192-B3F7-ED0BF5E866D4}.Release|iPhone.Build.0 = Release|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Release|Any CPU.Build.0 = Release|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{350FACC1-39B9-4FD5-834A-621532EE7426}.Release|iPhone.Build.0 = Release|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{519E7D22-F055-487A-93A3-6AE47EFC931D}.Release|iPhone.Build.0 = Release|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}.Release|iPhone.Build.0 = Release|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Release|Any CPU.Build.0 = Release|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}.Release|iPhone.Build.0 = Release|Any CPU
+		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Release|iPhone.Build.0 = Release|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{82FA30D9-EB69-46BA-8DBB-1635A07987AD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Release|iPhone.Build.0 = Release|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2E9288A7-FD3B-435A-8B5E-A76C9E8DA0B8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Release|iPhone.Build.0 = Release|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{C4E61F3A-1DF8-46D3-9C62-09881499930D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Release|iPhone.Build.0 = Release|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{60CCCF76-EC6F-4088-8BEA-745E0492171D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Release|iPhone.Build.0 = Release|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{C1E889A2-FD8C-424A-A491-7D16057C23A6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Release|iPhone.Build.0 = Release|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B1DE96C8-6A4C-4958-8224-443BB5F570BF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Release|iPhone.Build.0 = Release|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4057A462-4A28-46D6-BF75-12E1D494F3ED}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -150,4 +160,11 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8DC7D242-3916-45A1-B39F-6CCA9FA7047E}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\..\..\inabox\InABox.Client.Remote.Shared\InABox.Client.Remote.Shared.projitems*{2e9288a7-fd3b-435a-8b5e-a76c9e8da0b8}*SharedItemsImports = 5
+		..\..\..\inabox\InABox.Remote.Shared\InABox.Remote.Shared.projitems*{2e9288a7-fd3b-435a-8b5e-a76c9e8da0b8}*SharedItemsImports = 5
+		..\..\..\inabox\InABox.Client.Remote.Shared\InABox.Client.Remote.Shared.projitems*{803042ca-e67e-44e6-b73c-244ae5bb2a09}*SharedItemsImports = 13
+		..\..\..\inabox\InABox.Remote.Shared\InABox.Remote.Shared.projitems*{803042ca-e67e-44e6-b73c-244ae5bb2a09}*SharedItemsImports = 13
+		..\..\..\inabox\InABox.Remote.Shared\InABox.Remote.Shared.projitems*{eac7b383-2eea-4256-9e65-7883bf148a6b}*SharedItemsImports = 13
+	EndGlobalSection
 EndGlobal

prs.mobile/ConnectionTestApp/ConnectionTest/ConnectionTest.Android/ConnectionTest.Android.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -33,6 +33,10 @@
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
     <EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
+    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+    <BundleAssemblies>false</BundleAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -87,10 +91,34 @@
     <Folder Include="Resources\drawable\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\inabox\InABox.Client.Remote.Json\InABox.Client.Remote.Json.csproj">
+      <Project>{2e9288a7-fd3b-435a-8b5e-a76c9e8da0b8}</Project>
+      <Name>InABox.Client.Remote.Json</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\inabox\inabox.client.websocket\InABox.Client.WebSocket.csproj">
+      <Project>{c4e61f3a-1df8-46d3-9c62-09881499930d}</Project>
+      <Name>InABox.Client.WebSocket</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\inabox\InABox.Configuration\InABox.Configuration.csproj">
+      <Project>{60cccf76-ec6f-4088-8bea-745e0492171d}</Project>
+      <Name>InABox.Configuration</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\inabox\InABox.Core\InABox.Core.csproj">
+      <Project>{c1e889a2-fd8c-424a-a491-7d16057c23a6}</Project>
+      <Name>InABox.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\inabox\inabox.logging.shared\InABox.Logging.Shared.csproj">
+      <Project>{b1de96c8-6a4c-4958-8224-443bb5f570bf}</Project>
+      <Name>InABox.Logging.Shared</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\inabox\inabox.websocket.shared\InABox.WebSocket.Shared.csproj">
+      <Project>{4057a462-4a28-46d6-bf75-12e1d494f3ed}</Project>
+      <Name>InABox.WebSocket.Shared</Name>
+    </ProjectReference>
     <ProjectReference Include="..\ConnectionTest\ConnectionTest.csproj">
       <Project>{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}</Project>
       <Name>ConnectionTest</Name>
     </ProjectReference>
   </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+</Project>

prs.mobile/ConnectionTestApp/ConnectionTest/ConnectionTest.Android/Resources/Resource.designer.cs

@@ -2,7 +2,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

prs.mobile/ConnectionTestApp/ConnectionTest/ConnectionTest.iOS/ConnectionTest.iOS.csproj

@@ -136,27 +136,5 @@
       <Project>{7FF8B7BA-16F4-4BD4-AA39-FC766952DEA6}</Project>
       <Name>ConnectionTest</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\inabox\InABox.Client.Remote.Json\InABox.Client.Remote.Json.csproj">
-      <Project>{3ADA1C9B-EE2D-4F49-B75C-6BCA5610DB95}</Project>
-      <Name>InABox.Client.Remote.Json</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\inabox\InABox.Configuration\InABox.Configuration.csproj">
-      <Name>InABox.Configuration</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\inabox\inabox.logging.shared\InABox.Logging.Shared.csproj">
-      <Name>InABox.Logging.Shared</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\inabox\InABox.Core\InABox.Core.csproj">
-      <Project>{D864DA96-2C91-42CC-B39A-6DF863443DEC}</Project>
-      <Name>InABox.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\inabox\inabox.client.websocket\InABox.Client.WebSocket.csproj">
-      <Project>{55BBAC1E-F7B1-4520-B7B2-11F7B8BF9390}</Project>
-      <Name>InABox.Client.WebSocket</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\inabox\inabox.websocket.shared\InABox.WebSocket.Shared.csproj">
-      <Project>{78D9DFCA-FAD3-4E94-95DA-5C66A3FCC053}</Project>
-      <Name>InABox.WebSocket.Shared</Name>
-    </ProjectReference>
   </ItemGroup>
 </Project>

prs.mobile/ConnectionTestApp/ConnectionTest/ConnectionTest/ConnectionTest.csproj

@@ -16,12 +16,12 @@
     <PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\inabox\InABox.Core\InABox.Core.csproj" />
-    <ProjectReference Include="..\..\..\inabox\InABox.Configuration\InABox.Configuration.csproj" />
-    <ProjectReference Include="..\..\..\inabox\inabox.logging.shared\InABox.Logging.Shared.csproj" />
-    <ProjectReference Include="..\..\..\inabox\InABox.Client.Remote.Json\InABox.Client.Remote.Json.csproj" />
-    <ProjectReference Include="..\..\..\inabox\inabox.client.websocket\InABox.Client.WebSocket.csproj" />
-    <ProjectReference Include="..\..\..\inabox\inabox.websocket.shared\InABox.WebSocket.Shared.csproj" />
+    <ProjectReference Include="..\..\..\..\..\inabox\InABox.Client.Remote.Json\InABox.Client.Remote.Json.csproj" />
+    <ProjectReference Include="..\..\..\..\..\inabox\inabox.client.websocket\InABox.Client.WebSocket.csproj" />
+    <ProjectReference Include="..\..\..\..\..\inabox\InABox.Configuration\InABox.Configuration.csproj" />
+    <ProjectReference Include="..\..\..\..\..\inabox\InABox.Core\InABox.Core.csproj" />
+    <ProjectReference Include="..\..\..\..\..\inabox\inabox.logging.shared\InABox.Logging.Shared.csproj" />
+    <ProjectReference Include="..\..\..\..\..\inabox\inabox.websocket.shared\InABox.WebSocket.Shared.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\inabox\InABox.Remote.Shared\InABox.Remote.Shared.projitems" Label="Shared" Condition="Exists('..\..\..\inabox\InABox.Remote.Shared\InABox.Remote.Shared.projitems')" />
   <Import Project="..\..\..\inabox\InABox.Client.Remote.Shared\InABox.Client.Remote.Shared.projitems" Label="Shared" Condition="Exists('..\..\..\inabox\InABox.Client.Remote.Shared\InABox.Client.Remote.Shared.projitems')" />

prs.mobile/ConnectionTestApp/ConnectionTest/ConnectionTest/MainPage.xaml.cs

@@ -13,7 +13,7 @@ namespace ConnectionTest
 {
     public partial class MainPage : ContentPage
     {
-        string url = "remote2.com-al.com.au:8000";
+        string url = "remote.com-al.com.au:8000";
         string log = "";
 
         public MainPage()
@@ -32,7 +32,7 @@ namespace ConnectionTest
                 {
                     try
                     {
-                    Thread.Sleep(500);
+                    Thread.Sleep(100);
                     var result = ClientFactory.Validate("TAN", "nictan");
                         Device.BeginInvokeOnMainThread(() => {
                         lbl.Text = "Attempt: " + count + Environment.NewLine + result.ToString();