Merge pull request #447 from microsoft/fix/sdk-wont-work-without-distribute

UpdateTrack enum removed from AppCenterSettings

Author: guperrot

Assets/AppCenter/AppCenterSettings.cs

@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Reflection;
 using Microsoft.AppCenter.Unity;
-using Microsoft.AppCenter.Unity.Distribute;
 using UnityEngine;
 
 [Serializable]
@@ -48,7 +47,9 @@ public class AppCenterSettings : ScriptableObject
 
     public LogLevel InitialLogLevel = LogLevel.Info;
 
-    public UpdateTrack UpdateTrack = UpdateTrack.Public;
+    [CustomDropDownProperty("Public", 1)]
+    [CustomDropDownProperty("Private", 2)]
+    public int UpdateTrack;
 
     public CustomUrlProperty CustomLogUrl = new CustomUrlProperty("Log");
 

Assets/AppCenter/Editor/AppCenterPreBuild.cs

@@ -144,7 +144,7 @@ private void AddStartupCode(IAppCenterSettingsMaker settingsMaker)
             {
                 settingsMaker.SetDistributeDisableAutomaticCheckForUpdate();
             }
-            settingsMaker.SetUpdateTrack((int)settings.UpdateTrack);
+            settingsMaker.SetUpdateTrack(settings.UpdateTrack);
             settingsMaker.StartDistributeClass();
         }
         if (advancedSettings != null)

Assets/AppCenter/Editor/CustomDropDownPropertyDrawer.cs

@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+[CustomPropertyDrawer(typeof(CustomDropDownPropertyAttribute))]
+public class CustomDropDownPropertyDrawer : PropertyDrawer
+{
+    bool _initialized = false;
+    object[] _attributes = null;
+    Dictionary<string, int> _optionsDictionary = new Dictionary<string, int>();
+    string[] _options = null;
+    int _selectedIndex = 0;
+
+    public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+    {
+        if (!_initialized)
+        {
+            _attributes = fieldInfo.GetCustomAttributes(typeof(CustomDropDownPropertyAttribute), false);
+            foreach (var itemAttribute in _attributes)
+            {
+                var customPropertyAttribute = itemAttribute as CustomDropDownPropertyAttribute;
+                _optionsDictionary.Add(customPropertyAttribute.SelectedKey, customPropertyAttribute.SelectedValue);
+                if (customPropertyAttribute.SelectedValue == AppCenterSettingsContext.SettingsInstance.UpdateTrack)
+                {
+                    _selectedIndex = ArrayUtility.IndexOf(_attributes, itemAttribute);
+                }
+            }
+            _options = _optionsDictionary.Keys.ToArray();
+            _initialized = true;
+        }
+
+        _selectedIndex = EditorGUI.Popup(position, property.displayName, _selectedIndex, _options);
+        property.intValue = _optionsDictionary[_options[_selectedIndex]];
+    }
+}

Assets/AppCenter/Editor/CustomDropDownPropertyDrawer.cs.meta

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using UnityEngine;
+
+[AttributeUsage(AttributeTargets.Field, AllowMultiple = true)]
+public class CustomDropDownPropertyAttribute : PropertyAttribute
+{
+    public CustomDropDownPropertyAttribute(string key, int value)
+    {
+        SelectedKey = key;
+        SelectedValue = value;
+    }
+
+    public CustomDropDownPropertyAttribute()
+    {
+    }
+
+    public string SelectedKey { get; private set; }
+    public int SelectedValue { get; private set; }
+}

Assets/AppCenter/Properties/CustomDropDownPropertyAttribute.cs

@@ -4,6 +4,8 @@
 
 ### App Center
 
+* **[Fix]** Fix SDK doesn't work without `Distribute` package.
+
 #### iOS
 
 * **[Fix]** Add missing system dependencies that aren't implicitly included when `APPCENTER_DONT_USE_NATIVE_STARTER` flag is used.