fix ci (#1706)

* fix ci
asynkron · Jul 6, 2022 · 39dec7b · 39dec7b
1 parent e0abd54
commit 39dec7b
Show file tree

Hide file tree

Showing 85 changed files with 116 additions and 88 deletions.
diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
@@ -50,13 +50,20 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "7.0.x"
+          include-prerelease: true        
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: "6.0.x"
           include-prerelease: true
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: "5.0.100"
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "3.1.x"          
 
       - name: Run tests ${{ matrix.test }}
         timeout-minutes: 15
@@ -74,12 +81,18 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
-          include-prerelease: true         
+          dotnet-version: "7.0.x"
+          include-prerelease: true
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "6.0.x"   
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: "5.0.x"
           source-url: https://nuget.pkg.github.com/asynkron/index.json
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "3.1.x"          
         env:
           NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}             
 

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -27,14 +27,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "7.0.x"
+          include-prerelease: true        
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: "6.0.x"
-          include-prerelease: true
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "5.0.100"
-
+          dotnet-version: "5.0.x"
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "3.1.x"
       - name: Build
         run: dotnet build ProtoActor.sln -c Release
 
@@ -73,14 +78,20 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "7.0.x"
+          include-prerelease: true        
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: "6.0.x"
-          include-prerelease: true
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: "5.0.x"
-
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "3.1.x"
+
       - name: Run tests ${{ matrix.test }}
         timeout-minutes: 7
         env:

diff --git a/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj b/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
         <OutputType>Exe</OutputType>
         <LangVersion>10</LangVersion>
         <RootNamespace>ClusterExperiment1</RootNamespace>

diff --git a/benchmarks/ClusterMicroBenchmarks/ClusterMicroBenchmarks.csproj b/benchmarks/ClusterMicroBenchmarks/ClusterMicroBenchmarks.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
 

diff --git a/benchmarks/GossipBenchmark/Messages/Messages.csproj b/benchmarks/GossipBenchmark/Messages/Messages.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.21.1" />

diff --git a/benchmarks/GossipBenchmark/Node1/Node1.csproj b/benchmarks/GossipBenchmark/Node1/Node1.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>

diff --git a/benchmarks/GossipBenchmark/Node2/Node2.csproj b/benchmarks/GossipBenchmark/Node2/Node2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>

diff --git a/benchmarks/HostedService/HostedService.csproj b/benchmarks/HostedService/HostedService.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/benchmarks/InprocessBenchmark/InprocessBenchmark.csproj b/benchmarks/InprocessBenchmark/InprocessBenchmark.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
-    <TargetFrameworks>net5.0;net6.0;netcoreapp3.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     <LangVersion>10</LangVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/benchmarks/KubernetesDiagnostics/KubernetesDiagnostics.csproj b/benchmarks/KubernetesDiagnostics/KubernetesDiagnostics.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     </PropertyGroup>
 

diff --git a/benchmarks/MailboxBenchmark/MailboxBenchmark.csproj b/benchmarks/MailboxBenchmark/MailboxBenchmark.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />

diff --git a/benchmarks/PingPongBenchmark/LocalPingPong.csproj b/benchmarks/PingPongBenchmark/LocalPingPong.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     <LangVersion>10</LangVersion>
   </PropertyGroup>
 

diff --git a/benchmarks/PropsBenchmark/PropsBenchmark.csproj b/benchmarks/PropsBenchmark/PropsBenchmark.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/benchmarks/ProtoActorBenchmarks/ProtoActorBenchmarks.csproj b/benchmarks/ProtoActorBenchmarks/ProtoActorBenchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     <LangVersion>10</LangVersion>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>

diff --git a/benchmarks/RemoteBenchmark/Messages/Messages.csproj b/benchmarks/RemoteBenchmark/Messages/Messages.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.21.1" />

diff --git a/benchmarks/RemoteBenchmark/Node1/Node1.csproj b/benchmarks/RemoteBenchmark/Node1/Node1.csproj
@@ -4,7 +4,7 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>
-    <TargetFrameworks>net5.0;net6.0;netcoreapp3.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/benchmarks/RemoteBenchmark/Node2/Node2.csproj b/benchmarks/RemoteBenchmark/Node2/Node2.csproj
@@ -4,7 +4,7 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>
-    <TargetFrameworks>net5.0;net6.0;netcoreapp3.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Proto.Actor\Proto.Actor.csproj" />

diff --git a/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj b/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj b/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/benchmarks/SpawnBenchmark/SpawnBenchmark.csproj b/benchmarks/SpawnBenchmark/SpawnBenchmark.csproj
@@ -4,7 +4,7 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>
-    <TargetFrameworks>net5.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />

diff --git a/examples/ActorMetrics/ActorMetrics.csproj b/examples/ActorMetrics/ActorMetrics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
 

diff --git a/examples/Chat/Client/Client.csproj b/examples/Chat/Client/Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     <LangVersion>10</LangVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/examples/Chat/Messages/Chat.Messages.csproj b/examples/Chat/Messages/Chat.Messages.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Grpc.Tools" Version="2.46.3" PrivateAssets="All" />

diff --git a/examples/Chat/Server/Server.csproj b/examples/Chat/Server/Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     <LangVersion>10</LangVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/examples/ClusterGrainHelloWorld/Messages/Messages.csproj b/examples/ClusterGrainHelloWorld/Messages/Messages.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.21.1" />

diff --git a/examples/ClusterGrainHelloWorld/Node1/Node1.csproj b/examples/ClusterGrainHelloWorld/Node1/Node1.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>

diff --git a/examples/ClusterGrainHelloWorld/Node2/Node2.csproj b/examples/ClusterGrainHelloWorld/Node2/Node2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <LangVersion>10</LangVersion>

diff --git a/examples/ClusterPubSub/ClusterPubSub.csproj b/examples/ClusterPubSub/ClusterPubSub.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/examples/ClusterPubSubBatchingProducer/ClusterPubSubBatchingProducer.csproj b/examples/ClusterPubSubBatchingProducer/ClusterPubSubBatchingProducer.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/examples/ContextDecorators/ContextDecorators.csproj b/examples/ContextDecorators/ContextDecorators.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj" />

diff --git a/examples/DeadLetterThrottling/DeadLetterThrottling.csproj b/examples/DeadLetterThrottling/DeadLetterThrottling.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/examples/DependencyInjection/DependencyInjection.csproj b/examples/DependencyInjection/DependencyInjection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
 

diff --git a/examples/EscalateSupervision/EscalateSupervision.csproj b/examples/EscalateSupervision/EscalateSupervision.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Proto.Actor\Proto.Actor.csproj"/>

diff --git a/examples/EventStream/EventStream.csproj b/examples/EventStream/EventStream.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
 

diff --git a/examples/EventStreamTopics/EventStreamTopics.csproj b/examples/EventStreamTopics/EventStreamTopics.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
 

diff --git a/examples/EventStreamTopicsCluster/EventStreamTopicsCluster.csproj b/examples/EventStreamTopicsCluster/EventStreamTopicsCluster.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
         <LangVersion>10</LangVersion>
     </PropertyGroup>