Skip to content

Commit 6fa3ed5

Browse files
richoramarichorama
authored
Merge pull request #418 from OrleansContrib/dotnet8
Dotnet8
2 parents 9b9a87e + d01cb4f commit 6fa3ed5

File tree

15 files changed

+36
-32
lines changed

15 files changed

+36
-32
lines changed

‎.github/workflows/dotnetcore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup .NET Core
1414
uses: actions/setup-dotnet@v1
1515
with:
16-
dotnet-version: 7.0.100-rc.2.22477.23
16+
dotnet-version: 8.0.200
1717

1818
- name: Test
1919
run: |

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<PackageProjectUrl>https://github.com/OrleansContrib/OrleansDashboard</PackageProjectUrl>
1212
<PackageTags>orleans dashboard metrics monitor</PackageTags>
1313
<RepositoryUrl>https://github.com/OrleansContrib/OrleansDashboard</RepositoryUrl>
14-
<Version>7.2.2</Version>
14+
<Version>8.0.0</Version>
1515
</PropertyGroup>
1616
</Project>

‎OrleansDashboard.Core/Model/StatCounter.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace OrleansDashboard.Model
44
{
55
[GenerateSerializer]
6+
[Immutable]
67
public readonly struct StatCounter
78
{
89
[Id(0)]

‎OrleansDashboard.Core/OrleansDashboard.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<RootNamespace>OrleansDashboard</RootNamespace>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Orleans.Runtime" Version="7.2.0" />
10-
<PackageReference Include="Microsoft.Orleans.Sdk" Version="7.2.0" />
9+
<PackageReference Include="Microsoft.Orleans.Runtime" Version="8.0.0" />
10+
<PackageReference Include="Microsoft.Orleans.Sdk" Version="8.0.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎OrleansDashboard.EmbeddedAssets/OrleansDashboard.EmbeddedAssets.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎OrleansDashboard/BasicAuthMiddleware.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ internal sealed class BasicAuthMiddleware
1414
private const string BasicAuthorizationPrefix = "Basic ";
1515
private readonly RequestDelegate next;
1616
private readonly DashboardOptions options;
17+
internal static readonly string[] WWWAuthenticateHeaderValue = ["Basic realm=\"OrleansDashboard\""];
1718

1819
public BasicAuthMiddleware(RequestDelegate next, IOptions<DashboardOptions> options)
1920
{
@@ -42,7 +43,7 @@ public Task Invoke(HttpContext context)
4243

4344
context.Response.StatusCode = StatusCodes.Status401Unauthorized;
4445
context.Response.HttpContext.Features.Get<IHttpResponseFeature>().ReasonPhrase = ReasonPhrases.GetReasonPhrase(context.Response.StatusCode);
45-
context.Response.Headers.Add(HeaderNames.WWWAuthenticate, new[] { "Basic realm=\"OrleansDashboard\"" });
46+
context.Response.Headers[HeaderNames.WWWAuthenticate] = WWWAuthenticateHeaderValue;
4647

4748
return Task.CompletedTask;
4849
}

‎OrleansDashboard/OrleansDashboard.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -25,9 +25,9 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.Orleans.Reminders" Version="7.2.0" />
29-
<PackageReference Include="Microsoft.Orleans.Sdk" Version="7.2.0" />
30-
<PackageReference Include="OpenTelemetry" Version="1.5.1" />
28+
<PackageReference Include="Microsoft.Orleans.Reminders" Version="8.0.0" />
29+
<PackageReference Include="Microsoft.Orleans.Sdk" Version="8.0.0" />
30+
<PackageReference Include="OpenTelemetry" Version="1.7.0" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎OrleansDashboard/ServiceCollectionExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using Microsoft.AspNetCore.Builder;
3+
using Microsoft.AspNetCore.Http;
34
using Microsoft.Extensions.DependencyInjection;
45
using Microsoft.Extensions.DependencyInjection.Extensions;
56
using Microsoft.Extensions.Logging;
@@ -75,7 +76,7 @@ public static IApplicationBuilder UseOrleansDashboard(this IApplicationBuilder a
7576
else
7677
{
7778
// Make sure there is a leading slash
78-
if (!basePath.StartsWith("/"))
79+
if (!basePath.StartsWith('/'))
7980
{
8081
basePath = $"/{options.BasePath}";
8182
}

‎OrleansDashboard/SiloGrainService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private async Task CollectStatistics(bool canDeactivate)
7272
{
7373
var siloAddress = SiloAddress.FromParsableString(this.GetPrimaryKeyString());
7474

75-
var results = (await managementGrain.GetRuntimeStatistics(new[] {siloAddress})).FirstOrDefault();
75+
var results = (await managementGrain.GetRuntimeStatistics([siloAddress])).FirstOrDefault();
7676

7777
statistics.Enqueue(results);
7878

‎Tests/PerformanceTests/PerformanceTests.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
10+
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
11+
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
1112
</ItemGroup>
1213

1314
<ItemGroup>

0 commit comments

Comments
 (0)