Skip to content

Commit 12634ca

Browse files
nnhynnhy
committed
v1.2.2024.1008
1 parent 9578866 commit 12634ca

File tree

7 files changed

+32
-28
lines changed

7 files changed

+32
-28
lines changed

‎.github/workflows/publish-beta.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v3
18-
- name: Setup .NET
19-
uses: actions/setup-dotnet@v2
17+
- uses: actions/checkout@v4
18+
- name: Setup dotNET
19+
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: 6.0.x
21+
dotnet-version: 9.x
2222
- name: Restore
2323
run: |
2424
dotnet restore NewLife.Meter/NewLife.HttpMeter.csproj

‎.github/workflows/publish.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
15-
- name: Setup .NET
16-
uses: actions/setup-dotnet@v2
14+
- uses: actions/checkout@v4
15+
- name: Setup dotNET
16+
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: 6.0.x
18+
dotnet-version: 9.x
1919
- name: Restore
2020
run: |
2121
dotnet restore NewLife.Meter/NewLife.HttpMeter.csproj

‎.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v3
17-
- name: Setup .NET
18-
uses: actions/setup-dotnet@v2
16+
- uses: actions/checkout@v4
17+
- name: Setup dotNET
18+
uses: actions/setup-dotnet@v4
1919
with:
20-
dotnet-version: 6.0.x
20+
dotnet-version: 9.x
2121
- name: Build
2222
run: |
2323
dotnet build -c Release

‎HttpMeter/HttpMeter.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<AssemblyTitle>Http压力测试</AssemblyTitle>
77
<Description>Http压力测试工具</Description>
88
<Company>新生命开发团队</Company>
9-
<Copyright>©2002-2022 NewLife</Copyright>
10-
<VersionPrefix>1.1</VersionPrefix>
9+
<Copyright>©2002-2024 NewLife</Copyright>
10+
<VersionPrefix>1.2</VersionPrefix>
1111
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
1212
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
1313
<FileVersion>$(Version)</FileVersion>

‎NewLife.Meter/MeterWorker.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
using System.Diagnostics;
2+
using System.Net.Http;
23
using System.Net.Http.Headers;
34
using System.Text;
45
using NewLife.Http;
56
using NewLife.Log;
7+
#if !NET45
8+
using TaskEx = System.Threading.Tasks.Task;
9+
#endif
610

711
namespace NewLife.HttpMeter;
812

@@ -107,7 +111,7 @@ protected virtual Task InitAsync()
107111
_content = File.ReadAllText(cfg.File.GetFullPath());
108112
}
109113

110-
return Task.CompletedTask;
114+
return TaskEx.CompletedTask;
111115
}
112116

113117
/// <summary>处理单次请求</summary>

‎NewLife.Meter/NewLife.HttpMeter.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
3+
<TargetFrameworks>net45;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
44
<AssemblyTitle>Http压力测试组件</AssemblyTitle>
55
<Description>高性能Http压力测试套装</Description>
66
<Company>新生命开发团队</Company>
7-
<Copyright>©2002-2022 新生命开发团队</Copyright>
8-
<VersionPrefix>1.1</VersionPrefix>
7+
<Copyright>©2002-2024 新生命开发团队</Copyright>
8+
<VersionPrefix>1.2</VersionPrefix>
99
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
1010
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
1111
<FileVersion>$(Version)</FileVersion>
@@ -36,14 +36,14 @@
3636
</PropertyGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
39+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
4040
<PrivateAssets>all</PrivateAssets>
4141
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4242
</PackageReference>
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="NewLife.Core" Version="10.0.2022.1101" />
46+
<PackageReference Include="NewLife.Core" Version="11.0.2024.1001" />
4747
</ItemGroup>
4848

4949
<ItemGroup>

‎XUnitTest/XUnitTest.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputPath>..\Bin\UnitTest</OutputPath>
66

77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
13-
<PackageReference Include="NewLife.Core" Version="10.0.2022.1101" />
14-
<PackageReference Include="NewLife.UnitTest" Version="1.0.2022.901" />
15-
<PackageReference Include="xunit" Version="2.4.2" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13+
<PackageReference Include="NewLife.Core" Version="11.0.2024.1001" />
14+
<PackageReference Include="NewLife.UnitTest" Version="1.0.2024.1006" />
15+
<PackageReference Include="xunit" Version="2.9.2" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>

0 commit comments

Comments
 (0)