Removed jetbrains dll as it isnt needed in plugins

EcsRx · Dec 16, 2019 · 52ad6ce · 52ad6ce
1 parent 6635409
commit 52ad6ce
Show file tree

Hide file tree

Showing 15 changed files with 1,165 additions and 1,230 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,5 @@ src/\.idea/\.idea\.src/
 /src/Assets/Plugins/Zenject/OptionalExtras
 /src/.vs
 /src/Assets/EcsRx/*.pdb
-/src/Assets/EcsRx/*.pdb.meta
+/src/Assets/EcsRx/*.pdb.meta
+src/Logs/
diff --git a/src/Assembly-CSharp-Editor.csproj b/src/Assembly-CSharp-Editor.csproj
diff --git a/src/Assembly-CSharp-firstpass.csproj b/src/Assembly-CSharp-firstpass.csproj
diff --git a/src/Assembly-CSharp.csproj b/src/Assembly-CSharp.csproj
diff --git a/src/Assets/Plugins/Editor.meta b/src/Assets/Plugins/Editor.meta
diff --git a/src/Assets/Plugins/Editor/JetBrains.meta b/src/Assets/Plugins/Editor/JetBrains.meta
diff --git a/src/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll b/src/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll
diff --git a/src/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll.meta b/src/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll.meta
diff --git a/src/Logs/Packages-Update.log b/src/Logs/Packages-Update.log
diff --git a/src/Packages/manifest.json b/src/Packages/manifest.json
@@ -1,8 +1,19 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.2.15",
-    "com.unity.package-manager-ui": "2.0.3",
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.collab-proxy": "1.2.16",
+    "com.unity.ext.nunit": "1.0.0",
+    "com.unity.ide.rider": "1.1.0",
+    "com.unity.ide.vscode": "1.1.2",
+    "com.unity.multiplayer-hlapi": "1.0.2",
+    "com.unity.package-manager-ui": "2.2.0",
+    "com.unity.test-framework": "1.0.13",
+    "com.unity.timeline": "1.1.0",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.0.2",
     "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
     "com.unity.modules.audio": "1.0.0",

diff --git a/src/ProjectSettings/ProjectVersion.txt b/src/ProjectSettings/ProjectVersion.txt
@@ -1 +1,2 @@
-m_EditorVersion: 2018.3.3f1
+m_EditorVersion: 2019.2.9f1
+m_EditorVersionWithRevision: 2019.2.9f1 (ebce4d76e6e8)
diff --git a/src/ProjectSettings/XRSettings.asset b/src/ProjectSettings/XRSettings.asset
@@ -0,0 +1,10 @@
+{
+    "m_SettingKeys": [
+        "VR Device Disabled",
+        "VR Device User Alert"
+    ],
+    "m_SettingValues": [
+        "False",
+        "False"
+    ]
+}
diff --git a/src/Zenject-Editor.csproj b/src/Zenject-Editor.csproj
diff --git a/src/Zenject.csproj b/src/Zenject.csproj
diff --git a/src/src.sln b/src/src.sln
@@ -40,7 +40,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Assembly-CSharp.csproj
-	EndGlobalSection
 EndGlobal