chore(DI): bump to 1.1.3

refactor(BaseEntity): Aktualisierung des Namespace der BaseEntity für Multi-Targeting
- Anpassung des Namespace und der Klammern der Klasse „User“, um sowohl .NET als auch .NET Framework zu unterstützen. - Beibehaltung bestehender Eigenschaften und Anmerkungen, einschließlich der Behandlung von Nullwerten und erforderlichen Angaben pro Ziel. - Gewährleistet die korrekte Kompilierung unter den Bedingungen „#if NET“ und „#if NETFRAMEWORK“.
2025-08-19 12:11:18 +02:00 · 2025-08-19 11:54:57 +02:00 · 2025-08-19 11:36:43 +02:00 · 2025-08-19 11:32:05 +02:00
9 changed files with 157 additions and 141 deletions
--- a/src/DigitalData.UserManager.DependencyInjection/DigitalData.UserManager.DependencyInjection.csproj
+++ b/src/DigitalData.UserManager.DependencyInjection/DigitalData.UserManager.DependencyInjection.csproj
@ -13,9 +13,9 @@
    <PackageIcon>icon.png</PackageIcon>
    <RepositoryUrl>http://git.dd:3000/AppStd/WebUserManager.git</RepositoryUrl>
    <PackageTags>digital data user maanger</PackageTags>
-    <Version>1.1.2</Version>
-    <AssemblyVersion>1.1.2</AssemblyVersion>
-    <FileVersion>1.1.2</FileVersion>
+    <Version>1.1.3</Version>
+    <AssemblyVersion>1.1.3</AssemblyVersion>
+    <FileVersion>1.1.3</FileVersion>
  </PropertyGroup>

  <ItemGroup>
--- a/src/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
@ -6,36 +6,44 @@ using System;
 #endif

 namespace DigitalData.UserManager.Domain.Entities
-{
-    public class BaseEntity
+#if NET
+    ;
+#elif NETFRAMEWORK
    {
-        [Column("GUID")]
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int Id { get; set; }
-
-        [StringLength(50)]
-        [Column("ADDED_WHO")]
-        public string
-#if NET7_0_OR_GREATER
-            ?
 #endif
-            AddedWho { get; set; }

-        [StringLength(50)]
-        [Column("CHANGED_WHO")]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+public class BaseEntity
+{
+    [Column("GUID")]
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public int Id { get; set; }
+
+    [StringLength(50)]
+    [Column("ADDED_WHO")]
+    public string
+#if NET
+        ?
 #endif
-            ChangedWho { get; set; }
+        AddedWho { get; set; }

-        //TODO: assign it to default value in create dto, not here!
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [DefaultValue("GETDATE()")]
-        public DateTime AddedWhen { get; set; } = DateTime.Now;
+    [StringLength(50)]
+    [Column("CHANGED_WHO")]
+    public string
+#if NET
+        ?
+#endif
+        ChangedWho { get; set; }

-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
+    //TODO: assign it to default value in create dto, not here!
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    [DefaultValue("GETDATE()")]
+    public DateTime AddedWhen { get; set; } = DateTime.Now;
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime? ChangedWhen { get; set; }
+}
+
+#if NETFRAMEWORK
    }
-}
+#endif
--- a/src/DigitalData.UserManager.Domain/Entities/ClientUser.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/ClientUser.cs
@ -25,7 +25,7 @@ namespace DigitalData.UserManager.Domain.Entities

        [Column("COMMENT")]
        public string
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            Comment { get; set; }
@ -33,7 +33,7 @@ namespace DigitalData.UserManager.Domain.Entities
        [StringLength(50)]
        [Column("ADDED_WHO")]
        public string
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            AddedWho { get; set; }
--- a/src/DigitalData.UserManager.Domain/Entities/Group.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/Group.cs
@ -9,7 +9,7 @@ namespace DigitalData.UserManager.Domain.Entities
    {
        [StringLength(50)]
        public string
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
        Name { get; set; }
@ -29,7 +29,7 @@ namespace DigitalData.UserManager.Domain.Entities

        [StringLength(200)]
        public string
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            Comment { get; set; }
--- a/src/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs
@ -16,21 +16,21 @@ namespace DigitalData.UserManager.Domain.Entities

        [StringLength(200)]
        public string
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            Comment { get; set; }

        [ForeignKey("UserId")]
        public virtual User
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            User { get; set; }

        [ForeignKey("GroupId")]
        public virtual Group
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            Group { get; set; }
--- a/src/DigitalData.UserManager.Domain/Entities/Module.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/Module.cs
@ -13,7 +13,7 @@ namespace DigitalData.UserManager.Domain.Entities

        [StringLength(50)]
        public string
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            Name { get; set; }
@ -21,7 +21,7 @@ namespace DigitalData.UserManager.Domain.Entities
        [StringLength(20)]
        [Column("SHORT_NAME")]
        public string
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            ShortName { get; set; }
--- a/src/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs
@ -22,7 +22,7 @@ namespace DigitalData.UserManager.Domain.Entities
        [Column("COMMENT")]
        [StringLength(200)]
        public string
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            Comment { get; set; }
@ -30,7 +30,7 @@ namespace DigitalData.UserManager.Domain.Entities
        [Column("ADDED_WHO")]
        [StringLength(50)]
        public string
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            AddedWho { get; set; } = "DEFAULT";
@ -38,21 +38,21 @@ namespace DigitalData.UserManager.Domain.Entities
        [Column("CHANGED_WHO")]
        [StringLength(50)]
        public string
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            ChangedWho { get; set; }

        [ForeignKey("UserId")]
        public virtual User
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            User { get; set; }

        [ForeignKey("ModuleId")]
        public virtual Module
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            Module { get; set; }
--- a/src/DigitalData.UserManager.Domain/Entities/User.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/User.cs
@ -6,122 +6,130 @@ using System;
 #endif

 namespace DigitalData.UserManager.Domain.Entities
-{
-    [Table("TBDD_USER", Schema = "dbo")]
-    public partial class User : BaseEntity
+#if NET
+    ;
+#elif NETFRAMEWORK
    {
-        [Column("PRENAME")]
-        [StringLength(50)]
-        public string
-#if NET7_0_OR_GREATER
-            ?
 #endif
-            Prename { get; set; }

-        [Column("NAME")]
-        [StringLength(50)]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+[Table("TBDD_USER", Schema = "dbo")]
+public partial class User : BaseEntity
+{
+    [Column("PRENAME")]
+    [StringLength(50)]
+    public string
+#if NET
+        ?
 #endif
-            Name { get; set; }
+        Prename { get; set; }

-        [Required]
-        [Column("USERNAME")]
-        [StringLength(50)]
-        public
-#if NET7_0_OR_GREATER
-            required
+    [Column("NAME")]
+    [StringLength(50)]
+    public string
+#if NET
+        ?
 #endif
-            string Username { get; set; }
+        Name { get; set; }

-        [Column("SHORTNAME")]
-        [StringLength(30)]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+    [Required]
+    [Column("USERNAME")]
+    [StringLength(50)]
+    public
+#if NET
+        required
 #endif
-            Shortname
-        { get; set; }
+        string Username { get; set; }

-        [Column("EMAIL")]
-        [StringLength(100)]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+    [Column("SHORTNAME")]
+    [StringLength(30)]
+    public string
+#if NET
+        ?
 #endif
-            Email { get; set; }
+        Shortname
+    { get; set; }

-        [Required]
-        [Column("LANGUAGE")]
-        [StringLength(5)]
-        [DefaultValue("de-DE")]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+    [Column("EMAIL")]
+    [StringLength(100)]
+    public string
+#if NET
+        ?
 #endif
-            Language { get; set; }
+        Email { get; set; }

-        [Column("COMMENT")]
-        [StringLength(500)]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+    [Required]
+    [Column("LANGUAGE")]
+    [StringLength(5)]
+    [DefaultValue("de-DE")]
+    public string
+#if NET
+        ?
 #endif
-            Comment { get; set; }
+        Language { get; set; }

-        [Column("DELETED")]
-        public bool Deleted { get; set; }
-
-        [Required]
-        [Column("DATE_FORMAT")]
-        [StringLength(10)]
-        [DefaultValue("dd.MM.yyyy")]
-        public
-#if NET7_0_OR_GREATER
-            required
+    [Column("COMMENT")]
+    [StringLength(500)]
+    public string
+#if NET
+        ?
 #endif
-            string DateFormat { get; set; }
+        Comment { get; set; }

-        [Required]
-        [Column("ACTIVE")]
-        public bool Active { get; set; }
+    [Column("DELETED")]
+    public bool Deleted { get; set; }

-        [Required]
-        [Column("GENERAL_VIEWER")]
-        [StringLength(30)]
-        [DefaultValue("NONE")]
-        public
-#if NET7_0_OR_GREATER
-            required
+    [Required]
+    [Column("DATE_FORMAT")]
+    [StringLength(10)]
+    [DefaultValue("dd.MM.yyyy")]
+    public
+#if NET
+        required
 #endif
-            string GeneralViewer { get; set; }
+        string DateFormat { get; set; }

-        [Required]
-        [Column("WAN_ENVIRONMENT")]
-        public bool WanEnvironment { get; set; }
+    [Required]
+    [Column("ACTIVE")]
+    public bool Active { get; set; }

-        [Required]
-        [Column("USERID_FK_INT_ECM")]
-        public int UserIdFkIntEcm { get; set; }
-
-        [Column("DELETED_WHEN")]
-        public DateTime
-#if NET7_0_OR_GREATER
-            ?
+    [Required]
+    [Column("GENERAL_VIEWER")]
+    [StringLength(30)]
+    [DefaultValue("NONE")]
+    public
+#if NET
+        required
 #endif
-            DeletedWhen { get; set; }
+        string GeneralViewer { get; set; }

-        [Column("DELETED_WHO")]
-        [StringLength(50)]
-        public
-#if NET7_0_OR_GREATER
-            required
+    [Required]
+    [Column("WAN_ENVIRONMENT")]
+    public bool WanEnvironment { get; set; }
+
+    [Required]
+    [Column("USERID_FK_INT_ECM")]
+    public int UserIdFkIntEcm { get; set; }
+
+    [Column("DELETED_WHEN")]
+    public DateTime
+#if NET
+        ?
 #endif
-            string
-#if NET7_0_OR_GREATER
-            ?
-# endif
-            DeletedWho { get; set; }
+        DeletedWhen { get; set; }
+
+    [Column("DELETED_WHO")]
+    [StringLength(50)]
+    public
+#if NET
+        required
+#endif
+        string
+#if NET
+        ?
+#endif
+        DeletedWho { get; set; }
+}
+
+#if NETFRAMEWORK
    }
-}
+#endif
--- a/src/DigitalData.UserManager.Domain/Entities/UserRep.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/UserRep.cs
@ -28,28 +28,28 @@ namespace DigitalData.UserManager.Domain.Entities

        [ForeignKey("UserId")]
        public virtual User
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            User { get; set; }

        [ForeignKey("RepGroupId")]
        public virtual Group
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            RepGroup { get; set; }

        [ForeignKey("GroupId")]
        public virtual Group
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            Group { get; set; }

        [ForeignKey("RepUserId")]
        public virtual User
-#if NET7_0_OR_GREATER
+#if NET
            ?
 #endif
            RepUser { get; set; }
Author	SHA1	Message	Date
TekH	7ea89aa35e	chore(DI): bump to 1.1.3	2025-08-19 12:11:18 +02:00
TekH	50f5289191	refactor(BaseEntity): Aktualisierung des Namespace der BaseEntity für Multi-Targeting - Anpassung des Namespace und der Klammern der Klasse „User“, um sowohl .NET als auch .NET Framework zu unterstützen. - Beibehaltung bestehender Eigenschaften und Anmerkungen, einschließlich der Behandlung von Nullwerten und erforderlichen Angaben pro Ziel. - Gewährleistet die korrekte Kompilierung unter den Bedingungen „#if NET“ und „#if NETFRAMEWORK“.	2025-08-19 11:54:57 +02:00
TekH	f8dcd5ba41	refactor(User): Aktualisierung des Namespace der User-Entität für Multi-Targeting - Anpassung des Namespace und der Klammern der Klasse „User“, um sowohl .NET als auch .NET Framework zu unterstützen. - Beibehaltung bestehender Eigenschaften und Anmerkungen, einschließlich der Behandlung von Nullwerten und erforderlichen Angaben pro Ziel. - Gewährleistet die korrekte Kompilierung unter den Bedingungen „#if NET“ und „#if NETFRAMEWORK“.	2025-08-19 11:36:43 +02:00
TekH	8f5015f7d7	Refactor(Domain): Aktualisieren Sie die Framework-Bedingung, um das gesamte .NET zu unterstützen, anstatt nur .NET 7 oder höher.	2025-08-19 11:32:05 +02:00