chore(DI): bump to 1.1.3

- 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“.

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>
+    <Version>1.1.3</Version>
-    <AssemblyVersion>1.1.2</AssemblyVersion>
+    <AssemblyVersion>1.1.3</AssemblyVersion>
-    <FileVersion>1.1.2</FileVersion>
+    <FileVersion>1.1.3</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/DigitalData.UserManager.Domain/Entities/BaseEntity.cs

@@ -6,36 +6,44 @@ using System;
 #endif
 
 namespace DigitalData.UserManager.Domain.Entities
-{
+#if NET
-    public class BaseEntity
+    ;
+#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)]
+public class BaseEntity
-        [Column("CHANGED_WHO")]
+{
-        public string
+    [Column("GUID")]
-#if NET7_0_OR_GREATER
+    [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!
+    [StringLength(50)]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
+    [Column("CHANGED_WHO")]
-        [DefaultValue("GETDATE()")]
+    public string
-        public DateTime AddedWhen { get; set; } = DateTime.Now;
+#if NET
+        ?
+#endif
+        ChangedWho { get; set; }
 
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
+    //TODO: assign it to default value in create dto, not here!
-        public DateTime? ChangedWhen { get; set; }
+    [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

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; }

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; }

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; }

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; }

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; }

src/DigitalData.UserManager.Domain/Entities/User.cs

@@ -6,122 +6,130 @@ using System;
 #endif
 
 namespace DigitalData.UserManager.Domain.Entities
-{
+#if NET
-    [Table("TBDD_USER", Schema = "dbo")]
+    ;
-    public partial class User : BaseEntity
+#elif NETFRAMEWORK
     {
-        [Column("PRENAME")]
-        [StringLength(50)]
-        public string
-#if NET7_0_OR_GREATER
-            ?
 #endif
-            Prename { get; set; }
 
-        [Column("NAME")]
+[Table("TBDD_USER", Schema = "dbo")]
-        [StringLength(50)]
+public partial class User : BaseEntity
-        public string
+{
-#if NET7_0_OR_GREATER
+    [Column("PRENAME")]
-            ?
+    [StringLength(50)]
+    public string
+#if NET
+        ?
 #endif
-            Name { get; set; }
+        Prename { get; set; }
 
-        [Required]
+    [Column("NAME")]
-        [Column("USERNAME")]
+    [StringLength(50)]
-        [StringLength(50)]
+    public string
-        public
+#if NET
-#if NET7_0_OR_GREATER
+        ?
-            required
 #endif
-            string Username { get; set; }
+        Name { get; set; }
 
-        [Column("SHORTNAME")]
+    [Required]
-        [StringLength(30)]
+    [Column("USERNAME")]
-        public string
+    [StringLength(50)]
-#if NET7_0_OR_GREATER
+    public
-            ?
+#if NET
+        required
 #endif
-            Shortname
+        string Username { get; set; }
-        { get; set; }
 
-        [Column("EMAIL")]
+    [Column("SHORTNAME")]
-        [StringLength(100)]
+    [StringLength(30)]
-        public string
+    public string
-#if NET7_0_OR_GREATER
+#if NET
-            ?
+        ?
 #endif
-            Email { get; set; }
+        Shortname
+    { get; set; }
 
-        [Required]
+    [Column("EMAIL")]
-        [Column("LANGUAGE")]
+    [StringLength(100)]
-        [StringLength(5)]
+    public string
-        [DefaultValue("de-DE")]
+#if NET
-        public string
+        ?
-#if NET7_0_OR_GREATER
-            ?
 #endif
-            Language { get; set; }
+        Email { get; set; }
 
-        [Column("COMMENT")]
+    [Required]
-        [StringLength(500)]
+    [Column("LANGUAGE")]
-        public string
+    [StringLength(5)]
-#if NET7_0_OR_GREATER
+    [DefaultValue("de-DE")]
-            ?
+    public string
+#if NET
+        ?
 #endif
-            Comment { get; set; }
+        Language { get; set; }
 
-        [Column("DELETED")]
+    [Column("COMMENT")]
-        public bool Deleted { get; set; }
+    [StringLength(500)]
-
+    public string
-        [Required]
+#if NET
-        [Column("DATE_FORMAT")]
+        ?
-        [StringLength(10)]
-        [DefaultValue("dd.MM.yyyy")]
-        public
-#if NET7_0_OR_GREATER
-            required
 #endif
-            string DateFormat { get; set; }
+        Comment { get; set; }
 
-        [Required]
+    [Column("DELETED")]
-        [Column("ACTIVE")]
+    public bool Deleted { get; set; }
-        public bool Active { get; set; }
 
-        [Required]
+    [Required]
-        [Column("GENERAL_VIEWER")]
+    [Column("DATE_FORMAT")]
-        [StringLength(30)]
+    [StringLength(10)]
-        [DefaultValue("NONE")]
+    [DefaultValue("dd.MM.yyyy")]
-        public
+    public
-#if NET7_0_OR_GREATER
+#if NET
-            required
+        required
 #endif
-            string GeneralViewer { get; set; }
+        string DateFormat { get; set; }
 
-        [Required]
+    [Required]
-        [Column("WAN_ENVIRONMENT")]
+    [Column("ACTIVE")]
-        public bool WanEnvironment { get; set; }
+    public bool Active { get; set; }
 
-        [Required]
+    [Required]
-        [Column("USERID_FK_INT_ECM")]
+    [Column("GENERAL_VIEWER")]
-        public int UserIdFkIntEcm { get; set; }
+    [StringLength(30)]
-
+    [DefaultValue("NONE")]
-        [Column("DELETED_WHEN")]
+    public
-        public DateTime
+#if NET
-#if NET7_0_OR_GREATER
+        required
-            ?
 #endif
-            DeletedWhen { get; set; }
+        string GeneralViewer { get; set; }
 
-        [Column("DELETED_WHO")]
+    [Required]
-        [StringLength(50)]
+    [Column("WAN_ENVIRONMENT")]
-        public
+    public bool WanEnvironment { get; set; }
-#if NET7_0_OR_GREATER
+
-            required
+    [Required]
+    [Column("USERID_FK_INT_ECM")]
+    public int UserIdFkIntEcm { get; set; }
+
+    [Column("DELETED_WHEN")]
+    public DateTime
+#if NET
+        ?
 #endif
-            string
+        DeletedWhen { get; set; }
-#if NET7_0_OR_GREATER
+
-            ?
+    [Column("DELETED_WHO")]
-# endif
+    [StringLength(50)]
-            DeletedWho { get; set; }
+    public
-    }
+#if NET
+        required
+#endif
+        string
+#if NET
+        ?
+#endif
+        DeletedWho { get; set; }
 }
+
+#if NETFRAMEWORK
+    }
+#endif

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; }