Merge remote-tracking branch 'origin/main'

EasyAbp · Jul 25, 2024 · b641e5d · b641e5d
2 parents 466c0e7 + 542966e
commit b641e5d
Show file tree

Hide file tree

Showing 70 changed files with 6,983 additions and 9,681 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>8.1.0</AbpVersion>
+    <AbpVersion>8.2.0</AbpVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/EasyAbp.DynamicForm.abpmdl b/EasyAbp.DynamicForm.abpmdl
@@ -0,0 +1,58 @@
+{
+  "folders": {
+    "items": {
+      "src": {},
+      "test": {}
+    }
+  },
+  "packages": {
+    "EasyAbp.DynamicForm.Domain.Shared": {
+      "path": "src/EasyAbp.DynamicForm.Domain.Shared/EasyAbp.DynamicForm.Domain.Shared.abppkg",
+      "folder": "src"
+    },
+    "EasyAbp.DynamicForm.Domain": {
+      "path": "src/EasyAbp.DynamicForm.Domain/EasyAbp.DynamicForm.Domain.abppkg",
+      "folder": "src"
+    },
+    "EasyAbp.DynamicForm.Application.Contracts": {
+      "path": "src/EasyAbp.DynamicForm.Application.Contracts/EasyAbp.DynamicForm.Application.Contracts.abppkg",
+      "folder": "src"
+    },
+    "EasyAbp.DynamicForm.Application": {
+      "path": "src/EasyAbp.DynamicForm.Application/EasyAbp.DynamicForm.Application.abppkg",
+      "folder": "src"
+    },
+    "EasyAbp.DynamicForm.EntityFrameworkCore": {
+      "path": "src/EasyAbp.DynamicForm.EntityFrameworkCore/EasyAbp.DynamicForm.EntityFrameworkCore.abppkg",
+      "folder": "src"
+    },
+    "EasyAbp.DynamicForm.HttpApi": {
+      "path": "src/EasyAbp.DynamicForm.HttpApi/EasyAbp.DynamicForm.HttpApi.abppkg",
+      "folder": "src"
+    },
+    "EasyAbp.DynamicForm.HttpApi.Client": {
+      "path": "src/EasyAbp.DynamicForm.HttpApi.Client/EasyAbp.DynamicForm.HttpApi.Client.abppkg",
+      "folder": "src"
+    },
+    "EasyAbp.DynamicForm.TestBase": {
+      "path": "test/EasyAbp.DynamicForm.TestBase/EasyAbp.DynamicForm.TestBase.abppkg",
+      "folder": "test"
+    },
+    "EasyAbp.DynamicForm.EntityFrameworkCore.Tests": {
+      "path": "test/EasyAbp.DynamicForm.EntityFrameworkCore.Tests/EasyAbp.DynamicForm.EntityFrameworkCore.Tests.abppkg",
+      "folder": "test"
+    },
+    "EasyAbp.DynamicForm.Domain.Tests": {
+      "path": "test/EasyAbp.DynamicForm.Domain.Tests/EasyAbp.DynamicForm.Domain.Tests.abppkg",
+      "folder": "test"
+    },
+    "EasyAbp.DynamicForm.Application.Tests": {
+      "path": "test/EasyAbp.DynamicForm.Application.Tests/EasyAbp.DynamicForm.Application.Tests.abppkg",
+      "folder": "test"
+    },
+    "EasyAbp.DynamicForm.Web": {
+      "path": "src/EasyAbp.DynamicForm.Web/EasyAbp.DynamicForm.Web.abppkg",
+      "folder": "src"
+    }
+  }
+}
diff --git a/EasyAbp.DynamicForm.abpmdl.json b/EasyAbp.DynamicForm.abpmdl.json
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>1.7.0</Version>
+    <Version>1.8.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <AbpProjectType>module</AbpProjectType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/host/EasyAbp.DynamicForm.AuthServer/DynamicFormAuthServerModule.cs b/host/EasyAbp.DynamicForm.AuthServer/DynamicFormAuthServerModule.cs
@@ -125,9 +125,9 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)"));
             options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish"));
             options.Languages.Add(new LanguageInfo("fr", "fr", "Français"));
-            options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in"));
-            options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is"));
-            options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it"));
+            options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi"));
+            options.Languages.Add(new LanguageInfo("is", "is", "Icelandic"));
+            options.Languages.Add(new LanguageInfo("it", "it", "Italiano"));
             options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar"));
             options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português"));
             options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română"));

diff --git a/host/EasyAbp.DynamicForm.AuthServer/EasyAbp.DynamicForm.AuthServer.csproj b/host/EasyAbp.DynamicForm.AuthServer/EasyAbp.DynamicForm.AuthServer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\common.props" />