Removed BuildTargetGroup selection

src/Tool - builds manager/Assets/Plugins/BuildsManager/Editor/Core/MainManager.cs

@@ -30,7 +30,7 @@ public static void RunBuild()
 
             var startTime = DateTime.Now;
             _usedDate = DateTime.Now;
-            
+
             BuildAll();
             CompressAll();
 
@@ -46,90 +46,64 @@ public static void RunBuild()
 
         #region Loading Data
 
-        public static void LoadSettings()
+        public static GeneralBuildData LoadSettings()
         {
             const string SETTINGS_DEFAULT_PATH = "Assets/Plugins/BuildsManager/Settings/GeneralBuildData.asset";
             const string SETTINGS_PATH_KEY = "BuildManagerWindow.SettingsPath";
 
             var settingsPath = PlayerPrefs.GetString(SETTINGS_PATH_KEY, "");
+            GeneralBuildData = LoadAssetAtPath<GeneralBuildData>(settingsPath, SETTINGS_DEFAULT_PATH);
+            PlayerPrefs.SetString(SETTINGS_PATH_KEY, AssetDatabase.GetAssetPath(GeneralBuildData));
+
+            GeneralBuildData.addonsUsedData = LoadAddonsUsedData();
 
-            if (!string.IsNullOrEmpty(settingsPath))
-            {
-                GeneralBuildData = AssetDatabase.LoadAssetAtPath<GeneralBuildData>(settingsPath);
-                if (GeneralBuildData == null)
-                {
-                    settingsPath = null;
-                }
-            }
-
-            if (string.IsNullOrEmpty(settingsPath))
-            {
-                var guids = AssetDatabase.FindAssets("t:GeneralBuildData", new[] { "Assets" });
-                if (guids.Length >= 2)
-                {
-                    Debug.LogError("2+ GeneralBuildData exist. Consider on using only 1 setting. " +
-                                   "The first one will be used.");
-                }
-
-                if (guids.Length != 0)
-                {
-                    settingsPath = AssetDatabase.GUIDToAssetPath(guids[0]);
-                    PlayerPrefs.SetString(SETTINGS_PATH_KEY, settingsPath);
-                    GeneralBuildData = AssetDatabase.LoadAssetAtPath<GeneralBuildData>(settingsPath);
-                }
-            }
-
-            if (GeneralBuildData == null)
-            {
-                GeneralBuildData = (GeneralBuildData)ScriptableObject.CreateInstance(typeof(GeneralBuildData));
-                AssetDatabase.CreateAsset(GeneralBuildData, SETTINGS_DEFAULT_PATH);
-                PlayerPrefs.SetString(SETTINGS_PATH_KEY, SETTINGS_DEFAULT_PATH);
-            }
-
-            var addonsUsedData = LoadAddonsUsedData();
-            GeneralBuildData.addonsUsedData = addonsUsedData;
+            return GeneralBuildData;
         }
 
-        private static AddonsUsedData LoadAddonsUsedData()
+        public static AddonsUsedData LoadAddonsUsedData()
         {
             const string ADDONS_USED_DEFAULT_PATH = "Assets/Plugins/BuildsManager/Settings/AddonsUsedData.asset";
             const string ADDONS_USED_PATH_KEY = "BuildManagerWindow.AddonsUsedPath";
 
             var addonsUsedPath = PlayerPrefs.GetString(ADDONS_USED_PATH_KEY, "");
+            var addonsUsedData = LoadAssetAtPath<AddonsUsedData>(addonsUsedPath, ADDONS_USED_DEFAULT_PATH);
+            PlayerPrefs.SetString(ADDONS_USED_PATH_KEY, AssetDatabase.GetAssetPath(addonsUsedData));
+
+
+            return LoadAssetAtPath<AddonsUsedData>(addonsUsedPath, ADDONS_USED_DEFAULT_PATH);
+        }
 
-            if (!string.IsNullOrEmpty(addonsUsedPath))
+        private static T LoadAssetAtPath<T>(string path, string defaultPath) where T : ScriptableObject
+        {
+            T asset = null;
+            if (!string.IsNullOrEmpty(path))
             {
-                var addonsUsedData = AssetDatabase.LoadAssetAtPath<AddonsUsedData>(addonsUsedPath);
-                if (addonsUsedData == null)
-                {
-                    addonsUsedPath = null;
-                }
+                asset = AssetDatabase.LoadAssetAtPath<T>(path);
+                if (asset == null) path = null;
             }
 
-            if (string.IsNullOrEmpty(addonsUsedPath))
+            if (string.IsNullOrEmpty(path))
             {
-                var guids = AssetDatabase.FindAssets("t:AddonsUsedData", new[] { "Assets" });
+                var guids = AssetDatabase.FindAssets($"t:{typeof(T).Name}", new[] { "Assets" });
                 if (guids.Length >= 2)
-                {
-                    Debug.LogError("2+ AddonsUsedData exist. Consider on using only 1 setting. " +
-                                   "The first one will be used.");
-                }
+                    Debug.LogError(
+                        $"2+ {typeof(T).Name} exist. Consider using only 1 setting. The first one will be used.");
 
                 if (guids.Length != 0)
                 {
-                    addonsUsedPath = AssetDatabase.GUIDToAssetPath(guids[0]);
-                    PlayerPrefs.SetString(ADDONS_USED_PATH_KEY, addonsUsedPath);
+                    path = AssetDatabase.GUIDToAssetPath(guids[0]);
+                    asset = AssetDatabase.LoadAssetAtPath<T>(path);
                 }
             }
 
-            if (string.IsNullOrEmpty(addonsUsedPath))
+            if (string.IsNullOrEmpty(path))
             {
-                var addonsUsedData = (AddonsUsedData)ScriptableObject.CreateInstance(typeof(AddonsUsedData));
-                AssetDatabase.CreateAsset(addonsUsedData, ADDONS_USED_DEFAULT_PATH);
-                PlayerPrefs.SetString(ADDONS_USED_PATH_KEY, ADDONS_USED_DEFAULT_PATH);
+                asset = ScriptableObject.CreateInstance<T>();
+                AssetDatabase.CreateAsset(asset, defaultPath);
+                path = defaultPath;
             }
 
-            return AssetDatabase.LoadAssetAtPath<AddonsUsedData>(addonsUsedPath);
+            return asset;
         }
 
         #endregion
@@ -162,7 +136,6 @@ private static void BuildAll()
                 {
                     scenes = scenes,
                     locationPathName = buildData.buildPath,
-                    targetGroup = buildData.targetGroup,
                     target = buildData.target,
                     options = buildData.options,
                 };
@@ -173,14 +146,14 @@ private static void BuildAll()
             EditorUserBuildSettings.SwitchActiveBuildTarget(targetGroupBeforeStart, targetBeforeStart);
             PlayerSettings.SetScriptingDefineSymbols(namedBuildTargetStart, definesBeforeStart);
         }
-        
+
         private static void CompressAll()
         {
             for (byte i = 0; i < GeneralBuildData.builds.Count; ++i)
             {
                 var buildData = GeneralBuildData.builds[i];
 
-                if (!buildData.isCompress || !buildData.isEnabled || buildData.targetGroup == BuildTargetGroup.Android)
+                if (!buildData.isCompress || !buildData.isEnabled || buildData.target == BuildTarget.Android)
                 {
                     continue;
                 }
@@ -201,9 +174,9 @@ private static void CompressAll()
         private static void BaseBuild(BuildPlayerOptions buildPlayerOptions, IEnumerable<AddonUsed> addonsUsed,
             bool isReleaseBuild)
         {
-            var targetGroup = buildPlayerOptions.targetGroup;
+            var targetGroup = buildPlayerOptions.target.ToBuildTargetGroup();
 
-            if (targetGroup == BuildTargetGroup.Android && PlayerSettings.Android.useCustomKeystore &&
+            if (buildPlayerOptions.target == BuildTarget.Android && PlayerSettings.Android.useCustomKeystore &&
                 string.IsNullOrEmpty(PlayerSettings.Android.keyaliasPass))
             {
                 PlayerSettings.Android.keyaliasPass = PlayerSettings.Android.keystorePass = "keystore";

src/Tool - builds manager/Assets/Plugins/BuildsManager/Editor/Data/BuildData.cs

@@ -15,7 +15,6 @@ public class BuildData : ICloneable
         public List<AddonUsed> addonsUsed;
         public BuildOptions options = BuildOptions.None;
         public BuildTarget target = BuildTarget.NoTarget;
-        public BuildTargetGroup targetGroup = BuildTargetGroup.Unknown;
 
         public object Clone()
         {

src/Tool - builds manager/Assets/Plugins/BuildsManager/Editor/Utility/BuildTargetGroupConverter.cs

@@ -0,0 +1,67 @@
+using UnityEditor;
+
+namespace BuildsManager.Utility
+{
+    public static class BuildTargetGroupConverter
+    {
+        public static BuildTargetGroup ToBuildTargetGroup(this BuildTarget buildTarget)
+        {
+            return buildTarget switch
+            {
+                BuildTarget.StandaloneWindows64 => BuildTargetGroup.Standalone,
+                BuildTarget.StandaloneWindows => BuildTargetGroup.Standalone,
+                BuildTarget.StandaloneLinux64 => BuildTargetGroup.Standalone,
+                BuildTarget.StandaloneOSX => BuildTargetGroup.Standalone,
+
+                BuildTarget.Android => BuildTargetGroup.Android,
+                BuildTarget.iOS => BuildTargetGroup.iOS,
+
+                BuildTarget.WebGL => BuildTargetGroup.WebGL,
+
+                BuildTarget.PS5 => BuildTargetGroup.PS5,
+                BuildTarget.PS4 => BuildTargetGroup.PS4,
+
+                BuildTarget.GameCoreXboxOne => BuildTargetGroup.GameCoreXboxOne,
+                BuildTarget.XboxOne => BuildTargetGroup.XboxOne,
+
+                BuildTarget.tvOS => BuildTargetGroup.tvOS,
+
+                BuildTarget.Switch => BuildTargetGroup.Switch,
+
+                BuildTarget.EmbeddedLinux => BuildTargetGroup.EmbeddedLinux,
+                BuildTarget.Bratwurst => BuildTargetGroup.Bratwurst,
+                BuildTarget.WSAPlayer => BuildTargetGroup.WSA,
+                BuildTarget.QNX => BuildTargetGroup.QNX,
+
+                // Deprecated
+                BuildTarget.GameCoreXboxSeries => BuildTargetGroup.GameCoreXboxSeries,
+                BuildTarget.StandaloneLinuxUniversal => BuildTargetGroup.Standalone,
+                BuildTarget.StandaloneOSXIntel64 => BuildTargetGroup.Standalone,
+                BuildTarget.LinuxHeadlessSimulation => BuildTargetGroup.LinuxHeadlessSimulation,
+                BuildTarget.StandaloneOSXIntel => BuildTargetGroup.Standalone,
+                BuildTarget.StandaloneLinux => BuildTargetGroup.Standalone,
+                BuildTarget.BlackBerry => BuildTargetGroup.BlackBerry,
+                BuildTarget.SamsungTV => BuildTargetGroup.SamsungTV,
+                BuildTarget.XBOX360 => BuildTargetGroup.XBOX360,
+                BuildTarget.WP8Player => BuildTargetGroup.WP8,
+                BuildTarget.Stadia => BuildTargetGroup.Stadia,
+                BuildTarget.Lumin => BuildTargetGroup.Lumin,
+                BuildTarget.Tizen => BuildTargetGroup.Tizen,
+                BuildTarget.PSP2 => BuildTargetGroup.PSP2,
+                BuildTarget.N3DS => BuildTargetGroup.N3DS,
+                BuildTarget.WiiU => BuildTargetGroup.WiiU,
+                BuildTarget.PSM => BuildTargetGroup.PSM,
+                BuildTarget.PS3 => BuildTargetGroup.PS3,
+
+                // Deprecated
+                // BuildTarget.StandaloneOSXUniversal => BuildTargetGroup.Standalone,
+                // BuildTarget.WebPlayerStreamed => BuildTargetGroup.WebPlayer,
+                // BuildTarget.WebPlayer => BuildTargetGroup.WebPlayer,
+                // BuildTarget.iPhone => BuildTargetGroup.iOS,
+
+                BuildTarget.NoTarget => BuildTargetGroup.Unknown,
+                _ => BuildTargetGroup.Unknown
+            };
+        }
+    }
+}

src/Tool - builds manager/Assets/Plugins/BuildsManager/Editor/Utility/ConvertToStrings.cs

@@ -19,7 +19,7 @@ public static string GetPathWithVars(DateTime usedDate, BuildData data, string s
             s = s.Replace("$MONTH", $"{usedDate.Date.Month}");
             s = s.Replace("$DAY", $"{usedDate.Date.Day}");
             s = s.Replace("$TIME", $"{usedDate.Hour}_{usedDate.Minute}");
-            s = s.Replace("$ADDONS", $"{data.addonsUsed.Aggregate("", (current, addonUsed) => current + addonUsed.name + " ")}");
+            s = s.Replace("$ADDONS", $"{data.addonsUsed?.Aggregate("", (current, addonUsed) => current + addonUsed.name + " ")}");
             s = s.Replace("$EXECUTABLE", GetBuildTargetExecutable(data.target));
             return s;
         }
@@ -36,7 +36,7 @@ public static string GetPathWithVarsForZip(DateTime usedDate, BuildData data, st
             s = s.Replace("$MONTH", $"{usedDate.Date.Month}");
             s = s.Replace("$DAY", $"{usedDate.Date.Day}");
             s = s.Replace("$TIME", $"{usedDate.Hour}_{usedDate.Minute}");
-            s = s.Replace("$ADDONS", $"{data.addonsUsed.Aggregate("", (current, addonUsed) => current + addonUsed.name + " ")}");
+            s = s.Replace("$ADDONS", $"{data.addonsUsed?.Aggregate("", (current, addonUsed) => current + addonUsed.name + " ")}");
             s = s.Contains("$EXECUTABLE")
                 ? s.Replace("$EXECUTABLE", GetBuildTargetExecutable(data.target))
                 : s + ".zip";

src/Tool - builds manager/Assets/Plugins/BuildsManager/Editor/Window/BuildManagerWindow.cs

@@ -133,10 +133,8 @@ private static void DrawBuildDataList()
 
                     settingsBuild.isEnabled = EditorGUILayout.Toggle("Enabled", settingsBuild.isEnabled);
                     settingsBuild.isCompress = EditorGUILayout.Toggle("Compress", settingsBuild.isCompress);
-                    settingsBuild.buildPath = EditorGUILayout.TextField("Build Path", settingsBuild.buildPath);
-                    settingsBuild.options = (BuildOptions)EditorGUILayout.EnumFlagsField("Build Options", settingsBuild.options);
                     settingsBuild.target = (BuildTarget)EditorGUILayout.EnumPopup("Build Target", settingsBuild.target);
-                    settingsBuild.targetGroup = (BuildTargetGroup)EditorGUILayout.EnumPopup("Target Group", settingsBuild.targetGroup);
+                    settingsBuild.options = (BuildOptions)EditorGUILayout.EnumFlagsField("Build Options", settingsBuild.options);
                     DrawAddonsUsed(ref settingsBuild);
 
                     if (GUILayout.Button("Remove", GUILayout.Width(80)))

src/Tool - builds manager/Assets/Plugins/BuildsManager/Settings/GeneralBuildData.asset

@@ -16,7 +16,7 @@ MonoBehaviour:
   builds:
   - isEnabled: 1
     isCompress: 0
-    buildPath: 
+    buildPath: Builds/Tool_-_builds_manager_0.1_Windows64/Tool_-_builds_manager_0.1/Tool_-_builds_manager.exe
     addonsUsed:
     - isUsed: 0
       name: YandexGame
@@ -31,8 +31,19 @@ MonoBehaviour:
       - 2
       - 3
     options: 0
-    target: -2
-    targetGroup: 0
+    target: 19
+  - isEnabled: 1
+    isCompress: 0
+    buildPath: Builds/Tool_-_builds_manager_0.1_Android/Tool_-_builds_manager_0.1/Tool_-_builds_manager.apk
+    addonsUsed: []
+    options: 0
+    target: 13
+  - isEnabled: 1
+    isCompress: 0
+    buildPath: Builds/Tool_-_builds_manager_0.1_Windows32/Tool_-_builds_manager_0.1/Tool_-_builds_manager.exe
+    addonsUsed: []
+    options: 0
+    target: 5
   addonsUsedData: {fileID: 11400000, guid: 9b668bd4d2fee31499434e75a22ea616, type: 2}
   generalScriptingDefineSymbols: 
   outputRoot: Builds/

src/Tool - builds manager/ProjectSettings/EditorBuildSettings.asset

@@ -4,5 +4,9 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Project Files/Scenes/SampleScene.unity
+    guid: 9fc0d4010bbf28b4594072e72b8655ab
   m_configObjects: {}
+  m_UseUCBPForAssetBundles: 0

src/Tool - builds manager/ProjectSettings/ProjectSettings.asset

@@ -257,7 +257,7 @@ PlayerSettings:
   useCustomGradlePropertiesTemplate: 0
   useCustomGradleSettingsTemplate: 0
   useCustomProguardFile: 0
-  AndroidTargetArchitectures: 2
+  AndroidTargetArchitectures: 3
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
@@ -841,12 +841,17 @@ PlayerSettings:
   webGLWebAssemblyTable: 0
   webGLWebAssemblyBigInt: 0
   webGLCloseOnQuit: 0
-  scriptingDefineSymbols: {}
+  scriptingDefineSymbols:
+    Android: 
+    Standalone: 
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend:
-    Android: 1
-  il2cppCompilerConfiguration: {}
+    Android: 0
+    Standalone: 0
+  il2cppCompilerConfiguration:
+    Android: 0
+    Standalone: 0
   il2cppCodeGeneration: {}
   il2cppStacktraceInformation: {}
   managedStrippingLevel: