Fixed a bug where Experimental Features Enabled was not activating

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 
+- [case: PBLD-34] Fixed a bug where `Experimental Features Enabled` was not activating when using `Dedicated Server` platform. 
 - [case: PBLD-32] Fixed `New Shape` start location being incorrect after using right mouse button.
 - [case: PBLD-19] Fixed shape creation when the camera perspective is set to Top.
 

Editor/EditorCore/ScriptingSymbolManager.cs

@@ -1,17 +1,37 @@
 using System;
+#if UNITY_2021_2_OR_NEWER
+using UnityEditor.Build;
+#endif
 
 namespace UnityEditor.ProBuilder
 {
     static class ScriptingSymbolManager
     {
+#if !UNITY_2021_2_OR_NEWER
         static bool IsObsolete(BuildTargetGroup group)
         {
             var attrs = typeof(BuildTargetGroup).GetField(group.ToString()).GetCustomAttributes(typeof(ObsoleteAttribute), false);
             return attrs.Length > 0;
         }
+#endif
 
         internal static bool ContainsDefine(string define)
         {
+#if UNITY_2021_2_OR_NEWER
+            var validPlatforms = BuildPlatforms.instance.GetValidPlatforms(true);
+            foreach (BuildPlatform targetPlatform in validPlatforms)
+            {
+                if (targetPlatform.namedBuildTarget == NamedBuildTarget.Unknown)
+                    continue;
+
+                string defineSymbols = PlayerSettings.GetScriptingDefineSymbols(targetPlatform.namedBuildTarget);
+
+                if (!defineSymbols.Contains(define))
+                    return false;
+            }
+
+            return true;
+#else
             foreach (BuildTargetGroup targetGroup in System.Enum.GetValues(typeof(BuildTargetGroup)))
             {
                 if (targetGroup == BuildTargetGroup.Unknown || IsObsolete(targetGroup))
@@ -24,6 +44,7 @@ internal static bool ContainsDefine(string define)
             }
 
             return true;
+#endif
         }
 
         /// <summary>
@@ -32,6 +53,28 @@ internal static bool ContainsDefine(string define)
         /// <param name="define"></param>
         public static void AddScriptingDefine(string define)
         {
+#if UNITY_2021_2_OR_NEWER
+            var validPlatforms = BuildPlatforms.instance.GetValidPlatforms(true);
+            foreach (BuildPlatform targetPlatform in validPlatforms)
+            {
+                if (targetPlatform.namedBuildTarget == NamedBuildTarget.Unknown)
+                    continue;
+
+                string defineSymbols = PlayerSettings.GetScriptingDefineSymbols(targetPlatform.namedBuildTarget);
+
+                if (!defineSymbols.Contains(define))
+                {
+                    if (defineSymbols.Length < 1)
+                        defineSymbols = define;
+                    else if (defineSymbols.EndsWith(";"))
+                        defineSymbols = string.Format("{0}{1}", defineSymbols, define);
+                    else
+                        defineSymbols = string.Format("{0};{1}", defineSymbols, define);
+
+                    PlayerSettings.SetScriptingDefineSymbols(targetPlatform.namedBuildTarget, defineSymbols);
+                }
+            }
+#else
             foreach (BuildTargetGroup targetGroup in System.Enum.GetValues(typeof(BuildTargetGroup)))
             {
                 if (targetGroup == BuildTargetGroup.Unknown || IsObsolete(targetGroup))
@@ -51,6 +94,7 @@ public static void AddScriptingDefine(string define)
                     PlayerSettings.SetScriptingDefineSymbolsForGroup(targetGroup, defineSymbols);
                 }
             }
+#endif
         }
 
         /// <summary>
@@ -59,6 +103,24 @@ public static void AddScriptingDefine(string define)
         /// <param name="define"></param>
         public static void RemoveScriptingDefine(string define)
         {
+#if UNITY_2021_2_OR_NEWER
+            var validPlatforms = BuildPlatforms.instance.GetValidPlatforms(true);
+            foreach (BuildPlatform targetPlatform in validPlatforms)
+            {
+                if (targetPlatform.namedBuildTarget == NamedBuildTarget.Unknown)
+                    continue;
+
+                string defineSymbols = PlayerSettings.GetScriptingDefineSymbols(targetPlatform.namedBuildTarget);
+
+                if (defineSymbols.Contains(define))
+                {
+                    defineSymbols = defineSymbols.Replace(string.Format("{0};", define), "");
+                    defineSymbols = defineSymbols.Replace(define, "");
+
+                    PlayerSettings.SetScriptingDefineSymbols(targetPlatform.namedBuildTarget, defineSymbols);
+                }
+            }
+#else
             foreach (BuildTargetGroup targetGroup in System.Enum.GetValues(typeof(BuildTargetGroup)))
             {
                 if (targetGroup == BuildTargetGroup.Unknown || IsObsolete(targetGroup))
@@ -74,6 +136,7 @@ public static void RemoveScriptingDefine(string define)
                     PlayerSettings.SetScriptingDefineSymbolsForGroup(targetGroup, defineSymbols);
                 }
             }
+#endif
         }
     }
 }