gradually getting rid of .NET Framework 4.5 and other legacy code

Author: salaros

src/CodeCave.Threejs.Entities.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;netstandard2.0;net45</TargetFrameworks>
+    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
     <OutputType>library</OutputType>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <!-- Multiple targets can cause obj folder locking by concurrent builds -->
@@ -12,11 +12,11 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <IncludeSymbols>true</IncludeSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>0.9.1</Version>
-    <FileVersion>0.9.1</FileVersion>
-    <AssemblyVersion>0.9.1</AssemblyVersion>
+    <Version>0.10.0</Version>
+    <FileVersion>0.10.0</FileVersion>
+    <AssemblyVersion>0.10.0</AssemblyVersion>
     <RepositoryType>git</RepositoryType>
     <PackageProjectUrl>https://github.com/CodeCavePro/threejs-entities.git</PackageProjectUrl>
     <RepositoryUrl>https://github.com/CodeCavePro/threejs-entities.git</RepositoryUrl>
@@ -26,7 +26,7 @@
   <ItemGroup>
     <PackageReference Include="JsonSubTypes" Version="2.0.*" />
     <PackageReference Include="Newtonsoft.Json" Version="[13.*, 13.1)" />
-    <PackageReference Include="System.Text.Json" Version="8.0.*" Condition="'$(TargetFramework)' != 'net45'" />
+    <PackageReference Include="System.Text.Json" Version="8.0.*" />
   </ItemGroup>
 
 </Project>

src/Extensions/Object3DExtensions.cs

@@ -1,103 +1,102 @@
 using System;
 using System.Linq;
 
-namespace CodeCave.Threejs.Entities
+namespace CodeCave.Threejs.Entities;
+
+public static class Object3DExtensions
 {
-    public static class Object3DExtensions
+    /// <summary>Merges the specified other scene.</summary>
+    /// <param name="objectScene">The object scene.</param>
+    /// <param name="otherScene">The other scene.</param>
+    /// <param name="newPosition">The new position of merged objects after merge.</param>
+    /// <returns>Returns the modified <see cref="ObjectScene"/> with other scene merged into it. </returns>
+    /// <exception cref="ArgumentNullException">objectScene
+    /// or
+    /// otherScene.</exception>
+    public static ObjectScene Merge(this ObjectScene objectScene, ObjectScene otherScene, Vector3 newPosition = null)
     {
-        /// <summary>Merges the specified other scene.</summary>
-        /// <param name="objectScene">The object scene.</param>
-        /// <param name="otherScene">The other scene.</param>
-        /// <param name="newPosition">The new position of merged objects after merge.</param>
-        /// <returns>Returns the modified <see cref="ObjectScene"/> with other scene merged into it. </returns>
-        /// <exception cref="ArgumentNullException">objectScene
-        /// or
-        /// otherScene.</exception>
-        public static ObjectScene Merge(this ObjectScene objectScene, ObjectScene otherScene, Vector3 newPosition = null)
-        {
-            if (objectScene is null)
-                throw new ArgumentNullException(nameof(objectScene));
+        if (objectScene is null)
+            throw new ArgumentNullException(nameof(objectScene));
 
-            if (otherScene is null)
-                throw new ArgumentNullException(nameof(otherScene));
+        if (otherScene is null)
+            throw new ArgumentNullException(nameof(otherScene));
 
-            foreach (var geometry in otherScene.Geometries)
-                objectScene.AddGeometry(geometry);
+        foreach (var geometry in otherScene.Geometries)
+            objectScene.AddGeometry(geometry);
 
-            foreach (var material in otherScene.Materials)
-                objectScene.AddMaterial(material);
+        foreach (var material in otherScene.Materials)
+            objectScene.AddMaterial(material);
 
-            if (otherScene.Object.Children.Any())
-            {
-                foreach (var child in otherScene.Object.Children)
-                {
-                    if (newPosition != null)
-                        child.Position = newPosition;
-                    objectScene.Object.AddChild(child);
-                }
-            }
-            else
+        if (otherScene.Object.Children.Any())
+        {
+            foreach (var child in otherScene.Object.Children)
             {
                 if (newPosition != null)
-                    otherScene.Object.Position = newPosition;
-                objectScene.Object.AddChild(otherScene.Object);
+                    child.Position = newPosition;
+                objectScene.Object.AddChild(child);
             }
-
-            return objectScene;
         }
-
-        /// <summary>Adds a simple cube (of the given dimensions and color) to the scene.</summary>
-        /// <param name="objectScene">The object scene.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        /// <param name="depth">The depth.</param>
-        /// <param name="position">The position.</param>
-        /// <param name="color">The color.</param>
-        /// <returns>Returns the original <see cref="ObjectScene"/> with cube added into it.</returns>
-        /// <exception cref="ArgumentNullException">objectScene.</exception>
-        public static ObjectScene AddCube(this ObjectScene objectScene, double width, double height, double depth, Vector3 position = default, int color = 11674146)
+        else
         {
-            if (objectScene is null)
-                throw new ArgumentNullException(nameof(objectScene));
+            if (newPosition != null)
+                otherScene.Object.Position = newPosition;
+            objectScene.Object.AddChild(otherScene.Object);
+        }
 
-            var geometry = new BoxGeometry(Guid.NewGuid().ToString(), width, height, depth);
-            objectScene.AddGeometry(geometry);
+        return objectScene;
+    }
 
-            var material = new MeshStandardMaterial(Guid.NewGuid().ToString())
-            {
-                Color = color,
-            };
-            objectScene.AddMaterial(material);
+    /// <summary>Adds a simple cube (of the given dimensions and color) to the scene.</summary>
+    /// <param name="objectScene">The object scene.</param>
+    /// <param name="width">The width.</param>
+    /// <param name="height">The height.</param>
+    /// <param name="depth">The depth.</param>
+    /// <param name="position">The position.</param>
+    /// <param name="color">The color.</param>
+    /// <returns>Returns the original <see cref="ObjectScene"/> with cube added into it.</returns>
+    /// <exception cref="ArgumentNullException">objectScene.</exception>
+    public static ObjectScene AddCube(this ObjectScene objectScene, double width, double height, double depth, Vector3 position = default, int color = 11674146)
+    {
+        if (objectScene is null)
+            throw new ArgumentNullException(nameof(objectScene));
 
-            var cubeObject = new Object3D("Mesh", Guid.NewGuid().ToString(), id: null)
-            {
-                CastShadow = true,
-                ReceiveShadow = true,
-                GeometryUuid = geometry.Uuid,
-                MaterialUuid = material.Uuid,
-                Position = position,
-            };
-            objectScene.Object.AddChild(cubeObject);
+        var geometry = new BoxGeometry(Guid.NewGuid().ToString(), width, height, depth);
+        objectScene.AddGeometry(geometry);
 
-            return objectScene;
-        }
+        var material = new MeshStandardMaterial(Guid.NewGuid().ToString())
+        {
+            Color = color,
+        };
+        objectScene.AddMaterial(material);
 
-        internal static System.Collections.Generic.IEnumerable<Object3D> Flatten(this System.Collections.Generic.IEnumerable<Object3D> collection)
+        var cubeObject = new Object3D("Mesh", Guid.NewGuid().ToString(), id: null)
         {
-            foreach (var obj in collection)
-            {
-                if ((obj?.Children?.Count ?? 0) == 0)
-                    yield return obj;
+            CastShadow = true,
+            ReceiveShadow = true,
+            GeometryUuid = geometry.Uuid,
+            MaterialUuid = material.Uuid,
+            Position = position,
+        };
+        objectScene.Object.AddChild(cubeObject);
 
-                var children = obj?.Children?.Flatten() ??
+        return objectScene;
+    }
+
+    internal static System.Collections.Generic.IEnumerable<Object3D> Flatten(this System.Collections.Generic.IEnumerable<Object3D> collection)
+    {
+        foreach (var obj in collection)
+        {
+            if ((obj?.Children?.Count ?? 0) == 0)
+                yield return obj;
+
+            var children = obj?.Children?.Flatten() ??
 #if !NETFRAMEWORK
-                    Array.Empty<Object3D>();
+                Array.Empty<Object3D>();
 #else
-                    new Object3D[0];
+                new Object3D[0];
 #endif
-                foreach (var c in children)
-                    yield return c;
-            }
+            foreach (var c in children)
+                yield return c;
         }
     }
 }

src/Geometries/BoxGeometry.cs

@@ -4,74 +4,73 @@
 using System.Text.Json.Serialization;
 using Newtonsoft.Json;
 
-namespace CodeCave.Threejs.Entities
+namespace CodeCave.Threejs.Entities;
+
+[Serializable]
+public sealed class BoxGeometry : Geometry, IEquatable<BoxGeometry>
 {
-    [Serializable]
-    public sealed class BoxGeometry : Geometry, IEquatable<BoxGeometry>
+    /// <summary>Initializes a new instance of the <see cref="BoxGeometry"/> class.</summary>
+    /// <param name="uuid">The UUID of this object instance.</param>
+    public BoxGeometry(string uuid, double width = 1D, double height = 1D, double depth = 1D)
+        : base(uuid)
     {
-        /// <summary>Initializes a new instance of the <see cref="BoxGeometry"/> class.</summary>
-        /// <param name="uuid">The UUID of this object instance.</param>
-        public BoxGeometry(string uuid, double width = 1D, double height = 1D, double depth = 1D)
-            : base(uuid)
-        {
-            Width = width;
-            Height = height;
-            Depth = depth;
-        }
+        Width = width;
+        Height = height;
+        Depth = depth;
+    }
 
-        [Newtonsoft.Json.JsonConstructor]
-        [System.Text.Json.Serialization.JsonConstructor]
-        private BoxGeometry()
-            : base(Guid.NewGuid().ToString())
-        {
-        }
+    [Newtonsoft.Json.JsonConstructor]
+    [System.Text.Json.Serialization.JsonConstructor]
+    private BoxGeometry()
+        : base(Guid.NewGuid().ToString())
+    {
+    }
 
-        /// <summary>Gets the type of this object, it always equals 'BoxGeometry'.</summary>
-        /// <value>The 'BoxGeometry' type.</value>
-        [DataMember(Name = "type")]
-        [JsonProperty("type")]
-        [JsonPropertyName("type")]
+    /// <summary>Gets the type of this object, it always equals 'BoxGeometry'.</summary>
+    /// <value>The 'BoxGeometry' type.</value>
+    [DataMember(Name = "type")]
+    [JsonProperty("type")]
+    [JsonPropertyName("type")]
 
-        public override string Type => nameof(BoxGeometry);
+    public override string Type => nameof(BoxGeometry);
 
-        /// <summary>
-        /// Gets or sets width — Width; that is, the length of the edges parallel to the X axis. Optional; defaults to 1.
-        /// </summary>
-        /// <value>The width.</value>
-        [DataMember(Name = "width")]
-        [JsonProperty("width")]
-        [JsonPropertyName("width")]
-        public double Width { get; set; }
+    /// <summary>
+    /// Gets or sets width — Width; that is, the length of the edges parallel to the X axis. Optional; defaults to 1.
+    /// </summary>
+    /// <value>The width.</value>
+    [DataMember(Name = "width")]
+    [JsonProperty("width")]
+    [JsonPropertyName("width")]
+    public double Width { get; set; }
 
-        /// <summary>
-        /// Gets or sets height — Height; that is, the length of the edges parallel to the Y axis.Optional; defaults to 1.
-        /// </summary>
-        /// <value>The height.</value>
-        [DataMember(Name = "height")]
-        [JsonProperty("height")]
-        [JsonPropertyName("height")]
-        public double Height { get; set; }
+    /// <summary>
+    /// Gets or sets height — Height; that is, the length of the edges parallel to the Y axis.Optional; defaults to 1.
+    /// </summary>
+    /// <value>The height.</value>
+    [DataMember(Name = "height")]
+    [JsonProperty("height")]
+    [JsonPropertyName("height")]
+    public double Height { get; set; }
 
-        /// <summary>
-        /// Gets or sets depth — Depth; that is, the length of the edges parallel to the Z axis.Optional; defaults to 1.
-        /// </summary>
-        /// <value>The depth.</value>
-        [DataMember(Name = "depth")]
-        [JsonProperty("depth")]
-        [JsonPropertyName("depth")]
-        public double Depth { get; set; }
+    /// <summary>
+    /// Gets or sets depth — Depth; that is, the length of the edges parallel to the Z axis.Optional; defaults to 1.
+    /// </summary>
+    /// <value>The depth.</value>
+    [DataMember(Name = "depth")]
+    [JsonProperty("depth")]
+    [JsonPropertyName("depth")]
+    public double Depth { get; set; }
 
-        [System.Text.Json.Serialization.JsonIgnore]
-        [Newtonsoft.Json.JsonIgnore]
-        public override GeometryData Data => null;
+    [System.Text.Json.Serialization.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
+    public override GeometryData Data => null;
 
-        public override bool Equals(object obj) => obj is BoxGeometry geometry && Equals(geometry);
+    public override bool Equals(object obj) => obj is BoxGeometry geometry && Equals(geometry);
 
-        public bool Equals(BoxGeometry other) => Uuid.Equals(other?.Uuid, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(BoxGeometry other) => Uuid.Equals(other?.Uuid, StringComparison.OrdinalIgnoreCase);
 
-        public override int GetHashCode()
-        {
-            return 2083305506 + EqualityComparer<string>.Default.GetHashCode(Uuid);
-        }
+    public override int GetHashCode()
+    {
+        return 2083305506 + EqualityComparer<string>.Default.GetHashCode(Uuid);
     }
 }

src/Geometries/BufferGeometry.cs

@@ -1,22 +1,21 @@
 using System;
 
-namespace CodeCave.Threejs.Entities
+namespace CodeCave.Threejs.Entities;
+
+/// <summary>
+/// An efficient representation of mesh, line, or point geometry.
+/// Includes vertex positions, face indexes, normals, colors, UVs,
+/// and custom attributes within buffers, reducing the cost of passing all this data to the GPU.
+/// To read and edit data in BufferGeometry attributes, see BufferAttribute documentation.
+///
+/// For a less efficient but easier-to-use representation of geometry, see <see cref="Geometry"/>.
+/// </summary>
+[Serializable]
+public class BufferGeometry
 {
-    /// <summary>
-    /// An efficient representation of mesh, line, or point geometry.
-    /// Includes vertex positions, face indexes, normals, colors, UVs,
-    /// and custom attributes within buffers, reducing the cost of passing all this data to the GPU.
-    /// To read and edit data in BufferGeometry attributes, see BufferAttribute documentation.
-    ///
-    /// For a less efficient but easier-to-use representation of geometry, see <see cref="Geometry"/>.
-    /// </summary>
-    [Serializable]
-    public class BufferGeometry
+    public BufferGeometry()
     {
-        public BufferGeometry()
-        {
-            // TODO implement buffer geometry class and use it instead of Geometry
-            throw new NotImplementedException("implement buffer geometry class and use it instead of Geometry");
-        }
+        // TODO implement buffer geometry class and use it instead of Geometry
+        throw new NotImplementedException("implement buffer geometry class and use it instead of Geometry");
     }
 }