Skip to content

Commit

Permalink
升级基础组件,修正信息页CpuRate类型改变而带来的错误
Browse files Browse the repository at this point in the history
  • Loading branch information
nnhy committed May 19, 2024
1 parent 9e4fb62 commit f0a2564
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions CubeDemo/CubeDemo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.5" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2024.417-beta1339" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.1" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.4" />
<PackageReference Include="NewLife.Redis.Extensions" Version="5.5.2024.411-beta0755" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.5" />
<PackageReference Include="NewLife.Redis.Extensions" Version="5.5.2024.508" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2024.417-beta1339" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion CubeSSO/CubeSSO.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.9.2024.417-beta1447" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.507" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2024.417-beta1339" />
</ItemGroup>

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

Expand Down
4 changes: 2 additions & 2 deletions NewLife.Cube/NewLife.Cube.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@
<Compile Include="..\NewLife.CubeNC\WebMiddleware\TracerMiddleware.cs" Link="WebMiddleware\TracerMiddleware.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.9.2024.417-beta1447" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.507" />
<PackageReference Include="NewLife.IP" Version="2.1.2024.407" />
<PackageReference Include="NewLife.Stardust" Version="2.9.2024.417-beta1339" />
<PackageReference Include="NewLife.XCode" Version="11.11.2024.417-beta0711" />
<PackageReference Include="NewLife.XCode" Version="11.12.2024.515" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions NewLife.CubeNC/NewLife.CubeNC.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.9.2024.417-beta1447" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.507" />
<PackageReference Include="NewLife.IP" Version="2.1.2024.407" />
<PackageReference Include="NewLife.Stardust" Version="2.9.2024.417-beta1339" />
<PackageReference Include="NewLife.XCode" Version="11.11.2024.417-beta0711" />
<PackageReference Include="NewLife.XCode" Version="11.12.2024.515" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions NewLife.CubeNC/WebMiddleware/TracerMiddleware.cs
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,7 @@ public static void SaveServiceAddress(HttpContext ctx)
var baseAddress = $"{uri.Scheme}://{uri.Authority}";

var set = NewLife.Setting.Current;
if (set.ServiceAddress.IsNullOrWhiteSpace()) return;
var ss = set.ServiceAddress.Split(",").ToList();
var ss = (set.ServiceAddress + "").Split(",").ToList();
if (!ss.Contains(baseAddress))
{
ss.Insert(0, baseAddress);
Expand Down
2 changes: 1 addition & 1 deletion Test/Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<None Remove="Entity\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.11.2024.417-beta0711" />
<PackageReference Include="NewLife.XCode" Version="11.12.2024.515" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions XUnitTest/XUnitTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<PackageReference Include="xunit" Version="2.8.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down

0 comments on commit f0a2564

Please sign in to comment.