Merge pull request #73 from mackysoft/fix/remove-directive-2019-3

Remove UNITY_2019_3_OR_NEWER directive
mackysoft · Oct 26, 2024 · d9bc193 · d9bc193
2 parents 9df6eae + 6d39db1
commit d9bc193
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 45 deletions.
diff --git a/Assets/Example/Example.cs b/Assets/Example/Example.cs
@@ -1,4 +1,3 @@
-#if UNITY_2019_3_OR_NEWER
 using System.Collections.Generic;
 using System;
 using UnityEditor;
@@ -126,6 +125,4 @@ public override float GetPropertyHeight (SerializedProperty property, GUIContent
 		return EditorGUIUtility.singleLineHeight;
 	}
 }
-#endif
-
 #endif
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/AdvancedTypePopup.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/AdvancedTypePopup.cs
@@ -1,5 +1,4 @@
-#if UNITY_2019_3_OR_NEWER
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using UnityEngine;
@@ -137,5 +136,4 @@ protected override void ItemSelected (AdvancedDropdownItem item) {
 		}
 
 	}
-}
-#endif
+}
diff --git a/....SerializeReferenceExtensions/Editor/MackySoft.SerializeReferenceExtensions.Editor.asmdef b/....SerializeReferenceExtensions/Editor/MackySoft.SerializeReferenceExtensions.Editor.asmdef
@@ -12,9 +12,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": [
-        "UNITY_2019_3_OR_NEWER"
-    ],
+    "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
 }
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs
@@ -1,5 +1,4 @@
-#if UNITY_2019_3_OR_NEWER
-using System;
+using System;
 using System.Reflection;
 using UnityEditor;
 using UnityEngine;
@@ -44,5 +43,4 @@ public static Type GetType (string typeName) {
 		}
 
 	}
-}
-#endif
+}
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/PropertyDrawerCache.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/PropertyDrawerCache.cs
@@ -1,5 +1,4 @@
-#if UNITY_2019_3_OR_NEWER
-using System;
+using System;
 using System.Collections.Generic;
 using UnityEditor;
 using System.Reflection;
@@ -78,5 +77,4 @@ static Type GetCustomPropertyDrawerType (Type type)
 		}
 
 	}
-}
-#endif
+}
diff --git a/...s/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SerializedPropertyExtensions.cs b/...s/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SerializedPropertyExtensions.cs
@@ -1,5 +1,4 @@
-#if UNITY_2019_3_OR_NEWER
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEditor;
 
 namespace MackySoft.SerializeReferenceExtensions.Editor
@@ -27,5 +26,4 @@ public static IEnumerable<SerializedProperty> GetChildProperties (this Serialize
 			}
 		}
 	}
-}
-#endif
+}
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs
@@ -1,5 +1,4 @@
-#if UNITY_2019_3_OR_NEWER
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using UnityEngine;
@@ -199,4 +198,3 @@ public override float GetPropertyHeight (SerializedProperty property,GUIContent
 
 	}
 }
-#endif
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/TypeMenuUtility.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/TypeMenuUtility.cs
@@ -1,5 +1,4 @@
-#if UNITY_2019_3_OR_NEWER
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using UnityEditor;
@@ -55,5 +54,4 @@ public static IEnumerable<Type> OrderByType (this IEnumerable<Type> source) {
 		}
 
 	}
-}
-#endif
+}
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Runtime/AddTypeMenuAttribute.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Runtime/AddTypeMenuAttribute.cs
@@ -1,6 +1,4 @@
-#if UNITY_2019_3_OR_NEWER
-
-using System;
+using System;
 
 /// <summary>
 /// An attribute that overrides the name of the type displayed in the SubclassSelector popup.
@@ -34,5 +32,4 @@ public string GetTypeNameWithoutPath () {
 		return (splittedDisplayName.Length != 0) ? splittedDisplayName[splittedDisplayName.Length - 1] : null;
 	}
 
-}
-#endif
+}
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Runtime/HideInTypeMenuAttribute.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Runtime/HideInTypeMenuAttribute.cs
@@ -1,11 +1,9 @@
-#if UNITY_2019_3_OR_NEWER
-using System;
+using System;
 
 /// <summary>
 /// An attribute that hides the type in the SubclassSelector.
 /// </summary>
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Interface, AllowMultiple = false, Inherited = false)]
 public sealed class HideInTypeMenuAttribute : Attribute {
 
-}
-#endif
+}
diff --git a/...kySoft.SerializeReferenceExtensions/Runtime/MackySoft.SerializeReferenceExtensions.asmdef b/...kySoft.SerializeReferenceExtensions/Runtime/MackySoft.SerializeReferenceExtensions.asmdef
@@ -8,9 +8,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": [
-        "UNITY_2019_3_OR_NEWER"
-    ],
+    "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
 }
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Runtime/SubclassSelectorAttribute.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Runtime/SubclassSelectorAttribute.cs
@@ -1,5 +1,4 @@
-#if UNITY_2019_3_OR_NEWER
-using System;
+using System;
 using UnityEngine;
 
 /// <summary>
@@ -8,5 +7,4 @@
 [AttributeUsage(AttributeTargets.Field,AllowMultiple = false)]
 public sealed class SubclassSelectorAttribute : PropertyAttribute {
 
-}
-#endif
+}