Skip to content

Commit

Permalink
Support dotnet 8 (#2126)
Browse files Browse the repository at this point in the history
* support dotnet8 target

* make sure all the right versions are installed for dotnet 8 testing

* No need for pre-release since it is no longer an argument

* Try with the newest version of the action
  • Loading branch information
jstnlef authored May 19, 2024
1 parent e8ba0f6 commit 3b8155d
Show file tree
Hide file tree
Showing 52 changed files with 110 additions and 117 deletions.
29 changes: 12 additions & 17 deletions .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
strategy:
matrix:
dotnet:
- net8.0
- net7.0
- net6.0
test:
Expand All @@ -34,15 +35,14 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v2
with:
dotnet-version: "7.0.x"
include-prerelease: true
- uses: actions/setup-dotnet@v2
fetch-depth: 0
- uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
7.0.x
6.0.x
3.1.x
- name: Run tests ${{ matrix.test }}
timeout-minutes: 15
Expand All @@ -65,15 +65,14 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v2
with:
dotnet-version: "7.0.x"
include-prerelease: true
- uses: actions/setup-dotnet@v2
fetch-depth: 0
- uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
7.0.x
6.0.x
3.1.x
- name: Run tests ${{ matrix.test }}
timeout-minutes: 15
run: |
Expand All @@ -87,18 +86,14 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-dotnet@v2
with:
dotnet-version: "7.0.102"
include-prerelease: true
- uses: actions/setup-dotnet@v2
- uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
7.0.x
6.0.x
3.1.x
- name: Create and push NuGet package
run: |
dotnet pack ProtoActor.sln -c Release -o nuget -p:SymbolPackageFormat=snupkg -p:GenerateDocumentationFile=true -p:NoWarn=CS1591
dotnet nuget push nuget/**/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
30 changes: 14 additions & 16 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v2
with:
dotnet-version: "7.0.x"
include-prerelease: true
- uses: actions/setup-dotnet@v2
fetch-depth: 0
- uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
7.0.x
6.0.x
3.1.x
- name: Build
run: dotnet build ProtoActor.sln -c Release
Expand All @@ -49,6 +48,7 @@ jobs:
strategy:
matrix:
dotnet:
- net8.0
- net7.0
- net6.0
test:
Expand All @@ -59,15 +59,14 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v2
with:
dotnet-version: "7.0.x"
include-prerelease: true
- uses: actions/setup-dotnet@v2
fetch-depth: 0
- uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
7.0.x
6.0.x
3.1.x
- name: Run tests ${{ matrix.test }}
timeout-minutes: 15
Expand All @@ -90,16 +89,15 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v2
with:
dotnet-version: "7.0.x"
include-prerelease: true
- uses: actions/setup-dotnet@v2
fetch-depth: 0
- uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
7.0.x
6.0.x
3.1.x
- name: Run tests ${{ matrix.test }}
timeout-minutes: 15
run: |
dotnet test ${{ matrix.test }} -c Release --logger GitHubActions
dotnet test ${{ matrix.test }} -c Release --logger GitHubActions
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<NoWarn>8981</NoWarn>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>10</LangVersion>
<RootNamespace>ClusterExperiment1</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/ClusterBenchmark/ClusterBenchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<NoWarn>8981</NoWarn>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>10</LangVersion>
<RootNamespace>ClusterExperiment1</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<LangVersion>10</LangVersion>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions benchmarks/GossipBenchmark/Messages/Messages.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<NoWarn>8981</NoWarn>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.22.0" />
Expand All @@ -19,4 +19,4 @@
<ProjectReference Include="..\..\..\src\Proto.Cluster\Proto.Cluster.csproj" />
</ItemGroup>

</Project>
</Project>
4 changes: 2 additions & 2 deletions benchmarks/GossipBenchmark/Node1/Node1.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
<LangVersion>10</LangVersion>
Expand All @@ -13,4 +13,4 @@
<ProjectReference Include="..\..\..\src\Proto.Remote\Proto.Remote.csproj" />
<ProjectReference Include="..\Messages\Messages.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions benchmarks/GossipBenchmark/Node2/Node2.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
<LangVersion>10</LangVersion>
Expand All @@ -13,4 +13,4 @@
<ProjectReference Include="..\..\..\src\Proto.Remote\Proto.Remote.csproj" />
<ProjectReference Include="..\Messages\Messages.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions benchmarks/InprocessBenchmark/InprocessBenchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<OutputType>Exe</OutputType>
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<LangVersion>10</LangVersion>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions benchmarks/MailboxBenchmark/MailboxBenchmark.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotnet" Version="0.13.2" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions benchmarks/PingPongBenchmark/LocalPingPong.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<OutputType>Exe</OutputType>
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<LangVersion>10</LangVersion>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />
</ItemGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion benchmarks/PropsBenchmark/PropsBenchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<LangVersion>10</LangVersion>
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/RemoteBenchmark/Messages/Messages.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<NoWarn>8981</NoWarn>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.22.0" />
Expand All @@ -15,4 +15,4 @@
<ItemGroup>
<Protobuf Include="Protos.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\..\src" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions benchmarks/RemoteBenchmark/Node1/Node1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
<LangVersion>10</LangVersion>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,4 +18,4 @@
<PropertyGroup Condition="'$(TargetFramework)' != 'net5.0'">
<DefineConstants>NETCORE</DefineConstants>
</PropertyGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions benchmarks/RemoteBenchmark/Node2/Node2.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
<LangVersion>10</LangVersion>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\Proto.Actor\Proto.Actor.csproj" />
Expand All @@ -17,4 +17,4 @@
<PropertyGroup Condition="'$(TargetFramework)' != 'net5.0'">
<DefineConstants>NETCORE</DefineConstants>
</PropertyGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions benchmarks/SpawnBenchmark/SpawnBenchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
<LangVersion>10</LangVersion>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/Proto.Actor/Proto.Actor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<IsPackable>true</IsPackable>
<LangVersion>10</LangVersion>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand All @@ -23,4 +23,4 @@
<ItemGroup>
<Protobuf Include="Protos.proto" GrpcServices="Server" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/Proto.Cluster.AmazonECS/Proto.Cluster.AmazonECS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<LangVersion>10</LangVersion>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<LangVersion>10</LangVersion>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.2" />
Expand Down
4 changes: 2 additions & 2 deletions src/Proto.Cluster.Consul/Proto.Cluster.Consul.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<LangVersion>10</LangVersion>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Consul" Version="1.6.10.7" />
Expand All @@ -10,4 +10,4 @@
<ItemGroup>
<ProjectReference Include="..\Proto.Cluster\Proto.Cluster.csproj" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<LangVersion>10</LangVersion>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
Loading

0 comments on commit 3b8155d

Please sign in to comment.