JonMcPherson · dbouianov · May 17, 2019
diff --git a/ParseLiveQuery.Test/ParseLiveQuery.Test.csproj b/ParseLiveQuery.Test/ParseLiveQuery.Test.csproj
diff --git a/ParseLiveQuery.Test/ParseLiveQueryClientTest.cs b/ParseLiveQuery.Test/ParseLiveQueryClientTest.cs
diff --git a/ParseLiveQuery.Test/Properties/AssemblyInfo.cs b/ParseLiveQuery.Test/Properties/AssemblyInfo.cs
diff --git a/ParseLiveQuery.Test/packages.config b/ParseLiveQuery.Test/packages.config
diff --git a/ParseLiveQuery.sln b/ParseLiveQuery.sln
diff --git a/ParseLiveQuery/IParseLiveQueryClientCallbacks.cs b/ParseLiveQuery/IParseLiveQueryClientCallbacks.cs
diff --git a/ParseLiveQuery/ISubscriptionFactory.cs b/ParseLiveQuery/ISubscriptionFactory.cs
diff --git a/ParseLiveQuery/ITaskQueue.cs b/ParseLiveQuery/ITaskQueue.cs
diff --git a/ParseLiveQuery/IWebSocketClient.cs b/ParseLiveQuery/IWebSocketClient.cs
diff --git a/ParseLiveQuery/IWebSocketClientCallback.cs b/ParseLiveQuery/IWebSocketClientCallback.cs
diff --git a/ParseLiveQuery/LiveQueryException.cs b/ParseLiveQuery/LiveQueryException.cs
diff --git a/ParseLiveQuery/Operation/ConnectClientOperation.cs b/ParseLiveQuery/Operation/ConnectClientOperation.cs
diff --git a/ParseLiveQuery/Operation/IClientOperation.cs b/ParseLiveQuery/Operation/IClientOperation.cs
diff --git a/ParseLiveQuery/Operation/SessionClientOperation.cs b/ParseLiveQuery/Operation/SessionClientOperation.cs
diff --git a/ParseLiveQuery/Operation/SubscribeClientOperation.cs b/ParseLiveQuery/Operation/SubscribeClientOperation.cs
diff --git a/ParseLiveQuery/Operation/UnsubscribeClientOperation.cs b/ParseLiveQuery/Operation/UnsubscribeClientOperation.cs
diff --git a/ParseLiveQuery/ParseLiveQuery.csproj b/ParseLiveQuery/ParseLiveQuery.csproj
@@ -7,8 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Parse" Version="2.0.0" />
-    <PackageReference Include="WebSocketSharp" Version="1.0.3-rc11" />
+    <Reference Include="Parse">
+      <HintPath>..\..\Parse-SDK-dotNET-master\Parse\bin\Debug\netstandard2.0\Parse.dll</HintPath>
+    </Reference>
+    <Reference Include="websocket-sharp">
+      <HintPath>..\..\WebSocketSharp-netstandard.1.0.1\lib\netstandard2.0\websocket-sharp.dll</HintPath>
+    </Reference>
   </ItemGroup>
-
 </Project>
diff --git a/ParseLiveQuery/ParseLiveQueryClient.cs b/ParseLiveQuery/ParseLiveQueryClient.cs
@@ -37,15 +37,15 @@ public ParseLiveQueryClient(Uri hostUri, WebSocketClientFactory webSocketClientF
         internal ParseLiveQueryClient(Uri hostUri, WebSocketClientFactory webSocketClientFactory,
             ISubscriptionFactory subscriptionFactory, ITaskQueue taskQueue) {
             _hostUri = hostUri;
-            _applicationId = ParseClient.CurrentConfiguration.ApplicationId;
+            _applicationId = ParseClient.CurrentConfiguration.ApplicationID;
             _webSocketClientFactory = webSocketClientFactory;
             _webSocketClientCallback = new WebSocketClientCallback(this);
             _subscriptionFactory = subscriptionFactory;
             _taskQueue = taskQueue;
         }
 
         private static Uri GetDefaultUri() {
-            string server = ParseClient.CurrentConfiguration.Server;
+            string server = ParseClient.CurrentConfiguration.ServerURI;
             if (server == null) throw new InvalidOperationException("Missing default Server URI in CurrentConfiguration");
 
             Uri serverUri = new Uri(server);
@@ -83,20 +83,34 @@ public void ConnectIfNeeded() {
 
         public void Unsubscribe<T>(ParseQuery<T> query) where T : ParseObject {
             if (query == null) return;
-            foreach (Subscription sub in _subscriptions.Values) {
+            var requestIds = new List<int>();
+            foreach (int requestId in _subscriptions.Keys) {
+                var sub = _subscriptions[requestId];
                 if (query.Equals(sub.QueryObj)) {
                     SendUnsubscription((Subscription<T>) sub);
+                    requestIds.Add(requestId);
                 }
             }
+            Subscription dummy = null;
+            foreach (int requestId in requestIds) {
+                _subscriptions.TryRemove(requestId, out dummy);
+            }
         }
 
         public void Unsubscribe<T>(ParseQuery<T> query, Subscription<T> subscription) where T : ParseObject {
             if (query == null || subscription == null) return;
-            foreach (Subscription sub in _subscriptions.Values) {
+            var requestIds = new List<int>();
+            foreach (int requestId in _subscriptions.Keys) {
+                var sub = _subscriptions[requestId];
                 if (query.Equals(sub.QueryObj) && subscription.Equals(sub)) {
                     SendUnsubscription(subscription);
+                    requestIds.Add(requestId);
                 }
             }
+            Subscription dummy = null;
+            foreach (int requestId in requestIds) {
+                _subscriptions.TryRemove(requestId, out dummy);
+            }
         }
 
         public void Reconnect() {

diff --git a/ParseLiveQuery/Properties/AssemblyInfo.cs b/ParseLiveQuery/Properties/AssemblyInfo.cs
diff --git a/ParseLiveQuery/Subscription.cs b/ParseLiveQuery/Subscription.cs
diff --git a/ParseLiveQuery/WebSocketClientFactory.cs b/ParseLiveQuery/WebSocketClientFactory.cs
diff --git a/ParseLiveQuery/WebSocketClientState.cs b/ParseLiveQuery/WebSocketClientState.cs
diff --git a/ParseLiveQuery/WebSocketSharpClientFactory.cs b/ParseLiveQuery/WebSocketSharpClientFactory.cs