Skip to content

Commit 0dcc8fc

Browse files
thompson-tomothompson-tomo
authored
cleanup dependencies SkyAPM#604 (SkyAPM#606)
* cleanup dependencies SkyAPM#604 Signed-off-by: James Thompson <thompson.tomo@outlook.com> * Add net 8.0 * more cleanup * force net 8 * tweak tfm * Install dotnet 5 * Update appveyor.yml * Change build step order --------- Signed-off-by: James Thompson <thompson.tomo@outlook.com>
1 parent 1c50fc9 commit 0dcc8fc

45 files changed

Lines changed: 69 additions & 168 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/net7-ci-it.yml renamed to .github/workflows/net-ci-it.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: NET7 CI AND IT
1+
name: NET CI AND IT
22

33
on:
44
push:
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup .NET
1818
uses: actions/setup-dotnet@v1
1919
with:
20-
dotnet-version: 7.0.100
20+
dotnet-version: 8.0.x
2121
- name: Setup Submodule
2222
run: git submodule update --init
2323
- name: Restore dependencies
@@ -27,4 +27,4 @@ jobs:
2727
- name: Build
2828
run: dotnet build --no-restore
2929
- name: Test
30-
run: dotnet test --no-build --verbosity normal --framework net7.0
30+
run: dotnet test --no-build --verbosity normal --framework net8.0

‎Directory.Build.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<Import Project="build\common.props"/>
3+
<PropertyGroup>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net8.0</TargetFrameworks>
5+
</PropertyGroup>
6+
</Project>

‎appveyor.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ skip_commits:
1010
files:
1111
- LICENSE
1212
install:
13+
- ps: |
14+
Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1"
15+
& $env:temp\dotnet-install.ps1 -Architecture x64 -Version '5.0.408' -InstallDir "$env:ProgramFiles\dotnet"
1316
- git submodule update --init
1417
- dotnet build -c Release src/SkyApm.Transport.Protocol
1518
build_script:

‎benchmark/SkyApm.Benchmark/SkyApm.Benchmark.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
65
</PropertyGroup>
76

87
<ItemGroup>

‎sample/SkyApm.Sample.Backend/SkyApm.Sample.Backend.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
54
</PropertyGroup>
65

76
<ItemGroup>
@@ -27,8 +26,8 @@
2726
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.12" />
2827
</ItemGroup>
2928

30-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />
29+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
3231
</ItemGroup>
3332

3433
<ItemGroup>

‎sample/SkyApm.Sample.FreeSql/SkyApm.Sample.FreeSqlSqlite.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
54
</PropertyGroup>
65

76
<ItemGroup>

‎sample/SkyApm.Sample.Frontend/SkyApm.Sample.Frontend.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
44
<RootNamespace>SkyApm.Sample.Backend</RootNamespace>
5-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
65
</PropertyGroup>
76

87
<ItemGroup>

‎sample/SkyApm.Sample.GenericHost/SkyApm.Sample.GenericHost.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0;netcoreapp3.1;net7.0</TargetFrameworks>
65
</PropertyGroup>
76

87
<ItemGroup>
@@ -16,12 +15,16 @@
1615
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.32" />
1716
</ItemGroup>
1817

18+
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
19+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
20+
</ItemGroup>
21+
1922
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
2023
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
2124
</ItemGroup>
2225

23-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
24-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
26+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
27+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
2528
</ItemGroup>
2629

2730
<ItemGroup>

‎sample/SkyApm.Sample.Logging/SkyApm.Sample.Logging.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
7+
<LangVersion>10</LangVersion>
78
</PropertyGroup>
89

910
<ItemGroup>

‎sample/grpc/SkyApm.Sample.GrpcClient/SkyApm.Sample.GrpcClient.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
65
</PropertyGroup>
76

87
<ItemGroup>
@@ -20,8 +19,8 @@
2019
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
2120
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1"/>
2221
</ItemGroup>
23-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
24-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0"/>
22+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
23+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
2524
</ItemGroup>
2625
<ItemGroup>
2726
<ProjectReference Include="..\..\..\src\SkyApm.Agent.GeneralHost\SkyApm.Agent.GeneralHost.csproj"/>

0 commit comments

Comments
 (0)