Merge branch 'main' into doolysbranch

BasisVR · Feb 9, 2025 · aa14bf6 · aa14bf6
2 parents 8033774 + 461588d
commit aa14bf6
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 3 deletions.
diff --git a/Basis/Packages/manifest.json b/Basis/Packages/manifest.json
@@ -17,6 +17,11 @@
     "com.valvesoftware.unity.openvr": "file:com.valvesoftware.unity.openvr-1.2.1.tgz",
     "com.xiph.opus": "https://github.com/BasisVR/UnityOpus.git",
     "com.xiph.rnnoise": "https://github.com/BasisVR/RNNoise.Net.git",
+    "org.basisvr.base128": "file:org.basisvr.base128-1.2.2.tgz",
+    "org.basisvr.bouncycastle": "file:org.basisvr.bouncycastle-2.5.0.tgz",
+    "org.basisvr.contrib.auth.did": "file:../../Contrib/Auth/Did",
+    "org.basisvr.newtonsoft.json": "file:org.basisvr.newtonsoft.json-13.0.3.tgz",
+    "org.basisvr.simplebase": "file:org.basisvr.simplebase-4.0.2.tgz",
     "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

diff --git a/Basis/Packages/org.basisvr.base128-1.2.2.tgz b/Basis/Packages/org.basisvr.base128-1.2.2.tgz
diff --git a/Basis/Packages/org.basisvr.bouncycastle-2.5.0.tgz b/Basis/Packages/org.basisvr.bouncycastle-2.5.0.tgz
diff --git a/Basis/Packages/org.basisvr.newtonsoft.json-13.0.3.tgz b/Basis/Packages/org.basisvr.newtonsoft.json-13.0.3.tgz
diff --git a/Basis/Packages/org.basisvr.simplebase-4.0.2.tgz b/Basis/Packages/org.basisvr.simplebase-4.0.2.tgz
diff --git a/Basis/Packages/packages-lock.json b/Basis/Packages/packages-lock.json
@@ -436,6 +436,41 @@
       "source": "embedded",
       "dependencies": {}
     },
+    "org.basisvr.base128": {
+      "version": "file:org.basisvr.base128-1.2.2.tgz",
+      "depth": 0,
+      "source": "local-tarball",
+      "dependencies": {}
+    },
+    "org.basisvr.bouncycastle": {
+      "version": "file:org.basisvr.bouncycastle-2.5.0.tgz",
+      "depth": 0,
+      "source": "local-tarball",
+      "dependencies": {}
+    },
+    "org.basisvr.contrib.auth.did": {
+      "version": "file:../../Contrib/Auth/Did",
+      "depth": 0,
+      "source": "local",
+      "dependencies": {
+        "org.basisvr.base128": "1.2.2",
+        "org.basisvr.bouncycastle": "2.5.0",
+        "org.basisvr.newtonsoft.json": "13.0.3",
+        "org.basisvr.simplebase": "4.0.2"
+      }
+    },
+    "org.basisvr.newtonsoft.json": {
+      "version": "file:org.basisvr.newtonsoft.json-13.0.3.tgz",
+      "depth": 0,
+      "source": "local-tarball",
+      "dependencies": {}
+    },
+    "org.basisvr.simplebase": {
+      "version": "file:org.basisvr.simplebase-4.0.2.tgz",
+      "depth": 0,
+      "source": "local-tarball",
+      "dependencies": {}
+    },
     "com.unity.modules.accessibility": {
       "version": "1.0.0",
       "depth": 0,

diff --git a/Contrib/Auth/Did/IsExternalInit.cs b/Contrib/Auth/Did/IsExternalInit.cs
@@ -1,13 +1,14 @@
-#if NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NETCOREAPP3_0 || NETCOREAPP3_1 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48
+#if NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NETCOREAPP3_0 || NETCOREAPP3_1 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48 || (ENABLE_MONO || ENABLE_IL2CPP || ENABLE_DOTNET)
+
 
 /// See https://www.mking.net/blog/error-cs0518-isexternalinit-not-defined
 
 using System.ComponentModel;
 
 namespace System.Runtime.CompilerServices
 {
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    internal static class IsExternalInit { }
+	[EditorBrowsable(EditorBrowsableState.Never)]
+	internal static class IsExternalInit { }
 }
 
 #endif