Replace NSubstitute.dll contained within SDK to Unity3D-NSubstitute.g…

…it unity package dependency + setup AssemblyInfo
GetStream · Jan 9, 2024 · d91c8e3 · d91c8e3
1 parent 4fca3bf
commit d91c8e3
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 220 deletions.
diff --git a/Packages/StreamVideo/Runtime/Core/AssemblyInfo.cs b/Packages/StreamVideo/Runtime/Core/AssemblyInfo.cs
@@ -0,0 +1,14 @@
+#if UNITY_EDITOR || STREAM_TESTS_ENABLED
+using System.Runtime.CompilerServices;
+#endif
+
+#if UNITY_EDITOR
+[assembly: InternalsVisibleTo("StreamVideo.EditorTools")]
+[assembly: InternalsVisibleTo("StreamVideo.Tests.Editor")]
+#endif
+
+#if STREAM_TESTS_ENABLED || UNITY_EDITOR
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
+[assembly: InternalsVisibleTo("StreamVideo.Tests.Runtime")]
+[assembly: InternalsVisibleTo("StreamVideo.Tests.Shared")]
+#endif
diff --git a/Packages/StreamVideo/Runtime/Core/AssemblyInfo.cs.meta b/Packages/StreamVideo/Runtime/Core/AssemblyInfo.cs.meta
diff --git a/Packages/StreamVideo/Runtime/Core/LowLevelClient/StreamVideoLowLevelClient.cs b/Packages/StreamVideo/Runtime/Core/LowLevelClient/StreamVideoLowLevelClient.cs
@@ -29,20 +29,6 @@
 using StreamVideo.Libs.Utils;
 using StreamVideo.Libs.Websockets;
 
-#if UNITY_EDITOR || STREAM_TESTS_ENABLED
-using System.Runtime.CompilerServices;
-#endif
-
-#if UNITY_EDITOR
-[assembly: InternalsVisibleTo("StreamVideo.EditorTools")]
-#endif
-
-#if STREAM_TESTS_ENABLED || UNITY_EDITOR
-[assembly: InternalsVisibleTo("StreamVideo.Tests.Editor")]
-[assembly: InternalsVisibleTo("StreamVideo.Tests.Runtime")]
-[assembly: InternalsVisibleTo("StreamVideo.Tests.Shared")]
-#endif
-
 namespace StreamVideo.Core.LowLevelClient
 {
     /// <summary>

diff --git a/Packages/StreamVideo/Runtime/Core/State/Caches/CacheRepository.cs b/Packages/StreamVideo/Runtime/Core/State/Caches/CacheRepository.cs
@@ -128,6 +128,5 @@ internal CacheRepository(ConstructorHandler constructor, ICache cache)
 
         private readonly ConstructorHandler _constructor;
         private readonly ICache _cache;
-        private readonly IStatefulModelsFactory _statefulModelsFactory;
     }
 }
diff --git a/Packages/StreamVideo/Runtime/Core/State/Caches/ICacheRepository.cs b/Packages/StreamVideo/Runtime/Core/State/Caches/ICacheRepository.cs
@@ -27,17 +27,4 @@ TType CreateOrUpdate<TType, TDto>(TDto dto, out bool wasCreated)
 
         bool TryRemove(string uniqueId);
     }
-
-    internal interface IStatefulModelsFactory
-        {
-            // StreamChannel CreateStreamChannel(string uniqueId);
-            //
-            // StreamChannelMember CreateStreamChannelMember(string uniqueId);
-            //
-            // StreamLocalUserData CreateStreamLocalUser(string uniqueId);
-            //
-            // StreamMessage CreateStreamMessage(string uniqueId);
-            //
-            // StreamUser CreateStreamUser(string uniqueId);
-        }
 }
diff --git a/Packages/StreamVideo/Runtime/Core/State/StatefulModelContext.cs b/Packages/StreamVideo/Runtime/Core/State/StatefulModelContext.cs
@@ -1,5 +1,4 @@
-using StreamVideo.Core.LowLevelClient;
-using StreamVideo.Core.State.Caches;
+using StreamVideo.Core.State.Caches;
 using StreamVideo.Libs.Logs;
 using StreamVideo.Libs.Serialization;
 

diff --git a/Packages/StreamVideo/Runtime/Libs/NSubstitute.meta b/Packages/StreamVideo/Runtime/Libs/NSubstitute.meta
diff --git a/Packages/StreamVideo/Runtime/Libs/NSubstitute/Castle.Core.dll b/Packages/StreamVideo/Runtime/Libs/NSubstitute/Castle.Core.dll
diff --git a/Packages/StreamVideo/Runtime/Libs/NSubstitute/Castle.Core.dll.meta b/Packages/StreamVideo/Runtime/Libs/NSubstitute/Castle.Core.dll.meta
diff --git a/Packages/StreamVideo/Runtime/Libs/NSubstitute/NSubstitute.dll b/Packages/StreamVideo/Runtime/Libs/NSubstitute/NSubstitute.dll
diff --git a/Packages/StreamVideo/Runtime/Libs/NSubstitute/NSubstitute.dll.meta b/Packages/StreamVideo/Runtime/Libs/NSubstitute/NSubstitute.dll.meta
diff --git a/Packages/StreamVideo/Tests/Editor/StreamVideo.Tests.asmdef b/Packages/StreamVideo/Tests/Editor/StreamVideo.Tests.asmdef
@@ -4,7 +4,8 @@
     "references": [
         "StreamVideo.Core",
         "StreamVideo.Libs",
-        "StreamVideo.Tests.Shared"
+        "StreamVideo.Tests.Shared",
+        "TNRD.NSubstitute"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/Packages/StreamVideo/Tests/Shared/StreamVideo.Tests.Shared.asmdef b/Packages/StreamVideo/Tests/Shared/StreamVideo.Tests.Shared.asmdef
@@ -3,7 +3,8 @@
     "rootNamespace": "",
     "references": [
         "StreamVideo.Core",
-        "StreamVideo.Libs"
+        "StreamVideo.Libs",
+        "TNRD.NSubstitute"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -3,7 +3,7 @@
     "com.unity.ai.navigation": "1.1.4",
     "com.unity.collab-proxy": "2.0.5",
     "com.unity.feature.development": "1.0.1",
-    "com.unity.ide.rider": "3.0.25",
+    "com.unity.ide.rider": "3.0.27",
     "com.unity.ide.visualstudio": "2.0.18",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.nuget.newtonsoft-json": "3.2.1",
@@ -13,6 +13,7 @@
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.8.0",
     "com.unity.webrtc": "3.0.0-pre.6",
+    "net.tnrd.nsubstitute": "https://github.com/Thundernerd/Unity3D-NSubstitute.git",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -45,7 +45,7 @@
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.25",
+      "version": "3.0.27",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -171,6 +171,13 @@
         "com.unity.nuget.newtonsoft-json": "3.2.0"
       }
     },
+    "net.tnrd.nsubstitute": {
+      "version": "https://github.com/Thundernerd/Unity3D-NSubstitute.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "449712b25ae237eb5da2d958dd72a5432051e192"
+    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 0,