serega404/SfeduSchedule
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Compare commits

base: serega404:ba54deab11540392548905cbc751503070e23229
Branches Tags
serega404:main
...
compare: serega404:39201e561ffdc9192ca24cbab7c8ee7cf3626734
Branches Tags
serega404:main

2 Commits
ba54deab11 ... 39201e561f

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

4
Dockerfile
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 ARG BUILD_CONFIGURATION=Release
WORKDIR /src WORKDIR /src
COPY ./SfeduSchedule ./SfeduSchedule COPY ./SfeduSchedule ./SfeduSchedule
@@ -7,7 +7,7 @@ WORKDIR /src/SfeduSchedule
RUN dotnet restore "SfeduSchedule.csproj" RUN dotnet restore "SfeduSchedule.csproj"
RUN dotnet publish "SfeduSchedule.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false 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 EXPOSE 8080
WORKDIR /app WORKDIR /app
COPY --from=build /app/publish . COPY --from=build /app/publish .

2
ModeusSchedule.Abstractions/ModeusSchedule.Abstractions.csproj
View File

@@ -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>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>

2
SfeduSchedule.Plugin.Sample/SfeduSchedule.Plugin.Sample.csproj
View File

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

7
SfeduSchedule/Program.cs
View File

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

2
SfeduSchedule/SfeduSchedule.csproj
View File

@@ -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>