Merge pull request #418 from OrleansContrib/dotnet8

Dotnet8
OrleansContrib · Feb 16, 2024 · 6fa3ed5 · 6fa3ed5
2 parents 9b9a87e + d01cb4f
commit 6fa3ed5
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 32 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 7.0.100-rc.2.22477.23
+        dotnet-version: 8.0.200
 
     - name: Test
       run: |

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,6 +11,6 @@
     <PackageProjectUrl>https://github.com/OrleansContrib/OrleansDashboard</PackageProjectUrl>
     <PackageTags>orleans dashboard metrics monitor</PackageTags>
     <RepositoryUrl>https://github.com/OrleansContrib/OrleansDashboard</RepositoryUrl>
-    <Version>7.2.2</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 </Project>
diff --git a/OrleansDashboard.Core/Model/StatCounter.cs b/OrleansDashboard.Core/Model/StatCounter.cs
@@ -3,6 +3,7 @@
 namespace OrleansDashboard.Model
 {
     [GenerateSerializer]
+    [Immutable]
     public readonly struct StatCounter
     {
         [Id(0)]

diff --git a/OrleansDashboard.Core/OrleansDashboard.Core.csproj b/OrleansDashboard.Core/OrleansDashboard.Core.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFramework>net7.0</TargetFramework>
+	<TargetFramework>net8.0</TargetFramework>
     <RootNamespace>OrleansDashboard</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Runtime" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.2.0" />
+    <PackageReference Include="Microsoft.Orleans.Runtime" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Sdk" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/OrleansDashboard.EmbeddedAssets/OrleansDashboard.EmbeddedAssets.csproj b/OrleansDashboard.EmbeddedAssets/OrleansDashboard.EmbeddedAssets.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/OrleansDashboard/BasicAuthMiddleware.cs b/OrleansDashboard/BasicAuthMiddleware.cs
@@ -14,6 +14,7 @@ internal sealed class BasicAuthMiddleware
     private const string BasicAuthorizationPrefix = "Basic ";
     private readonly RequestDelegate next;
     private readonly DashboardOptions options;
+    internal static readonly string[] WWWAuthenticateHeaderValue = ["Basic realm=\"OrleansDashboard\""];
 
     public BasicAuthMiddleware(RequestDelegate next, IOptions<DashboardOptions> options)
     {
@@ -42,7 +43,7 @@ public Task Invoke(HttpContext context)
 
         context.Response.StatusCode = StatusCodes.Status401Unauthorized;
         context.Response.HttpContext.Features.Get<IHttpResponseFeature>().ReasonPhrase = ReasonPhrases.GetReasonPhrase(context.Response.StatusCode);
-        context.Response.Headers.Add(HeaderNames.WWWAuthenticate, new[] { "Basic realm=\"OrleansDashboard\"" });
+        context.Response.Headers[HeaderNames.WWWAuthenticate] = WWWAuthenticateHeaderValue;
 
         return Task.CompletedTask;
     }

diff --git a/OrleansDashboard/OrleansDashboard.csproj b/OrleansDashboard/OrleansDashboard.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,9 +25,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Reminders" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.2.0" />
-    <PackageReference Include="OpenTelemetry" Version="1.5.1" />
+    <PackageReference Include="Microsoft.Orleans.Reminders" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Sdk" Version="8.0.0" />
+    <PackageReference Include="OpenTelemetry" Version="1.7.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/OrleansDashboard/ServiceCollectionExtensions.cs b/OrleansDashboard/ServiceCollectionExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
@@ -75,7 +76,7 @@ public static IApplicationBuilder UseOrleansDashboard(this IApplicationBuilder a
             else
             {
                 // Make sure there is a leading slash                
-                if (!basePath.StartsWith("/"))
+                if (!basePath.StartsWith('/'))
                 {
                     basePath = $"/{options.BasePath}";
                 }

diff --git a/OrleansDashboard/SiloGrainService.cs b/OrleansDashboard/SiloGrainService.cs
@@ -72,7 +72,7 @@ private async Task CollectStatistics(bool canDeactivate)
             {
                 var siloAddress = SiloAddress.FromParsableString(this.GetPrimaryKeyString());
 
-                var results = (await managementGrain.GetRuntimeStatistics(new[] {siloAddress})).FirstOrDefault();
+                var results = (await managementGrain.GetRuntimeStatistics([siloAddress])).FirstOrDefault();
 
                 statistics.Enqueue(results);
 

diff --git a/Tests/PerformanceTests/PerformanceTests.csproj b/Tests/PerformanceTests/PerformanceTests.csproj
@@ -2,12 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	  <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/TestGrains/TestGrains.csproj b/Tests/TestGrains/TestGrains.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFramework>net7.0</TargetFramework>
+	<TargetFramework>net8.0</TargetFramework>
 	<IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Core" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Orleans.Reminders" Version="7.2.0" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Reminders" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/TestHosts/TestHost/TestHost.csproj b/Tests/TestHosts/TestHost/TestHost.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	  <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Client" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Orleans.Persistence.Memory" Version="7.2.0" />
+    <PackageReference Include="Microsoft.Orleans.Client" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Persistence.Memory" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/TestHosts/TestHostCohosted2/TestHostCohosted2.csproj b/Tests/TestHosts/TestHostCohosted2/TestHostCohosted2.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	  <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Client" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Orleans.Persistence.Memory" Version="7.2.0" />
+    <PackageReference Include="Microsoft.Orleans.Client" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Persistence.Memory" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/TestHosts/TestHostSeparate/TestHostSeparate.csproj b/Tests/TestHosts/TestHostSeparate/TestHostSeparate.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	  <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Client" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Orleans.Persistence.Memory" Version="7.2.0" />
+    <PackageReference Include="Microsoft.Orleans.Client" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Persistence.Memory" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/UnitTests/UnitTests.csproj b/Tests/UnitTests/UnitTests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	  <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="Microsoft.Orleans.TestingHost" Version="7.2.0" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.Orleans.TestingHost" Version="8.0.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>