CrazyHackGUT/telegram-bot
1
0
Fork 0
mirror of https://github.com/Bubuni-Team/telegram-bot.git synced 2026-07-31 00:29:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from CrazyHackGUT/net6

Browse Source 
.NET 6 Migration
This commit is contained in:
Kruzya
2022-01-10 10:35:18 +03:00
committed by GitHub
parent 60f6a639b6 a9deb52953
commit 611b277a5b
12 changed files with 33 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-image.yml
+8 -6
View File
@@ -2,8 +2,6 @@
on: on:
push: push:
branches:
- 'dev'
jobs: jobs:
docker: docker:
@@ -27,11 +25,15 @@ jobs:
registry: ${{ secrets.REGISTRY_URL }} registry: ${{ secrets.REGISTRY_URL }}
username: ${{ secrets.REGISTRY_USERNAME }} username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}
-
name: Get short commit SHA
id: commit_sha
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- -
name: Build and push name: Build and push
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . platforms: linux/amd64,linux/arm64
file: docker/Dockerfile.amd64 push: ${{ github.ref == 'refs/heads/dev' }}
push: true tags: ${{ secrets.REGISTRY_URL }}/west/telegram-bot:latest,
tags: ${{ secrets.REGISTRY_URL }}/west/telegram-bot:latest,${{ secrets.REGISTRY_URL }}/west/telegram-bot:${{ github.sha }} ${{ secrets.REGISTRY_URL }}/west/telegram-bot:${{ steps.commit_sha.outputs.sha_short }}
Core/Core.csproj
+7 -7
View File
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<AssemblyName>TelegramBot</AssemblyName> <AssemblyName>TelegramBot</AssemblyName>
<RootNamespace>Kruzya.TelegramBot.Core</RootNamespace> <RootNamespace>Kruzya.TelegramBot.Core</RootNamespace>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Core' " /> <PropertyGroup Condition=" '$(RunConfiguration)' == 'Core' " />
<ItemGroup> <ItemGroup>
<PackageReference Include="AleXr64.BotFramework" Version="0.6.5-g35decc8b27" /> <PackageReference Include="AleXr64.BotFramework" Version="0.6.8-g0882b76d16" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.13"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.13" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.13" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.3" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
docker/Dockerfile.amd64 → Dockerfile
+3 -3
View File
@@ -1,5 +1,5 @@
# Build a project # Build a project
FROM mcr.microsoft.com/dotnet/sdk:5.0.404-alpine3.14-amd64 AS build FROM mcr.microsoft.com/dotnet/sdk:6.0.101-alpine3.14 AS build
WORKDIR /source WORKDIR /source
# Copy project and perform restoring # Copy project and perform restoring
@@ -23,7 +23,7 @@ RUN dotnet publish -c release -o /app --no-restore Kruzya.TelegramBot.sln && \
rm -f /app/TelegramBot.*.dll /app/TelegramBot.*.pdb rm -f /app/TelegramBot.*.dll /app/TelegramBot.*.pdb
# Now reuse image with only runtime # Now reuse image with only runtime
FROM mcr.microsoft.com/dotnet/aspnet:5.0.13-alpine3.14-amd64 FROM mcr.microsoft.com/dotnet/aspnet:6.0.1-alpine3.14
WORKDIR /user WORKDIR /user
COPY --from=build /app /app COPY --from=build /app /app
docker/Dockerfile.aarch64
-44
View File
@@ -1,44 +0,0 @@
# Build a project
FROM mcr.microsoft.com/dotnet/sdk:5.0.404-buster-slim-arm64v8 AS build
WORKDIR /source
# Copy project and perform restoring
COPY Kruzya.TelegramBot.sln ./
COPY ./Core/*.csproj ./Core/
COPY ./tests/*.csproj ./tests/
COPY ./modules/CombotAntiSpam/*.csproj ./modules/CombotAntiSpam/
COPY ./modules/Destiny2.WhereIsXur/*.csproj ./modules/Destiny2.WhereIsXur/
COPY ./modules/RichSiteSummary/*.csproj ./modules/RichSiteSummary/
COPY ./modules/UrlLimitations/*.csproj ./modules/UrlLimitations/
COPY ./modules/ChatManagement/*.csproj ./modules/ChatManagement/
COPY ./modules/Entertainment/*.csproj ./modules/Entertainment/
COPY ./modules/UserGroupTag/*.csproj ./modules/UserGroupTag/
RUN dotnet restore Kruzya.TelegramBot.sln
# Copy all project files
COPY . .
RUN dotnet publish -c release -o /app --no-restore Kruzya.TelegramBot.sln && \
mkdir /app/modules && \
cp /app/TelegramBot.*.dll /app/modules/ && \
rm -f /app/TelegramBot.*.dll /app/TelegramBot.*.pdb
# Now reuse image with only runtime
FROM mcr.microsoft.com/dotnet/aspnet:5.0.13-alpine3.14-arm64v8
WORKDIR /user
COPY --from=build /app /app
ENV MUSL_LOCPATH /usr/share/i18n/locales/musl
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
RUN apk add --no-cache cmake make musl-dev gcc gettext-dev libintl icu-libs \
&& wget https://gitlab.com/rilian-la-te/musl-locales/-/archive/master/musl-locales-master.zip \
&& unzip musl-locales-master.zip \
&& cd musl-locales-master \
&& cmake -DLOCALE_PROFILE=OFF -D CMAKE_INSTALL_PREFIX:PATH=/usr . && make && make install \
&& cd .. && rm -r musl-locales-master
ENV LANG ru_RU.UTF-8
ENV LANGUAGE ru_RU.UTF-8
ENV LC_ALL ru_RU.UTF-8
ENTRYPOINT ["dotnet", "/app/TelegramBot.dll"]
modules/ChatManagement/ChatManagement.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<AssemblyName>TelegramBot.ChatManagement</AssemblyName> <AssemblyName>TelegramBot.ChatManagement</AssemblyName>
<RootNamespace>West.TelegramBot.ChatManagement</RootNamespace> <RootNamespace>West.TelegramBot.ChatManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>
modules/CombotAntiSpam/CombotAntiSpam.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<AssemblyName>TelegramBot.CombotAntiSpam</AssemblyName> <AssemblyName>TelegramBot.CombotAntiSpam</AssemblyName>
<RootNamespace>Kruzya.TelegramBot.CombotAntiSpam</RootNamespace> <RootNamespace>Kruzya.TelegramBot.CombotAntiSpam</RootNamespace>
</PropertyGroup> </PropertyGroup>
modules/Destiny2.WhereIsXur/Destiny2.WhereIsXur.csproj
+3 -3
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<AssemblyName>TelegramBot.D2_WhereIsXur</AssemblyName> <AssemblyName>TelegramBot.D2_WhereIsXur</AssemblyName>
<RootNamespace>Kruzya.TelegramBot.Destiny2.WhereIsXur</RootNamespace> <RootNamespace>Kruzya.TelegramBot.Destiny2.WhereIsXur</RootNamespace>
</PropertyGroup> </PropertyGroup>
@@ -11,8 +11,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Fizzler.Systems.HtmlAgilityPack" Version="1.2.0" /> <PackageReference Include="Fizzler.Systems.HtmlAgilityPack" Version="1.2.1" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.21" /> <PackageReference Include="HtmlAgilityPack" Version="1.11.39" />
</ItemGroup> </ItemGroup>
</Project> </Project>
modules/Entertainment/Entertainment.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<AssemblyName>TelegramBot.Entertainment</AssemblyName> <AssemblyName>TelegramBot.Entertainment</AssemblyName>
<RootNamespace>West.Entertainment</RootNamespace> <RootNamespace>West.Entertainment</RootNamespace>
</PropertyGroup> </PropertyGroup>
modules/RichSiteSummary/RichSiteSummary.csproj
+2 -2
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<AssemblyName>TelegramBot.RichSiteSummary</AssemblyName> <AssemblyName>TelegramBot.RichSiteSummary</AssemblyName>
<RootNamespace>Kruzya.TelegramBot.RichSiteSummary</RootNamespace> <RootNamespace>Kruzya.TelegramBot.RichSiteSummary</RootNamespace>
</PropertyGroup> </PropertyGroup>
@@ -11,7 +11,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CodeHollow.FeedReader" Version="1.2.1" /> <PackageReference Include="CodeHollow.FeedReader" Version="1.2.2" />
</ItemGroup> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">
modules/UrlLimitations/UrlLimitations.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<AssemblyName>TelegramBot.UrlLimitations</AssemblyName> <AssemblyName>TelegramBot.UrlLimitations</AssemblyName>
<RootNamespace>Kruzya.TelegramBot.UrlLimitations</RootNamespace> <RootNamespace>Kruzya.TelegramBot.UrlLimitations</RootNamespace>
</PropertyGroup> </PropertyGroup>
modules/UserGroupTag/UserGroupTag.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<AssemblyName>TelegramBot.UserGroupTag</AssemblyName> <AssemblyName>TelegramBot.UserGroupTag</AssemblyName>
</PropertyGroup> </PropertyGroup>
tests/Tests.csproj
+4 -4
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
@@ -11,9 +11,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="nunit" Version="3.12.0" /> <PackageReference Include="nunit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" /> <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211130-02" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>