Remove dependencies with AssetBundleBrowser and Addressables/Fix Issue that Addressable Builders can't set first Builder Script.

Author: hiroki-o

Editor/GUI/GroupView/GroupViewController.cs

@@ -1,13 +1,15 @@
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
-using UnityEditor.AddressableAssets;
-
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
 using Model=UnityEngine.AssetGraph.DataModel.Version2;
 
+#if ADDRESSABLES_1_6_OR_NEWER
+using UnityEditor.AddressableAssets;
+#endif
+
 namespace UnityEngine.AssetGraph {
 
     [Serializable]
@@ -132,6 +134,7 @@ public void OnGroupViewGUI() {
                 EditorGUILayout.HelpBox(selectedAsset, MessageType.None);
             }
 
+#if ADDRESSABLES_1_6_OR_NEWER
             if (m_selectedAsset != null) {
                 var aaSettings = AddressableAssetSettingsDefaultObject.GetSettings(false);
                 if (aaSettings != null) {
@@ -145,6 +148,7 @@ public void OnGroupViewGUI() {
                     }
                 }
             }
+#endif
 		}
 
         public void ReloadAndSelect() {

Editor/Integration/AssetBundles-Browser/GraphToolABDataSource.cs

@@ -3,10 +3,11 @@
  * 
  * This code will setup the output of the graph tool to be viewable in the browser.
  * 
- * AssetBundles-Browser Available at:
- * https://github.com/Unity-Technologies/AssetBundles-Browser
+ * AssetBundles-Browser is available from Unity Package Manager.
  */
- 
+
+#if ASSETBUNDLEBROWSER_1_7_OR_NEWER
+
 using UnityEditor;
 using Model = UnityEngine.AssetGraph.DataModel.Version2;
 using System;
@@ -140,3 +141,5 @@ public bool BuildAssetBundles (AssetBundleBrowser.AssetBundleDataSource.ABBuildI
 		}
     }
 }
+
+#endif

Editor/System/Model/SerializableGroups.cs

@@ -95,7 +95,7 @@ public void Remove (string groupName) {
         public Dictionary<string, List<AssetReference>> ToGroupDictionary() {
             Dictionary<string, List<AssetReference>> dic = new Dictionary<string, List<AssetReference>>();
 			foreach(var g in m_groups) {
-                dic [g.name] = g.assets.Select(a => AssetReferenceDatabase.GetReference(a)).ToList();
+                dic [g.name] = g.assets.Select(AssetReferenceDatabase.GetReference).ToList();
 			}
 			return dic;
 		}

Editor/System/Node/Addressables.meta

@@ -1,3 +1,12 @@
+/**
+ * Addressable integration
+ * 
+ * This code will add features for Addressables System.
+ * 
+ * Addressables System is available from Unity Package Manager.
+ */
+
+#if ADDRESSABLES_1_6_OR_NEWER
 
 using System;
 using System.Linq;
@@ -190,4 +199,6 @@ private void ConfigureAddress (IEnumerable<PerformGraph.AssetGroups> incoming)
 			}
 		}
     }
-}
+}
+
+#endif

Editor/System/Node/Buitin/AddressableAssetAddress.cs Editor/System/Node/Addressables/AddressableAssetAddress.cs

@@ -1,3 +1,12 @@
+/**
+ * Addressable integration
+ * 
+ * This code will add features for Addressables System.
+ * 
+ * Addressables System is available from Unity Package Manager.
+ */
+
+#if ADDRESSABLES_1_6_OR_NEWER
 
 using System;
 using System.Linq;
@@ -169,4 +178,6 @@ private void ConfigureGroup (IEnumerable<PerformGraph.AssetGroups> incoming)
 			}
 		}
     }
-}
+}
+
+#endif

Editor/System/Node/Buitin/AddressableAssetAddress.cs.meta Editor/System/Node/Addressables/AddressableAssetAddress.cs.meta

@@ -1,3 +1,12 @@
+/**
+ * Addressable integration
+ * 
+ * This code will add features for Addressables System.
+ * 
+ * Addressables System is available from Unity Package Manager.
+ */
+
+#if ADDRESSABLES_1_6_OR_NEWER
 
 using System;
 using System.Linq;
@@ -173,4 +182,6 @@ public override void Build (BuildTarget target,
 			}			
 		}
     }
-}
+}
+
+#endif

Editor/System/Node/Buitin/AddressableAssetGroup.cs Editor/System/Node/Addressables/AddressableAssetGroup.cs

@@ -1,3 +1,13 @@
+/**
+ * Addressable integration
+ * 
+ * This code will add features for Addressables System.
+ * 
+ * Addressables System is available from Unity Package Manager.
+ */
+
+#if ADDRESSABLES_1_6_OR_NEWER
+
 using UnityEditor;
 
 using System;
@@ -110,8 +120,8 @@ public override void OnInspectorGUI(NodeGUI node, AssetReferenceStreamManager st
 			}
 
 			var dataBuilders = Settings.DataBuilders.Where(builder => (builder as IDataBuilder).CanBuildData<AddressablesPlayerBuildResult>()).ToList();
-			
-			var builderIndex = m_currentDataBuilder == null ? 0 : dataBuilders.IndexOf(m_currentDataBuilder);
+
+			var builderIndex = m_currentDataBuilder == null ? -1 : dataBuilders.IndexOf(m_currentDataBuilder);
 			var builderNames = dataBuilders
 				.Select(builder => ((IDataBuilder) builder).Name).ToArray();
 
@@ -279,3 +289,5 @@ public override void Build(BuildTarget target,
 		}
 	}
 }
+
+#endif

Editor/System/Node/Buitin/AddressableAssetGroup.cs.meta Editor/System/Node/Addressables/AddressableAssetGroup.cs.meta

@@ -17,5 +17,17 @@
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": []
+    "versionDefines": [
+        {
+            "name": "com.unity.assetbundlebrowser",
+            "expression": "1.7.0",
+            "define": "ASSETBUNDLEBROWSER_1_7_OR_NEWER"
+        },
+        {
+            "name": "com.unity.addressables",
+            "expression": "1.6.0",
+            "define": "ADDRESSABLES_1_6_OR_NEWER"
+        }
+    ],
+    "noEngineReferences": false
 }

Editor/System/Node/Buitin/AddressableAssetLabel.cs Editor/System/Node/Addressables/AddressableAssetLabel.cs

@@ -2,5 +2,23 @@
     "name": "Unity.AssetGraph",
     "references": [],
     "includePlatforms": [],
-    "excludePlatforms": []
-}
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [
+        {
+            "name": "com.unity.assetbundlebrowser",
+            "expression": "1.7.0",
+            "define": "ASSETBUNDLEBROWSER_1_7_OR_NEWER"
+        },
+        {
+            "name": "com.unity.addressables",
+            "expression": "1.6.0",
+            "define": "ADDRESSABLES_1_6_OR_NEWER"
+        }
+    ],
+    "noEngineReferences": false
+}

Editor/System/Node/Buitin/AddressableAssetLabel.cs.meta Editor/System/Node/Addressables/AddressableAssetLabel.cs.meta

@@ -1,13 +1,9 @@
 {
 	"name": "com.unity.assetgraph",
 	"displayName": "Asset Graph",
-	"version": "1.7.0-preview",
+	"version": "1.7.1-preview",
 	"unity": "2018.4",
 	"description": "AssetGraph is a visual toolset lets you configure asset workflow visually in Unity. It is intended to create rule-based configuration using graphs to create and manage efficient workflow around assets.",
 	"keywords": ["asset", "bundle", "bundles", "assetbundles", "graph", "automation", "import", "resources"],
-	"category": "Asset Bundles",
-	"dependencies": {
-		"com.unity.assetbundlebrowser" : "1.7.0",
-		"com.unity.addressables" : "1.7.5"
-	}
+	"category": "Asset Bundles"
 }