Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ef9a825dc2 | |||
| 8b4792cb5c | |||
| 8a16658dfe |
@@ -8,7 +8,7 @@ variables:
|
|||||||
|
|
||||||
build:
|
build:
|
||||||
stage: build
|
stage: build
|
||||||
image: mcr.microsoft.com/dotnet/sdk:9.0
|
image: mcr.microsoft.com/dotnet/sdk:10.0
|
||||||
script:
|
script:
|
||||||
- dotnet restore
|
- dotnet restore
|
||||||
- dotnet build --configuration Release --no-restore
|
- dotnet build --configuration Release --no-restore
|
||||||
@@ -19,7 +19,7 @@ build:
|
|||||||
|
|
||||||
test:
|
test:
|
||||||
stage: test
|
stage: test
|
||||||
image: mcr.microsoft.com/dotnet/sdk:9.0
|
image: mcr.microsoft.com/dotnet/sdk:10.0
|
||||||
script:
|
script:
|
||||||
- dotnet test --verbosity normal
|
- dotnet test --verbosity normal
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -29,6 +29,8 @@ publish:
|
|||||||
stage: publish
|
stage: publish
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
|
before_script:
|
||||||
|
- git lfs pull
|
||||||
script:
|
script:
|
||||||
- export VERSION=$(echo $CI_COMMIT_TAG | sed 's/^v//')
|
- export VERSION=$(echo $CI_COMMIT_TAG | sed 's/^v//')
|
||||||
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin registry.leon-hoppe.de
|
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin registry.leon-hoppe.de
|
||||||
|
|||||||
7
global.json
Normal file
7
global.json
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"sdk": {
|
||||||
|
"version": "10.0.0",
|
||||||
|
"rollForward": "latestMajor",
|
||||||
|
"allowPrerelease": true
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,10 +8,10 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0" />
|
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.0.2" />
|
||||||
<PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="9.0.0" />
|
<PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="13.0.2" />
|
||||||
<PackageReference Include="HopFrame.Web" Version="3.1.0" />
|
<PackageReference Include="HopFrame.Web" Version="3.2.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0"/>
|
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.11" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
using HopFrame.Core.Config;
|
|
||||||
using HopFrame.Web;
|
using HopFrame.Web;
|
||||||
using Portfolio.Api;
|
using Portfolio.Api;
|
||||||
using Portfolio.Api.Services;
|
using Portfolio.Api.Services;
|
||||||
@@ -31,25 +30,8 @@ builder.Services.AddHopFrame(options => {
|
|||||||
options.DisplayUserInfo(false);
|
options.DisplayUserInfo(false);
|
||||||
options.AddDbContext<DatabaseContext>(context => {
|
options.AddDbContext<DatabaseContext>(context => {
|
||||||
context.Table<Project>(table => {
|
context.Table<Project>(table => {
|
||||||
var langConfig = table.InnerConfig.Properties
|
|
||||||
.Single(prop => prop.Name == nameof(Project.Languages));
|
|
||||||
|
|
||||||
langConfig
|
|
||||||
.GetType()!
|
|
||||||
.GetProperty(nameof(PropertyConfig.IsRelation))!
|
|
||||||
.SetValue(langConfig, true);
|
|
||||||
|
|
||||||
langConfig
|
|
||||||
.GetType()!
|
|
||||||
.GetProperty(nameof(PropertyConfig.IsEnumerable))!
|
|
||||||
.SetValue(langConfig, true);
|
|
||||||
|
|
||||||
langConfig
|
|
||||||
.GetType()!
|
|
||||||
.GetProperty(nameof(PropertyConfig.IsRequired))!
|
|
||||||
.SetValue(langConfig, true);
|
|
||||||
|
|
||||||
table.Property(p => p.Languages)
|
table.Property(p => p.Languages)
|
||||||
|
.ForceRelation(isEnumerable: true)
|
||||||
.FormatEach<Technology>((l, _) => l.Name)
|
.FormatEach<Technology>((l, _) => l.Name)
|
||||||
.List(false);
|
.List(false);
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<IsAspireHost>true</IsAspireHost>
|
<IsAspireHost>true</IsAspireHost>
|
||||||
@@ -12,9 +12,9 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0"/>
|
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.0.2" />
|
||||||
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.0.0" />
|
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="13.0.2" />
|
||||||
<PackageReference Include="Aspire.Hosting.Redis" Version="9.0.0" />
|
<PackageReference Include="Aspire.Hosting.Redis" Version="13.0.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -10,13 +10,13 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
|
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
|
||||||
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0"/>
|
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0"/>
|
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.1.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0"/>
|
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0"/>
|
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0"/>
|
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0"/>
|
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0"/>
|
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
|
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
|
||||||
USER $APP_UID
|
USER $APP_UID
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
EXPOSE 8081
|
EXPOSE 8081
|
||||||
|
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
|
||||||
ARG BUILD_CONFIGURATION=Release
|
ARG BUILD_CONFIGURATION=Release
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||||
|
|||||||
Reference in New Issue
Block a user