Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dogfooding

* feature/bump-2021:
  MTT-3022 removing QoS until we have a version that works and compiles for iOS
  cleanup
  adding git lfs support
  something didn't work, reverting file
  Adding project id detection
  initial pass at hooks

Author: SamuelBellomo

Packages/manifest.json

@@ -20,7 +20,6 @@
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",
     "com.unity.toolchain.macos-x86_64-linux-x86_64": "1.0.0",
-    "com.unity.ucg.qos": "0.3.1-preview.2",
     "com.unity.ugui": "1.0.0",
     "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696",
     "com.unity.modules.ai": "1.0.0",

Packages/packages-lock.json

@@ -347,16 +347,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.ucg.qos": {
-      "version": "0.3.1-preview.2",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.collections": "0.9.0-preview.6",
-        "com.unity.modules.unitywebrequest": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.ugui": {
       "version": "1.0.0",
       "depth": 0,

RepoUtilities/InstallHooks.bat

@@ -0,0 +1,4 @@
+echo "starting"
+xcopy pre-commit.toInstall ../.git/hooks/pre-commit
+echo "checking if python is installed, if the following errors out, please install python3"
+python3 -c "print('done installing')"

RepoUtilities/InstallHooks.sh

@@ -0,0 +1,6 @@
+echo "starting"
+cp pre-commit.toInstall ../.git/hooks/pre-commit
+chmod +x ../.git/hooks/pre-commit
+echo "checking if python is installed, if the following errors out, please install python3"
+
+python3 -c "print('done installing')"

RepoUtilities/pre-commit.py

@@ -0,0 +1,30 @@
+import json
+import sys
+import os
+import re
+
+def FailCommit(reason):
+    print("Oh no! Bad commit! "+reason)
+    sys.exit(1)
+
+def GetStagedFileContent(filePath):
+    cmd = 'git show :' + filePath
+    stream = os.popen(cmd)
+    return stream.read()
+
+def GetLFSStagedFileContent(filePath):
+    cmd = f"git cat-file blob :{filePath} | git lfs smudge"
+    stream = os.popen(cmd)
+    return stream.read()
+
+output = GetStagedFileContent('Packages/manifest.json')
+packages = json.loads(output)['dependencies']
+if ('com.unity.multiplayer.virtualprojects' in packages):
+    FailCommit("Virtual projects in packages")
+if ('github' in packages['com.unity.multiplayer.tools'].lower()):
+    FailCommit("Tools using github package")
+
+content = GetLFSStagedFileContent('ProjectSettings/ProjectSettings.asset')
+res = re.search(r'.*cloudProjectId:.*\w+\s*\n', content) != None
+if res:
+    FailCommit("Detected cloud project id in project settings")

RepoUtilities/pre-commit.toInstall

@@ -0,0 +1 @@
+python3 RepoUtilities/pre-commit.py