NET6_0_OR_GREATER

lonelyxmas · Nov 12, 2022 · 3c941b2 · 3c941b2
1 parent c9823ad
commit 3c941b2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/BlazorMaui/Platforms/Windows/Package.appxmanifest b/BlazorMaui/Platforms/Windows/Package.appxmanifest
@@ -10,7 +10,7 @@
     <Identity
       Name="563DensenInformatica.561953A1AE0C6"
       Publisher="CN=177A29A1-9641-45E4-886A-B94A29629FA6"
-      Version="1.1.0.0" />
+      Version="1.1.1.0" />
 
     <mp:PhoneIdentity PhoneProductId="4c57104a-47dc-427b-8b72-1d15a8e52d92" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/BlazorShared/Models/Item.cs b/BlazorShared/Models/Item.cs
@@ -1,5 +1,5 @@
 using System;
-# if (WINDOWS && NET6_0)
+# if (WINDOWS && NET6_0_OR_GREATER)
 using FreeSql.DataAnnotations;
 #endif
 
@@ -8,7 +8,7 @@ namespace BlazorShared.Models;
 public class Item
 {
 
-#if (WINDOWS && NET6_0)
+#if (WINDOWS && NET6_0_OR_GREATER)
 [Column(IsPrimary = false)]
 #endif
     public string fId { get; set; }

diff --git a/BlazorShared/Models/PC.cs b/BlazorShared/Models/PC.cs
@@ -3,7 +3,7 @@
 // 作者：Alex Chow
 // e-mail:[email protected] 
 // **********************************
-# if (WINDOWS && NET6_0)
+# if (WINDOWS && NET6_0_OR_GREATER)
 using FreeSql.DataAnnotations;
 #endif
 using BootstrapBlazor.Components;
@@ -15,7 +15,7 @@ namespace AmeApi;
 [AutoGenerateClass(Searchable = true, Filterable = true, Sortable = true)]
 public class PC
 {
-#if (WINDOWS && NET6_0)
+#if (WINDOWS && NET6_0_OR_GREATER)
    [Column(IsIdentity = true)]
 #endif
     [DisplayName("序号")]
@@ -53,7 +53,7 @@ public class PC
     [AutoGenerateColumn(TextWrap = true)]
     public string Description { get; set; }
 
-#if (WINDOWS && NET6_0)
+#if (WINDOWS && NET6_0_OR_GREATER)
    [Navigate(nameof(Record.PcID))]
 #endif
     [AutoGenerateColumn(Ignore = true)]
@@ -63,7 +63,7 @@ public class PC
 [AutoGenerateClass(Searchable = true, Filterable = true, Sortable = true)]
 public class Record
 {
-#if (WINDOWS && NET6_0)
+#if (WINDOWS && NET6_0_OR_GREATER)
    [Column(IsIdentity = true)]
 #endif
     [DisplayName("序号")]
@@ -90,7 +90,7 @@ public class Record
     [DisplayName("描述")]
     public string Description { get; set; }
 
-#if (WINDOWS && NET6_0)
+#if (WINDOWS && NET6_0_OR_GREATER)
 [Navigate(nameof(PcID))]
 #endif
     [AutoGenerateColumn(Ignore = true)]