合并

NewLifeX · Oct 5, 2024 · a4927f2 · a4927f2
2 parents 6082828 + e7ba6ad
commit a4927f2
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 14 deletions.
diff --git a/CubeDemoNC/CubeDemoNC.csproj b/CubeDemoNC/CubeDemoNC.csproj
@@ -39,7 +39,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.8" />
     <PackageReference Include="NewLife.Redis.Extensions" Version="5.7.2024.801" />
-    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.0.2024.902" />
+    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.1.2024.1004" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CubeSSO/CubeSSO.csproj b/CubeSSO/CubeSSO.csproj
@@ -23,8 +23,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.902" />
-    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.0.2024.902" />
+    <PackageReference Include="NewLife.Core" Version="11.0.2024.1001" />
+    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.1.2024.1004" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj b/NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj
@@ -49,7 +49,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="8.9.0" />
+    <PackageReference Include="BootstrapBlazor" Version="8.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 

diff --git a/NewLife.Cube/Common/ViewHelper.cs b/NewLife.Cube/Common/ViewHelper.cs
@@ -713,7 +713,7 @@ internal static Boolean MakeSearchView(Type entityType, String vpath, List<DataF
                 @Html.ForDropDownList("RoleID", Role.FindAllWithCache().Cast<IEntity>().ToList(), page["roldId"], "全部", true)
                 @Html.ForDropDownList("p", VisitStat.FindAllPageName(), page["p"], "全部页面", true)
                 @Html.ForListBox("roleIds", Role.FindAllWithCache(), page["roleIds"])
-            </ div>*@
+            </div>*@
             @*@await Html.PartialAsync("_SelectDepartment", "departmentId")*@
             @*@await Html.PartialAsync("_DateRange")*@
             """;

diff --git a/NewLife.Cube/NewLife.Cube.csproj b/NewLife.Cube/NewLife.Cube.csproj
@@ -99,10 +99,10 @@
     <Compile Include="..\NewLife.CubeNC\WebMiddleware\TracerMiddleware.cs" Link="WebMiddleware\TracerMiddleware.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.902" />
+    <PackageReference Include="NewLife.Core" Version="11.0.2024.1001" />
     <PackageReference Include="NewLife.IP" Version="2.2.2024.902" />
-    <PackageReference Include="NewLife.Stardust" Version="3.0.2024.902" />
-    <PackageReference Include="NewLife.XCode" Version="11.15.2024.902" />
+    <PackageReference Include="NewLife.Stardust" Version="3.1.2024.1004" />
+    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1005" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NewLife.CubeNC/Areas/Admin/Controllers/UserController.cs b/NewLife.CubeNC/Areas/Admin/Controllers/UserController.cs
@@ -41,6 +41,7 @@ static UserController()
     {
         ListFields.RemoveField("Avatar", "RoleIds", "Online", "Age", "Birthday", "LastLoginIP", "RegisterIP", "RegisterTime");
         ListFields.RemoveField("Phone", "Code", "Question", "Answer");
+        ListFields.RemoveField("MailVerified", "MobileVerified");
         ListFields.RemoveField("Ex1", "Ex2", "Ex3", "Ex4", "Ex5", "Ex6");
         ListFields.RemoveUpdateField();
         ListFields.RemoveField("Remark");

diff --git a/NewLife.CubeNC/NewLife.CubeNC.csproj b/NewLife.CubeNC/NewLife.CubeNC.csproj
@@ -50,10 +50,10 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.902" />
+    <PackageReference Include="NewLife.Core" Version="11.0.2024.1001" />
     <PackageReference Include="NewLife.IP" Version="2.2.2024.902" />
-    <PackageReference Include="NewLife.Stardust" Version="3.0.2024.902" />
-    <PackageReference Include="NewLife.XCode" Version="11.15.2024.902" />
+    <PackageReference Include="NewLife.Stardust" Version="3.1.2024.1004" />
+    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1005" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -17,6 +17,6 @@
     <None Remove="Entity\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.XCode" Version="11.15.2024.902" />
+    <PackageReference Include="NewLife.XCode" Version="11.16.2024.1005" />
   </ItemGroup>
 </Project>
diff --git a/XUnitTest/XUnitTest.csproj b/XUnitTest/XUnitTest.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>