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,7 +6,12 @@ using System;
 #endif
 
 namespace DigitalData.UserManager.Domain.Entities
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
+#endif
+
 public class BaseEntity
 {
     [Column("GUID")]
@@ -17,7 +22,7 @@ namespace DigitalData.UserManager.Domain.Entities
     [StringLength(50)]
     [Column("ADDED_WHO")]
     public string
-#if NET7_0_OR_GREATER
+#if NET
         ?
 #endif
         AddedWho { get; set; }
@@ -25,7 +30,7 @@ namespace DigitalData.UserManager.Domain.Entities
     [StringLength(50)]
     [Column("CHANGED_WHO")]
     public string
-#if NET7_0_OR_GREATER
+#if NET
         ?
 #endif
         ChangedWho { get; set; }
@@ -38,4 +43,7 @@ namespace DigitalData.UserManager.Domain.Entities
     [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,14 +6,19 @@ using System;
 #endif
 
 namespace DigitalData.UserManager.Domain.Entities
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
+#endif
+
 [Table("TBDD_USER", Schema = "dbo")]
 public partial class User : BaseEntity
 {
     [Column("PRENAME")]
     [StringLength(50)]
     public string
-#if NET7_0_OR_GREATER
+#if NET
         ?
 #endif
         Prename { get; set; }
@@ -21,7 +26,7 @@ namespace DigitalData.UserManager.Domain.Entities
     [Column("NAME")]
     [StringLength(50)]
     public string
-#if NET7_0_OR_GREATER
+#if NET
         ?
 #endif
         Name { get; set; }
@@ -30,7 +35,7 @@ namespace DigitalData.UserManager.Domain.Entities
     [Column("USERNAME")]
     [StringLength(50)]
     public
-#if NET7_0_OR_GREATER
+#if NET
         required
 #endif
         string Username { get; set; }
@@ -38,7 +43,7 @@ namespace DigitalData.UserManager.Domain.Entities
     [Column("SHORTNAME")]
     [StringLength(30)]
     public string
-#if NET7_0_OR_GREATER
+#if NET
         ?
 #endif
         Shortname
@@ -47,7 +52,7 @@ namespace DigitalData.UserManager.Domain.Entities
     [Column("EMAIL")]
     [StringLength(100)]
     public string
-#if NET7_0_OR_GREATER
+#if NET
         ?
 #endif
         Email { get; set; }
@@ -57,7 +62,7 @@ namespace DigitalData.UserManager.Domain.Entities
     [StringLength(5)]
     [DefaultValue("de-DE")]
     public string
-#if NET7_0_OR_GREATER
+#if NET
         ?
 #endif
         Language { get; set; }
@@ -65,7 +70,7 @@ namespace DigitalData.UserManager.Domain.Entities
     [Column("COMMENT")]
     [StringLength(500)]
     public string
-#if NET7_0_OR_GREATER
+#if NET
         ?
 #endif
         Comment { get; set; }
@@ -78,7 +83,7 @@ namespace DigitalData.UserManager.Domain.Entities
     [StringLength(10)]
     [DefaultValue("dd.MM.yyyy")]
     public
-#if NET7_0_OR_GREATER
+#if NET
         required
 #endif
         string DateFormat { get; set; }
@@ -92,7 +97,7 @@ namespace DigitalData.UserManager.Domain.Entities
     [StringLength(30)]
     [DefaultValue("NONE")]
     public
-#if NET7_0_OR_GREATER
+#if NET
         required
 #endif
         string GeneralViewer { get; set; }
@@ -107,7 +112,7 @@ namespace DigitalData.UserManager.Domain.Entities
 
     [Column("DELETED_WHEN")]
     public DateTime
-#if NET7_0_OR_GREATER
+#if NET
         ?
 #endif
         DeletedWhen { get; set; }
@@ -115,13 +120,16 @@ namespace DigitalData.UserManager.Domain.Entities
     [Column("DELETED_WHO")]
     [StringLength(50)]
     public
-#if NET7_0_OR_GREATER
+#if NET
         required
 #endif
         string
-#if NET7_0_OR_GREATER
+#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; }