NewLife
/
Stardust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net8.0

This commit is contained in:
大石头 2023-11-15 17:44:17 +08:00
parent 9751a51750
commit d90b414d88
13 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/publish-beta.yml vendored
View File

@ -13,11 +13,11 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotNET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.x
- name: Get Version
run: echo "VERSION=$(date '+%Y.%m%d-beta%H%M')" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
- name: Build

4
.github/workflows/publish.yml vendored
View File

@ -10,11 +10,11 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotNET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.x
- name: Build
run: |
dotnet build -c Release

4
.github/workflows/test.yml vendored
View File

@ -13,11 +13,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.x
- name: Build
run: |
dotnet build -c Release

4
ClientTest/ClientTest.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputPath>..\Bin\ClientTest</OutputPath>
<IsPackable>false</IsPackable>
@ -20,7 +20,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NewLife.Redis" Version="5.5.2023.1102" />
<PackageReference Include="NewLife.UnitTest" Version="1.0.2023.905" />
<PackageReference Include="xunit" Version="2.6.1" />

2
StarAgent/StarAgent.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net40;net45;net461;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net40;net45;net461;net7.0;net8.0</TargetFrameworks>
<AssemblyTitle>星尘代理</AssemblyTitle>
<Description>星尘，分布式资源调度，部署于每一个节点，连接服务端，支持节点监控、远程发布。</Description>
<Company>新生命开发团队</Company>

2
StarGateway/StarGateway.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>星尘网关</AssemblyTitle>
<Description>星尘网关，转发网络请求，实现路由切换。</Description>
<Company>新生命开发团队</Company>

4
Stardust.Extensions/Caches/CacheFileProvider.cs
View File

@ -110,7 +110,7 @@ class CacheFileProvider : IFileProvider
try
{
var url = subpath.Replace("\\", "/");
url = item.Contains("{0}") ? item.Replace("{0}", url) : item.EnsureEnd("/") + url.EnsureStart("/");
url = item.Contains("{0}") ? item.Replace("{0}", url) : item.TrimEnd("/") + url.EnsureStart("/");
span?.AppendTag(url);
XTrace.WriteLine("下载文件：{0}", url);
@ -211,7 +211,7 @@ class CacheFileProvider : IFileProvider
try
{
var url = subpath.Replace("\\", "/");
url = item.Contains("{0}") ? item.Replace("{0}", url) : item.EnsureEnd("/") + url.EnsureStart("/");
url = item.Contains("{0}") ? item.Replace("{0}", url) : item.TrimEnd("/") + url.EnsureStart("/");
span?.AppendTag(url);
XTrace.WriteLine("下载目录：{0}", url);

2
Stardust.Extensions/Stardust.Extensions.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<AssemblyTitle>星尘分布式服务扩展</AssemblyTitle>
<Description>星尘，分布式服务框架扩展。节点管理，监控中心，配置中心，发布中心，注册中心</Description>
<Company>新生命开发团队</Company>

2
Stardust.Server/Stardust.Server.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>StarServer</AssemblyName>
<AssemblyTitle>星尘服务平台</AssemblyTitle>
<Description>星尘，分布式服务框架。节点管理，监控中心，配置中心，发布中心，注册中心</Description>

4
Stardust.ServerTests/Stardust.ServerTests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputPath>..\Bin\ServerTest</OutputPath>
<IsPackable>false</IsPackable>
@ -21,7 +21,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.13" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">

2
Stardust.Web/Stardust.Web.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>StarWeb</AssemblyName>
<AssemblyTitle>星尘管理平台</AssemblyTitle>
<Description>星尘，分布式服务框架。节点管理，监控中心，配置中心，发布中心，注册中心</Description>

5
Stardust/Stardust.csproj
View File

@ -39,6 +39,9 @@
<PackageReadmeFile>Readme.MD</PackageReadmeFile>
</PropertyGroup>
<ItemGroup>
<Using Include="System.Net.Http" />
</ItemGroup>
<ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
@ -87,7 +90,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='net40'">
<PackageReference Include="NewLife.Core" Version="10.6.2023.1101" />
<PackageReference Include="NewLife.Core" Version="10.6.2023.1115" />
<PackageReference Include="NewLife.Remoting" Version="2.5.2023.1102" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net40'">

4
Test/Test.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyVersion>1.0.*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin\Test</OutputPath>
@ -25,7 +25,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.6.2023.1101" />
<PackageReference Include="NewLife.Core" Version="10.6.2023.1115" />
<PackageReference Include="SSH.NET" Version="2023.0.0" />
</ItemGroup>