Skip to content

Commit 4bbabf3

Browse files
committed
.NET 9
1 parent babcbee commit 4bbabf3

38 files changed

+37
-3827
lines changed

.github/workflows/build.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v3
19-
- uses: actions/setup-node@master
19+
#- uses: actions/setup-node@master
2020

21-
- name: npm install
22-
working-directory: ./dashboard
23-
run: npm install
21+
#- name: npm install
22+
# working-directory: ./dashboard
23+
# run: npm install
2424

25-
- name: npm build
26-
working-directory: ./dashboard
27-
run: npm run build
25+
#- name: npm build
26+
# working-directory: ./dashboard
27+
# run: npm run build
2828

29-
- name: copy vue dist to aspnetcore
30-
run: cp -Rf ./dashboard/dist/* ./Core.TaskProcessor.Dashboard/static/
29+
#- name: copy vue dist to aspnetcore
30+
# run: cp -Rf ./dashboard/dist/* ./Core.TaskProcessor.Dashboard/static/
3131

3232
- name: dotnet
3333
uses: actions/setup-dotnet@v3
3434
with:
35-
dotnet-version: 8.x
35+
dotnet-version: 9.x
3636

3737
- name: build
3838
run: dotnet build --configuration Release

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup
1717
uses: actions/setup-dotnet@v3
1818
with:
19-
dotnet-version: 8.x
19+
dotnet-version: 9.x
2020

2121
- name: Build Version
2222
id: vars
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
find: "<Version>.*<\\/Version>"
2929
replace: "${{ steps.vars.outputs.VERSION }}"
30-
include: "**/Core.TaskProcessor.csproj"
30+
include: "**/Core.Observability.csproj"
3131
regex: true
3232

3333
- name: Build

Core.TaskProcessor.Dashboard/Core.TaskProcessor.Dashboard.csproj

-20
This file was deleted.

Core.TaskProcessor.Dashboard/TaskProcessorDashboardExtensions.cs

-79
This file was deleted.

Core.TaskProcessor.Dashboard/static/index.html

-8
This file was deleted.

Core.TaskProcessor.SampleWebApi/Core.TaskProcessor.SampleWebApi.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
12-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
12+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
13+
<PackageReference Include="Scalar.AspNetCore" Version="1.2.35" />
1314
</ItemGroup>
1415

1516
<ItemGroup>
16-
<ProjectReference Include="..\Core.TaskProcessor.Dashboard\Core.TaskProcessor.Dashboard.csproj" />
1717
<ProjectReference Include="..\Core.TaskProcessor\Core.TaskProcessor.csproj" />
1818
</ItemGroup>
1919

Core.TaskProcessor.SampleWebApi/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base
22
RUN apk --no-cache add tzdata
33
WORKDIR /app
4-
EXPOSE 80
4+
EXPOSE 8080
55

6-
FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
6+
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
77
WORKDIR /src
88
COPY ["Core.TaskProcessor.SampleWebApi/Core.TaskProcessor.SampleWebApi.csproj", "Core.TaskProcessor.SampleWebApi/"]
99
RUN dotnet restore "Core.TaskProcessor.SampleWebApi/Core.TaskProcessor.SampleWebApi.csproj"

Core.TaskProcessor.SampleWebApi/Program.cs

+4-16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using Core.TaskProcessor;
2-
using Core.TaskProcessor.Dashboard;
32
using Core.TaskProcessor.SampleWebApi.Services;
3+
using Scalar.AspNetCore;
44

55
var builder = WebApplication.CreateBuilder(args);
66

77
builder.Services.AddControllers();
8-
builder.Services.AddEndpointsApiExplorer();
9-
builder.Services.AddSwaggerGen();
8+
builder.Services.AddOpenApi();
109

1110
builder.Services.AddTaskProcessor(new TaskProcessorOptions
1211
{
@@ -21,31 +20,20 @@
2120
UseHostedService = true,
2221
UseCronSeconds = true
2322
});
24-
builder.Services.AddTaskProcessorDashboard(new TaskProcessorDashboardOptions
25-
{
26-
27-
});
2823

2924
builder.Services.AddScoped<ISomeScopedService, SomeScopedService>();
3025

31-
builder.Services.AddAuthorizationBuilder()
32-
.AddPolicy("taskprocessor_admin", policy =>
33-
policy
34-
.RequireRole("taskprocessor"));
35-
36-
3726
var app = builder.Build();
3827

3928
if (app.Environment.IsDevelopment())
4029
{
41-
app.UseSwagger();
42-
app.UseSwaggerUI();
30+
app.MapOpenApi();
31+
app.MapScalarApiReference();
4332
}
4433

4534
app.UseAuthorization();
4635

4736
app.MapControllers();
48-
app.MapTaskProcessorDashboard();
4937

5038
{
5139
var proc = app.Services.GetRequiredService<ITaskProcessor>();

Core.TaskProcessor.Tests/Core.TaskProcessor.Tests.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
14-
<PackageReference Include="xunit" Version="2.6.6" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
12+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
14+
<PackageReference Include="xunit" Version="2.9.2" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
19-
<PackageReference Include="coverlet.collector" Version="6.0.0">
19+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>

Core.TaskProcessor.sln

-6
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.TaskProcessor.Tests",
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.TaskProcessor.SampleWebApi", "Core.TaskProcessor.SampleWebApi\Core.TaskProcessor.SampleWebApi.csproj", "{A37C75D6-DD7A-4368-BAA0-CF6ACCAD8C8A}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.TaskProcessor.Dashboard", "Core.TaskProcessor.Dashboard\Core.TaskProcessor.Dashboard.csproj", "{95F89C4F-A7D8-4177-BC64-EF15E73D9229}"
13-
EndProject
1412
Global
1513
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1614
Debug|Any CPU = Debug|Any CPU
@@ -29,10 +27,6 @@ Global
2927
{A37C75D6-DD7A-4368-BAA0-CF6ACCAD8C8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
3028
{A37C75D6-DD7A-4368-BAA0-CF6ACCAD8C8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
3129
{A37C75D6-DD7A-4368-BAA0-CF6ACCAD8C8A}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{95F89C4F-A7D8-4177-BC64-EF15E73D9229}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{95F89C4F-A7D8-4177-BC64-EF15E73D9229}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{95F89C4F-A7D8-4177-BC64-EF15E73D9229}.Release|Any CPU.ActiveCfg = Release|Any CPU
35-
{95F89C4F-A7D8-4177-BC64-EF15E73D9229}.Release|Any CPU.Build.0 = Release|Any CPU
3630
EndGlobalSection
3731
GlobalSection(SolutionProperties) = preSolution
3832
HideSolutionNode = FALSE
+7-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<Authors>Andreas Dominik Jung</Authors>
@@ -22,27 +22,18 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Cronos" Version="0.8.2" />
26-
<PackageReference Include="StackExchange.Redis" Version="2.7.17" />
25+
<PackageReference Include="Cronos" Version="0.8.4" />
26+
<PackageReference Include="StackExchange.Redis" Version="2.8.16" />
2727
</ItemGroup>
28-
29-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
30-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
32-
</ItemGroup>
33-
34-
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
35-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
36-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
37-
</ItemGroup>
3828

3929
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
4030
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
4131
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
4232
</ItemGroup>
4333

44-
<ItemGroup>
45-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
46-
</ItemGroup>
34+
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
35+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
37+
</ItemGroup>
4738

4839
</Project>

dashboard/.browserslistrc

-4
This file was deleted.

dashboard/.editorconfig

-5
This file was deleted.

dashboard/.eslintrc.js

-14
This file was deleted.

dashboard/.gitignore

-23
This file was deleted.

0 commit comments

Comments
 (0)