Fix build of projects that import code from Core.Design

Especially those targeting .NET Framework

Author: Kryptos-FR

sources/assets/Stride.Core.Assets.Tests/Stride.Core.Assets.Tests.csproj

@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>latest</LangVersion>
     <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
     <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
   </PropertyGroup>

sources/core/Stride.Core.CompilerServices.Tests/Stride.Core.CompilerServices.Tests.csproj

@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\..\targets\Stride.UnitTests.props" />
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(StrideXplatEditorTargetFramework)</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
     <StrideAssemblyProcessorOptions>--auto-module-initializer</StrideAssemblyProcessorOptions>

sources/core/Stride.Core.Design.Tests/Stride.Core.Design.Tests.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <StrideAssemblyProcessor>true</StrideAssemblyProcessor>
     <StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
-    <TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
+    <TargetFramework>$(StrideXplatEditorTargetFramework)</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>

sources/core/Stride.Core.Design/Collections/HybridDictionary.cs

@@ -44,7 +44,11 @@ public HybridDictionary(IDictionary<TKey, TValue> dictionary) : this(dictionary,
 
     public HybridDictionary(int capacity, IEqualityComparer<TKey>? comparer)
     {
+#if NET8_0_OR_GREATER
         ArgumentOutOfRangeException.ThrowIfNegative(capacity);
+#else
+        if (capacity <= 0) throw new ArgumentOutOfRangeException(nameof(capacity))
+#endif
         keyComparer = comparer ?? EqualityComparer<TKey>.Default;
         if (capacity >= ConstructorCutoverPoint)
         {
@@ -189,7 +193,11 @@ public void Clear()
     public bool Contains(KeyValuePair<TKey, TValue> item)
     {
         CheckInvariant();
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(item.Key);
+#else
+        if (item.Key is null) throw new ArgumentNullException(nameof(item.Key));
+#endif
         if (list != null)
         {
             foreach (var kvp in list)
@@ -218,7 +226,11 @@ public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
     public bool ContainsKey(TKey key)
     {
         CheckInvariant();
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(key);
+#else
+        if (key is null) throw new ArgumentNullException(nameof(key));
+#endif
         if (list != null)
         {
             foreach (var kvp in list)
@@ -234,7 +246,11 @@ public bool ContainsKey(TKey key)
     public bool TryGetValue(TKey key, [MaybeNullWhen(false)] out TValue value)
     {
         CheckInvariant();
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(key);
+#else
+        if (key is null) throw new ArgumentNullException(nameof(key));
+#endif
         if (list != null)
         {
             foreach (var kvp in list)

sources/core/Stride.Core.Design/Extensions/AnonymousEqualityComparer.cs

@@ -19,8 +19,13 @@ public class AnonymousEqualityComparer<T> : IEqualityComparer<T>
     /// <param name="getHashCode">The function to use to compute hash codes for the objects to compare.</param>
     public AnonymousEqualityComparer(Func<T?, T?, bool> equals, Func<T, int> getHashCode)
     {
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(equals);
         ArgumentNullException.ThrowIfNull(getHashCode);
+#else
+        if (equals is null) throw new ArgumentNullException(nameof(equals));
+        if (getHashCode is null) throw new ArgumentNullException(nameof(getHashCode));
+#endif
         this.equals = equals;
         this.getHashCode = getHashCode;
     }

sources/core/Stride.Core.Design/Extensions/DesignExtensions.cs

@@ -19,7 +19,11 @@ public static class DesignExtensions
     [Pure]
     public static bool IsReadOnly([NoEnumeration] this IEnumerable source)
     {
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(source);
+#else
+        if (source is null) throw new ArgumentNullException(nameof(source));
+#endif
 
         if (source is ICollection<object> collection)
             return collection.IsReadOnly;
@@ -59,8 +63,13 @@ public static IEnumerable<T> Enumerate<T>(this IEnumerator enumerator)
     [Pure]
     public static IEnumerable<Tuple<T1, T2>> Zip<T1, T2>(this IEnumerable<T1> enumerable1, IEnumerable<T2> enumerable2)
     {
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(enumerable1);
         ArgumentNullException.ThrowIfNull(enumerable2);
+#else
+        if (enumerable1 is null) throw new ArgumentNullException(nameof(enumerable1));
+        if (enumerable2 is null) throw new ArgumentNullException(nameof(enumerable2));
+#endif
 
         return Impl();
 
@@ -94,7 +103,11 @@ IEnumerable<Tuple<T1, T2>> Impl()
     [Pure]
     public static IEnumerable<T> SelectDeep<T>(this IEnumerable<T> source, Func<T, IEnumerable<T>> childrenSelector)
     {
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(childrenSelector);
+#else
+        if (childrenSelector is null) throw new ArgumentNullException(nameof(childrenSelector));
+#endif
 
         return Impl();
 
@@ -127,7 +140,11 @@ IEnumerable<T> Impl()
     [Pure]
     public static IEnumerable<T> BreadthFirst<T>(this IEnumerable<T> source, Func<T, IEnumerable<T>> childrenSelector)
     {
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(childrenSelector);
+#else
+        if (childrenSelector is null) throw new ArgumentNullException(nameof(childrenSelector));
+#endif
 
         return Impl();
 
@@ -161,8 +178,13 @@ IEnumerable<T> Impl()
     [Pure]
     public static IEnumerable<T> DepthFirst<T>(this IEnumerable<T> source, Func<T, IEnumerable<T>> childrenSelector)
     {
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(source);
         ArgumentNullException.ThrowIfNull(childrenSelector);
+#else
+        if (source is null) throw new ArgumentNullException(nameof(source));
+        if (childrenSelector is null) throw new ArgumentNullException(nameof(childrenSelector));
+#endif
 
         return Impl();
 
@@ -297,7 +319,11 @@ public static TValue GetOrCreateValue<TKey, TValue>(this IDictionary<TKey, TValu
     /// <returns>The value attached to key, if key already exists in the dictionary; otherwise, the new value returned by the <paramref name="createValueFunc"/>.</returns>
     public static TValue GetOrCreateValue<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<TKey, TValue> createValueFunc)
     {
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(dictionary);
+#else
+        if (dictionary is null) throw new ArgumentNullException(nameof(dictionary));
+#endif
         if (!dictionary.TryGetValue(key, out var value))
         {
             value = createValueFunc.Invoke(key);

sources/core/Stride.Core.Design/Extensions/ObjectExtensions.cs

@@ -70,7 +70,11 @@ public static string ToStringSafe([CanBeNull] this object obj)
     [NotNull]
     public static T SafeArgument<T>(this T obj, [CallerArgumentExpression(nameof(obj))] string argumentName = "") where T : class
     {
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(argumentName);
+#else
+        if (argumentName is null) throw new ArgumentNullException(nameof(argumentName));
+#endif
         if (obj == null) throw new ArgumentNullException(argumentName);
         return obj;
     }

sources/core/Stride.Core.Design/Extensions/TaskExtensions.cs

@@ -10,6 +10,10 @@ public static class TaskExtensions
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void Forget(this Task task)
     {
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(task);
+#else
+        if (task is null) throw new ArgumentNullException(nameof(task));
+#endif
     }
 }

sources/core/Stride.Core.Design/IO/UDirectory.cs

@@ -84,7 +84,11 @@ public static UDirectory Combine(UDirectory leftPath, UDirectory rightPath)
     /// <returns><c>true</c> if this directory contains the specified path; otherwise, <c>false</c>.</returns>
     public bool Contains(UPath path)
     {
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(path);
+#else
+        if (path is null) throw new ArgumentNullException(nameof(path));
+#endif
         return path.FullPath.StartsWith(FullPath, StringComparison.OrdinalIgnoreCase) && path.FullPath.Length > FullPath.Length && path.FullPath[FullPath.Length] == DirectorySeparatorChar;
     }
 }

sources/core/Stride.Core.Design/IO/UFile.cs

@@ -128,7 +128,11 @@ public static UFile Combine(UDirectory leftPath, UFile rightPath)
     /// <returns><c>true</c> if the specified path is a valid <see cref="UFile"/>; otherwise, <c>false</c>.</returns>
     public static new bool IsValid(string path)
     {
+#if NET6_0_OR_GREATER
         ArgumentNullException.ThrowIfNull(path);
+#else
+        if (path is null) throw new ArgumentNullException(nameof(path));
+#endif
         if (!UPath.IsValid(path))
         {
             return false;