Skip to content

Commit f0289e5

Browse files
author
Chris Gårdenberg
committed
refactor: .NET 8 migration
1 parent b01ef3a commit f0289e5

File tree

11 files changed

+46
-33
lines changed

11 files changed

+46
-33
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v1
12+
- uses: actions/checkout@v3
1313
- name: Build Opserver Docker Image
1414
run: |
1515
docker build --tag opserver/opserver-ci:latest --target web .

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- name: Setup .NET
1010
uses: actions/setup-dotnet@v1
1111
with:
12-
dotnet-version: 6.0.x
13-
- uses: actions/checkout@v1
12+
dotnet-version: 8.0.x
13+
- uses: actions/checkout@v3
1414
- name: Build with dotnet
1515
run: dotnet build

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
22
WORKDIR /app
33

44
# Global
@@ -22,7 +22,7 @@ WORKDIR /app/src/Opserver.Web
2222
RUN dotnet publish -c Release -o publish
2323

2424
# Build runtime image
25-
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS web
25+
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS web
2626
WORKDIR /app
2727
COPY --from=web-publish /app/src/Opserver.Web/publish ./
2828
ENTRYPOINT ["dotnet", "Opserver.Web.dll"]

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
image: Visual Studio 2019
22

33
install:
4-
- choco install dotnet-sdk --version 6.0.100
4+
- choco install dotnet-sdk --version 8.0.100
55

66
skip_branch_with_pr: true
77
skip_tags: true

‎src/Opserver.Core/Helpers/OpserverConfigException.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ public class OpserverConfigException : Exception
88
public OpserverConfigException() { }
99
public OpserverConfigException(string message) : base(message) { }
1010
public OpserverConfigException(string message, Exception innerException) : base(message, innerException) { }
11-
protected OpserverConfigException(SerializationInfo info, StreamingContext context) : base(info, context) { }
11+
protected OpserverConfigException(SerializationInfo info, StreamingContext context) { }
1212
}
1313
}

‎src/Opserver.Core/Opserver.Core.csproj‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,34 @@
22
<PropertyGroup>
33
<RootNamespace>Opserver</RootNamespace>
44
<AssemblyName>Opserver.Core</AssemblyName>
5-
<TargetFrameworks>net6.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
66
<DebugSymbols>true</DebugSymbols>
77
<DebugType>embedded</DebugType>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Dapper" Version="2.0.123" />
11-
<PackageReference Include="Enums.NET" Version="4.0.0" />
10+
<PackageReference Include="Dapper" Version="2.1.22" />
11+
<PackageReference Include="Enums.NET" Version="4.0.1" />
1212
<PackageReference Include="Jil" Version="2.17.0" />
13-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
17-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
18-
<PackageReference Include="MiniProfiler.Shared" Version="4.3.8" />
13+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
17+
<PackageReference Include="Microsoft.Net.Http.Headers" Version="8.0.0" />
18+
<PackageReference Include="MiniProfiler.Shared" Version="4.3.13" />
1919
<PackageReference Include="Sigil" Version="5.0.0" />
20-
<PackageReference Include="StackExchange.Exceptional.Shared" Version="2.2.32" />
21-
<PackageReference Include="StackExchange.Redis" Version="2.6.122" />
20+
<PackageReference Include="StackExchange.Exceptional.Shared" Version="2.2.35" />
21+
<PackageReference Include="StackExchange.Redis" Version="2.7.4" />
2222
<PackageReference Include="StackExchange.Utils.Http" Version="0.3.48" />
2323
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
24-
<PackageReference Include="System.DirectoryServices" Version="6.0.0" />
25-
<PackageReference Include="System.Management" Version="6.0.0" />
26-
<PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
24+
<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
25+
<PackageReference Include="System.Management" Version="8.0.0" />
26+
<PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<Compile Update="Data\SQL\QueryPlans\ShowPlanXML.cs" SubType="Code" />
3030
<Compile Update="Data\SQL\QueryPlans\ShowPlanXML.generated.cs" SubType="Code" />
3131
</ItemGroup>
32+
<ItemGroup>
33+
<PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
34+
</ItemGroup>
3235
</Project>

‎src/Opserver.Web/Opserver.Web.csproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
44
<RootNamespace>Opserver</RootNamespace>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77
<ItemGroup>
88
<ProjectReference Include="..\Opserver.Core\Opserver.Core.csproj" />
99
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" PrivateAssets="all" />
1010
<PackageReference Include="BuildWebCompiler" Condition="'$(OS)' == 'Windows_NT'" Version="1.12.405" PrivateAssets="all" />
11-
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
12-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.15.0" />
13-
<PackageReference Include="StackExchange.Exceptional.AspNetCore" Version="2.2.32" />
14-
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="6.0.0" />
11+
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.13" />
12+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.0.3" />
13+
<PackageReference Include="StackExchange.Exceptional.AspNetCore" Version="2.2.35" />
14+
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.0" />
1515
<Reference Include="System.Management" />
1616
</ItemGroup>
1717
<ItemGroup>
@@ -23,4 +23,7 @@
2323
<None Include="Config\*.example.json" />
2424
<None Include="compilerconfig.json" />
2525
</ItemGroup>
26+
<ItemGroup>
27+
<PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
28+
</ItemGroup>
2629
</Project>

‎src/Opserver.Web/Startup.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Text.RegularExpressions;
77
using Microsoft.AspNetCore.Authentication.Cookies;
88
using Microsoft.AspNetCore.Builder;
9-
using Microsoft.AspNetCore.HttpOverrides;
109
using Microsoft.AspNetCore.ResponseCompression;
1110
using Microsoft.Extensions.Configuration;
1211
using Microsoft.Extensions.DependencyInjection;
@@ -158,7 +157,7 @@ public void ConfigureServices(IServiceCollection services)
158157
foreach (var knownNetwork in knownNetworks)
159158
{
160159
var ipNet = IPNet.Parse(knownNetwork);
161-
options.KnownNetworks.Add(new IPNetwork(ipNet.IPAddress, ipNet.CIDR));
160+
options.KnownNetworks.Add(new Microsoft.AspNetCore.HttpOverrides.IPNetwork(ipNet.IPAddress, ipNet.CIDR));
162161
}
163162
}
164163
}

‎src/Opserver.Web/wwwroot/Content/themes/dark.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Opserver.Web/wwwroot/Content/themes/light.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)