Unity 2019.2.0f1 (#71)

* Update bootstrap + shared ci pin to temp 2019.1 ci

* Upgrade to 2019.2.0f1

* Changelog

* Use new queue

* Buildkite V2

* Fix bootstrap checkout

* Update bootstrap for better pinning
Update pins

* Re-pin shared-ci

* Update buildkite queue

* re-pin latest gdk

* re-pin GDK

* Disable Burst AOT for Linux x64

Author: zeroZshadow

.buildkite/premerge.steps.yaml

@@ -13,7 +13,7 @@ common: &common
     - "environment=production"
     - "permission_set=builder"
     - "platform=windows"
-    - "queue=v3-1562257704-92dadf3bbbe69f0b-------z"
+    - "queue=v3-1566854625-09d22e84794c4a34-------z"
     - "scaler_version=2"
     - "minimum_instances=1"
     - "agent_count=1"

.buildkite/release-qa.steps.yaml

@@ -13,7 +13,7 @@ common: &common
     - "environment=production"
     - "permission_set=builder"
     - "platform=windows"
-    - "queue=v3-1562257704-92dadf3bbbe69f0b-------z"
+    - "queue=v3-1566854625-09d22e84794c4a34-------z"
     - "scaler_version=2"
     - "minimum_instances=1"
     - "agent_count=1"

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Changed
+
+- Upgraded the project to be compatible with `2019.2.0f1`.
+
 ## `0.2.7` - 2019-08-19
 
 ### Breaking changes

ci/UnityEditorHash.txt

@@ -5,7 +5,6 @@ if [[ -n "${DEBUG-}" ]]; then
   set -x
 fi
 
-
 function isLinux() {
   [[ "$(uname -s)" == "Linux" ]];
 }
@@ -24,7 +23,8 @@ echo "--- Bootstrapping :boot:"
 
 SHARED_CI_DIR="$(pwd)/.shared-ci"
 CLONE_URL="[email protected]:spatialos/gdk-for-unity-shared-ci.git"
-PINNED_SHARED_CI_VERSION=$(cat ./ci/shared-ci.pinned)
+PINNED_SHARED_CI_BRANCH=$(cat ./ci/shared-ci.pinned | cut -d' ' -f 1)
+PINNED_SHARED_CI_VERSION=$(cat ./ci/shared-ci.pinned | cut -d' ' -f 2)
 
 # Clone the HEAD of the shared CI repo into ".shared-ci"
 
@@ -38,40 +38,47 @@ mkdir "${SHARED_CI_DIR}"
 pushd "${SHARED_CI_DIR}"
     git init
     git remote add origin "${CLONE_URL}"
-    git fetch --depth 20 origin master
+    git fetch --depth 20 origin "${PINNED_SHARED_CI_BRANCH}"
     git checkout "${PINNED_SHARED_CI_VERSION}"
 popd
 
 # Clone the GDK for Unity repository
 
 CLONE_URI="[email protected]:spatialos/gdk-for-unity.git"
 TARGET_DIRECTORY="$(realpath $(pwd)/../gdk-for-unity)"
-PINNED_VERSION=$(cat ./gdk.pinned)
+PINNED_BRANCH=$(cat ./gdk.pinned | cut -d' ' -f 1)
+PINNED_VERSION=$(cat ./gdk.pinned | cut -d' ' -f 2)
+SKIP_GDK=false
 
 if [[ -z ${BUILDKITE:-} ]]; then
     echo "Warning: About to delete ${TARGET_DIRECTORY}. Please confirm. (Default is Cancel)"
-    read -p "Y/N > " -r
+    read -p "Y/N/S > " -r
     echo    # (optional) move to a new line
     if [[ $REPLY =~ ^[Yy]$ ]]; then
         echo "Deleting..."
+    elif [[ $REPLY =~ ^[Ss]$ ]]; then
+        echo "Skipping..."
+        SKIP_GDK=true
     else
         exit 1
     fi
 fi
 
-rm -rf "${TARGET_DIRECTORY}"
+if [ "$SKIP_GDK" = false ] ; then
+    rm -rf "${TARGET_DIRECTORY}"
 
-mkdir "${TARGET_DIRECTORY}"
+    mkdir "${TARGET_DIRECTORY}"
 
-# Workaround for being unable to clone a specific commit with depth of 1.
-pushd "${TARGET_DIRECTORY}"
-    git init
-    git remote add origin "${CLONE_URI}"
-    git fetch --depth 20 origin develop
-    git checkout "${PINNED_VERSION}"
-    echo "--- Hit init :right-facing_fist::red_button:"
-    ./init.sh
-popd
+    # Workaround for being unable to clone a specific commit with depth of 1.
+    pushd "${TARGET_DIRECTORY}"
+        git init
+        git remote add origin "${CLONE_URI}"
+        git fetch --depth 20 origin "${PINNED_BRANCH}"
+        git checkout "${PINNED_VERSION}"
+        echo "--- Hit init :right-facing_fist::red_button:"
+        ./init.sh
+    popd
+fi
 
 echo "--- Symlinking packages :link::package:"
 

ci/bootstrap.sh

@@ -1 +1 @@
-4085a20354d1e41502de36e1330bd589576edb58
+master 16af8b4696032d897ba4d8075eaa61355f06f488

ci/shared-ci.pinned

@@ -1 +1 @@
-06858069686faffce4c93212e2b6d160e40a9f09
+develop 4dbd8790baf3a334249742e3d8c1ab724a36314c

gdk.pinned

@@ -1,5 +1,15 @@
 {
   "dependencies": {
+    "com.unity.ads": "2.0.8",
+    "com.unity.analytics": "3.3.2",
+    "com.unity.ide.rider": "1.0.8",
+    "com.unity.package-manager-ui": "2.2.0",
+    "com.unity.purchasing": "2.0.6",
+    "com.unity.test-framework": "1.0.13",
+    "com.unity.textmeshpro": "2.0.1",
+    "com.unity.timeline": "1.1.0",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.0.2",
     "io.improbable.gdk.buildsystem": "0.2.7",
     "io.improbable.gdk.core": "0.2.7",
     "io.improbable.gdk.debug": "0.2.7",
@@ -10,13 +20,6 @@
     "io.improbable.gdk.testutils": "0.2.7",
     "io.improbable.gdk.tools": "0.2.7",
     "io.improbable.gdk.transformsynchronization": "0.2.7",
-    "com.unity.ads": "2.0.8",
-    "com.unity.analytics": "3.3.2",
-    "com.unity.package-manager-ui": "2.1.2",
-    "com.unity.purchasing": "2.0.6",
-    "com.unity.textmeshpro": "2.0.0",
-    "com.unity.timeline": "1.0.0",
-    "com.unity.xr.legacyinputhelpers": "2.0.2",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
@@ -48,7 +51,7 @@
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
   },
-  "registry": "https://staging-packages.unity.com",
+  "registry": "https://packages.unity.com",
   "scopedRegistries": [
     {
       "name": "Improbable",
@@ -58,4 +61,4 @@
       ]
     }
   ]
-}
+}

workers/unity/Packages/manifest.json

@@ -0,0 +1,11 @@
+{
+    "MonoBehaviour": {
+        "m_Enabled": true,
+        "m_EditorHideFlags": 0,
+        "m_Name": "",
+        "m_EditorClassIdentifier": "Unity.Burst.Editor:Unity.Burst.Editor:BurstPlatformAotSettings",
+        "DisableOptimisations": false,
+        "DisableSafetyChecks": true,
+        "DisableBurstCompilation": true
+    }
+}

workers/unity/ProjectSettings/BurstAotSettings_StandaloneLinux64.json

@@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 16
+  serializedVersion: 18
   productGUID: 48dba98ff9fbf9e4f825b8a68154a36b
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
@@ -52,8 +52,8 @@ PlayerSettings:
   m_StackTraceTypes: 010000000100000001000000010000000100000001000000
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
-  iosAppInBackgroundBehavior: 0
   displayResolutionDialog: 1
+  iosUseCustomAppBackgroundBehavior: 0
   iosAllowHTTPDownload: 1
   allowedAutorotateToPortrait: 1
   allowedAutorotateToPortraitUpsideDown: 1
@@ -65,6 +65,7 @@ PlayerSettings:
   disableDepthAndStencilBuffers: 0
   androidStartInFullscreen: 1
   androidRenderOutsideSafeArea: 0
+  androidUseSwappy: 0
   androidBlitType: 0
   defaultIsNativeResolution: 1
   macRetinaSupport: 1
@@ -79,6 +80,7 @@ PlayerSettings:
   usePlayerLog: 1
   bakeCollisionMeshes: 0
   forceSingleInstance: 0
+  useFlipModelSwapchain: 1
   resizableWindow: 0
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
@@ -148,6 +150,7 @@ PlayerSettings:
     oculus:
       sharedDepthBuffer: 0
       dashSupport: 0
+      lowOverheadMode: 0
     enable360StereoCapture: 0
   isWsaHolographicRemotingEnabled: 0
   protectGraphicsMemory: 0
@@ -270,6 +273,8 @@ PlayerSettings:
     height: 180
     banner: {fileID: 0}
   androidGamepadSupportLevel: 0
+  AndroidValidateAppBundleSize: 1
+  AndroidAppBundleSizeToValidate: 150
   resolutionDialogBanner: {fileID: 0}
   m_BuildTargetIcons: []
   m_BuildTargetPlatformIcons:
@@ -400,10 +405,10 @@ PlayerSettings:
     m_Devices:
     - Oculus
     - OpenVR
-  m_BuildTargetEnableVuforiaSettings: []
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
   openGLRequireES32: 0
+  vuforiaEnabled: 0
   m_TemplateCustomTags: {}
   mobileMTRendering:
     Android: 1
@@ -621,6 +626,7 @@ PlayerSettings:
   monoEnv: 
   splashScreenBackgroundSourceLandscape: {fileID: 0}
   splashScreenBackgroundSourcePortrait: {fileID: 0}
+  blurSplashScreenBackground: 1
   spritePackerPolicy: 
   webGLMemorySize: 256
   webGLExceptionSupport: 1