升级基础组件,引入net8.0

This commit is contained in:
智能大石头 2023-09-18 23:58:25 +08:00
parent 3d55bad323
commit dcff7c39f4
16 changed files with 30 additions and 14 deletions

View File

@ -21,7 +21,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="NewLife.Redis" Version="5.5.2023.828-beta1607" />
<PackageReference Include="NewLife.Redis" Version="5.5.2023.915-beta0733" />
<PackageReference Include="NewLife.UnitTest" Version="1.0.2023.905" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">

View File

@ -6,12 +6,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>..\Bin\Agent\net6.0\publish\win-x64\</PublishDir>
<PublishDir>..\Bin\Agent\publish\win-x64\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<SelfContained>false</SelfContained>
<TargetFramework>net7.0</TargetFramework>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<PublishSingleFile>false</PublishSingleFile>
<PublishReadyToRun>false</PublishReadyToRun>
<PublishTrimmed>true</PublishTrimmed>
</PropertyGroup>
</Project>

View File

@ -24,6 +24,13 @@
<NoWarn>1701;1702;NU5104;NETSDK1138;CS7035</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net8.0'">
<PublishAot>true</PublishAot>
<OptimizationPreference>Size</OptimizationPreference>
<InvariantGlobalization>true</InvariantGlobalization>
<StackTraceSupport>false</StackTraceSupport>
</PropertyGroup>
<ItemGroup>
<Compile Remove="StarService2.cs" />
</ItemGroup>
@ -33,7 +40,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Agent" Version="10.5.2023.910-beta0910" />
<PackageReference Include="NewLife.Agent" Version="10.5.2023.912-beta1050" />
</ItemGroup>
<ItemGroup>

View File

@ -39,7 +39,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.9.2023.909-beta0001" />
<PackageReference Include="NewLife.XCode" Version="11.9.2023.914-beta0845" />
</ItemGroup>
<ItemGroup>

View File

@ -32,7 +32,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Redis" Version="5.5.2023.828-beta1607" />
<PackageReference Include="NewLife.Redis" Version="5.5.2023.915-beta0733" />
</ItemGroup>
<ItemGroup>

View File

@ -42,8 +42,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.901-beta1627" />
<PackageReference Include="NewLife.Redis" Version="5.5.2023.828-beta1607" />
<PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.913-beta1139" />
<PackageReference Include="NewLife.Redis" Version="5.5.2023.915-beta0733" />
</ItemGroup>
<ItemGroup>

View File

@ -12,6 +12,7 @@ using Stardust.Registry;
using Stardust.Services;
using NewLife.Caching;
using System;
using System.Net.Http;
#if NET45_OR_GREATER || NETCOREAPP || NETSTANDARD
using System.Net.WebSockets;
using TaskEx = System.Threading.Tasks.Task;

View File

@ -1,4 +1,5 @@
using NewLife;
using System.Net.Http;
using NewLife;
using NewLife.Log;
using NewLife.Remoting;
using Stardust.WeiXin;

View File

@ -1,6 +1,7 @@
using System.ComponentModel;
using System.Diagnostics;
using System.Net;
using System.Net.Http;
using System.Net.NetworkInformation;
using System.Net.Sockets;
using NewLife;

View File

@ -1,4 +1,5 @@
using NewLife;
using System.Net.Http;
using NewLife;
using NewLife.Http;
using NewLife.IO;
using NewLife.Log;

View File

@ -1,5 +1,6 @@
using System.Collections.Concurrent;
using System.Diagnostics;
using System.Net.Http;
using System.Net.Sockets;
using System.Reflection;
using NewLife;

View File

@ -15,6 +15,7 @@ using Stardust.Managers;
using Stardust.Models;
using Stardust.Services;
using System;
using System.Net.Http;
#if NET45_OR_GREATER || NETCOREAPP || NETSTANDARD
using System.Net.WebSockets;
using WebSocket = System.Net.WebSockets.WebSocket;

View File

@ -86,7 +86,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='net40'">
<PackageReference Include="NewLife.Core" Version="10.5.2023.903" />
<PackageReference Include="NewLife.Core" Version="10.6.2023.917-beta1405" />
<PackageReference Include="NewLife.Remoting" Version="2.3.2023.907" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net40'">

View File

@ -1,4 +1,5 @@
using System.Diagnostics;
using System.Net.Http;
using System.Reflection;
using NewLife;
using NewLife.Log;

View File

@ -1,4 +1,5 @@
using NewLife;
using System.Net.Http;
using NewLife;
using NewLife.Log;
using NewLife.Remoting;

View File

@ -25,7 +25,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.5.2023.906-beta0624" />
<PackageReference Include="NewLife.Core" Version="10.6.2023.917-beta1405" />
<PackageReference Include="SSH.NET" Version="2020.0.2" />
</ItemGroup>