Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/NewLifeX/NewLife.Cube
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xusp
Xusp committed Aug 8, 2023
2 parents 1fc275a + 502c43e commit c7f7e01
Show file tree
Hide file tree
Showing 60 changed files with 13,976 additions and 578 deletions.
4 changes: 2 additions & 2 deletions CubeDemo/CubeDemo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.8" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.707-beta0322" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.9" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.801" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions CubeDemoNC/CubeDemoNC.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.8" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.707-beta0322" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.9" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.801" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions CubeSSO/CubeSSO.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.4.2023.707" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.707-beta0322" />
<PackageReference Include="NewLife.Core" Version="10.5.2023.801" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.801" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.8.4" />
<PackageReference Include="BootstrapBlazor" Version="7.9.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

Expand Down
357 changes: 357 additions & 0 deletions NewLife.Cube.LayuiAdmin/Areas/Admin/Views/Log_LayuiAdmin/List.cshtml
View file

Large diffs are not rendered by default.

69 changes: 0 additions & 69 deletions NewLife.Cube.LayuiAdmin/Areas/Admin/Views/Log_LayuiAdmin/List1.cshtml
View file

This file was deleted.

Loading

0 comments on commit c7f7e01

Please sign in to comment.