Compare commits

..

2 Commits

Author SHA1 Message Date
39201e561f feat: Улучшил детализацию логов Telegram
All checks were successful
Create and publish a Docker image / Publish image (push) Successful in 6m14s
2026-01-24 18:35:19 +03:00
98705d6bbd build: Обновил проекты до .NET 10
Перевел все проекты решения и связанные Docker-образы на целевую платформу .NET 10.
2026-01-24 18:34:49 +03:00
5 changed files with 12 additions and 5 deletions

View File

@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine3.22 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine3.22 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ./SfeduSchedule ./SfeduSchedule
@@ -7,7 +7,7 @@ WORKDIR /src/SfeduSchedule
RUN dotnet restore "SfeduSchedule.csproj"
RUN dotnet publish "SfeduSchedule.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS final
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS final
EXPOSE 8080
WORKDIR /app
COPY --from=build /app/publish .

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<OutputType>Library</OutputType>

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<AssemblyName>SfeduSchedule.Plugin.Sample.plugin</AssemblyName>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<!-- Кладём зависимости плагина рядом со сборкой, чтобы загрузчик их нашёл -->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

View File

@@ -66,6 +66,11 @@ builder.Logging.AddFilter("Quartz", LogLevel.Warning);
if (!string.IsNullOrEmpty(tgChatId) && !string.IsNullOrEmpty(tgToken))
builder.Logging.AddTelegram(options =>
{
options.FormatterConfiguration = new X.Extensions.Logging.Telegram.Base.Configuration.FormatterConfiguration
{
IncludeException = true,
IncludeProperties = true,
};
options.ChatId = tgChatId;
options.AccessToken = tgToken;
options.FormatterConfiguration.UseEmoji = true;
@@ -288,6 +293,8 @@ if (string.IsNullOrEmpty(preinstalledJwtToken))
await scheduler.TriggerJob(jobKey);
}
}
else
logger.LogInformation("Используем предустановленный токен из конфигурации");
app.UseSwagger();
app.UseSwaggerUI();

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>