2.0.0-preview.4 - 2019/02/05

@2019.1
ErikMoczi · Feb 6, 2019 · 5fb12a9 · 5fb12a9
1 parent a9b75fc
commit 5fb12a9
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 40 deletions.
diff --git a/package/CHANGELOG.md b/package/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.0.0-preview.3] - 2019-1-22
+* Add missin repo url to package json file
+* Fix NRE issue in build processor
+
 ## [2.0.0-preview.3] - 2019-1-22
 * Fix error in general build processor due to a potential null deref.
 * Fix missing check for unity version when referencing UIElements.

diff --git a/package/Editor/BuildHelpers.cs b/package/Editor/BuildHelpers.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;
+
+using UnityEditor;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+
+using UnityEngine;
+
+namespace UnityEditor.XR.Management
+{
+    public static class BuildHelpers
+    {
+        public static void CleanOldSettings<T>()
+        {
+            UnityEngine.Object[] preloadedAssets = PlayerSettings.GetPreloadedAssets();
+            if (preloadedAssets == null)
+                return;
+
+            var oldSettings = from s in preloadedAssets
+                where s != null && s.GetType() == typeof(T)
+                select s;
+
+            if (oldSettings != null && oldSettings.Any())
+            {
+                var assets = preloadedAssets.ToList();
+                foreach (var s in oldSettings)
+                {
+                    assets.Remove(s);
+                }
+
+                PlayerSettings.SetPreloadedAssets(assets.ToArray());
+            }
+        }
+    }
+}
diff --git a/package/Editor/BuildHelpers.cs.meta b/package/Editor/BuildHelpers.cs.meta
diff --git a/package/Editor/XRBuildProcessorHelper.cs b/package/Editor/XRBuildProcessorHelper.cs
@@ -31,24 +31,7 @@ public virtual UnityEngine.Object SettingsForBuildTargetGroup(BuildTargetGroup b
 
         void CleanOldSettings()
         {
-            UnityEngine.Object[] preloadedAssets = PlayerSettings.GetPreloadedAssets();
-            if (preloadedAssets == null)
-                return;
-
-            var oldSettings = from s in preloadedAssets
-                where s.GetType() == typeof(T)
-                select s;
-
-            if (oldSettings.Any())
-            {
-                var assets = preloadedAssets.ToList();
-                foreach (var s in oldSettings)
-                {
-                    assets.Remove(s);
-                }
-
-                PlayerSettings.SetPreloadedAssets(assets.ToArray());
-            }
+            BuildHelpers.CleanOldSettings<T>();
         }
 
         void SetSettingsForRuntime(UnityEngine.Object settingsObj)

diff --git a/package/Editor/XRGeneralBuildProcessor.cs b/package/Editor/XRGeneralBuildProcessor.cs
@@ -41,24 +41,7 @@ public int callbackOrder
 
         void CleanOldSettings()
         {
-            UnityEngine.Object[] preloadedAssets = PlayerSettings.GetPreloadedAssets();
-            if (preloadedAssets == null)
-                return;
-
-            var oldSettings = from s in preloadedAssets
-                where s.GetType() == typeof(XRGeneralSettings)
-                select s;
-
-            if (oldSettings != null && oldSettings.Any())
-            {
-                var assets = preloadedAssets.ToList();
-                foreach (var s in oldSettings)
-                {
-                    assets.Remove(s);
-                }
-
-                PlayerSettings.SetPreloadedAssets(assets.ToArray());
-            }
+            BuildHelpers.CleanOldSettings<XRGeneralSettings>();
         }
 
         public void OnPreprocessBuild(BuildReport report)

diff --git a/package/Samples~/Editor/SampleBuildProcessor.cs b/package/Samples~/Editor/SampleBuildProcessor.cs
@@ -43,10 +43,10 @@ void CleanOldSettings()
                 return;
 
             var oldSettings = from s in preloadedAssets
-                where s.GetType() == typeof(SampleSettings)
+                where s != null && s.GetType() == typeof(SampleSettings)
                 select s;
 
-            if (oldSettings.Any())
+            if (oldSettings != null && oldSettings.Any())
             {
                 var assets = preloadedAssets.ToList();
                 foreach (var s in oldSettings)

diff --git a/package/package.json b/package/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.unity.xr.management",
   "displayName": "XR SDK Management",
-  "version": "2.0.0-preview.3",
+  "version": "2.0.0-preview.4",
   "unity": "2019.1",
   "description": "Package to provide for simple management of XR SDK loading, unloading and configuration.",
   "keywords": [
@@ -17,7 +17,7 @@
     "com.unity.subsystemregistration": "1.0.0-preview.4"
   },
   "repository": {
-    "revision": "c26229d8b86ae1928dcb2c593f81440a06a2c60d"
+    "revision": "cf097d600a9bea7b8e43bfa3458261255f287e1c"
   },
   "samples": [
     {

diff --git a/versions.txt b/versions.txt
@@ -22,3 +22,4 @@
 2.0.0-preview.1
 2.0.0-preview.2
 2.0.0-preview.3
+2.0.0-preview.4