mirror of
https://gitlab.com/Kwoth/nadekobot.git
synced 2025-09-10 09:18:27 -04:00
Some work on docker support. Source generator is failing with a weird error. Updated readme and changelog
This commit is contained in:
@@ -5,6 +5,8 @@
|
|||||||
!src/NadekoBot/**
|
!src/NadekoBot/**
|
||||||
# Use NadekoBot.Coordinator project
|
# Use NadekoBot.Coordinator project
|
||||||
!src/NadekoBot.Coordinator/**
|
!src/NadekoBot.Coordinator/**
|
||||||
|
# Use Generators project
|
||||||
|
!src/NadekoBot.Generators/**
|
||||||
# Use Ayu stuff
|
# Use Ayu stuff
|
||||||
!src/ayu/**
|
!src/ayu/**
|
||||||
|
|
||||||
|
@@ -3,6 +3,7 @@ WORKDIR /source
|
|||||||
|
|
||||||
COPY src/NadekoBot/*.csproj src/NadekoBot/
|
COPY src/NadekoBot/*.csproj src/NadekoBot/
|
||||||
COPY src/NadekoBot.Coordinator/*.csproj src/NadekoBot.Coordinator/
|
COPY src/NadekoBot.Coordinator/*.csproj src/NadekoBot.Coordinator/
|
||||||
|
COPY src/NadekoBot.Generators/*.csproj src/NadekoBot.Generators/
|
||||||
COPY src/ayu/Ayu.Discord.Voice/*.csproj src/ayu/Ayu.Discord.Voice/
|
COPY src/ayu/Ayu.Discord.Voice/*.csproj src/ayu/Ayu.Discord.Voice/
|
||||||
RUN dotnet restore src/NadekoBot/
|
RUN dotnet restore src/NadekoBot/
|
||||||
|
|
||||||
|
23
README.md
23
README.md
@@ -1,24 +1,5 @@
|
|||||||
# :warning: Experimental Branch. Things will break. :warning:
|
|
||||||
|
|
||||||
## Migration from 2.x
|
## Migration from 2.x
|
||||||
|
|
||||||
:warning: You **MUST** update to latest version of 2.x and **run your bot at least once** before switching over to v3
|
:warning: If you're already hosting NadekoBot, You **MUST** update to latest version of 2.x and **run your bot at least once** before switching over to v3
|
||||||
|
|
||||||
## Changes
|
## Installation
|
||||||
|
|
||||||
- Code cleanup
|
|
||||||
- Command attributes cleaned up
|
|
||||||
- Removed dummy Remarks and Usages attributes
|
|
||||||
- They were unused for a few patches but stayed in the code to avoid big git diffs
|
|
||||||
- All database migrations and data (json file) migrations have been removed
|
|
||||||
- As updating to the latest 2.x version before switching over to v3 is mandated (or fresh v3install), that means all migration code has ran and it can be safely removed
|
|
||||||
- There are 2 projects: NadekoBot and NadekoBot.Coordinator
|
|
||||||
- You can directly run NadekoBot as the regular bot with one shard
|
|
||||||
- Run NadekoBot.Coordinator if you want more control over your shards and a grpc api for coordinator with which you can start, restart, kill and see status of shards
|
|
||||||
- credentials.json moved to `creds.yml`
|
|
||||||
- example is in `creds_example.yml`
|
|
||||||
- most of the credentials from 2.x will be automatically migrated
|
|
||||||
- Guides
|
|
||||||
- Now instruct users to set build output to nadekobot/output instead of running from nadekobot/src/NadekoBot/bin/release/net5
|
|
||||||
- todo: Reworked from source installation (linux/windows) guide <todo link>
|
|
||||||
- todo: Added docker support, installation guide at <todo link>
|
|
@@ -11,8 +11,8 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Grpc.AspNetCore" Version="2.38.0" />
|
<PackageReference Include="Grpc.AspNetCore" Version="2.38.0" />
|
||||||
<PackageReference Include="Serilog" Version="2.10.0" />
|
<PackageReference Include="Serilog" Version="2.10.0" />
|
||||||
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
|
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
|
||||||
<PackageReference Include="YamlDotNet" Version="11.2.0" />
|
<PackageReference Include="YamlDotNet" Version="11.2.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
@@ -10,33 +10,33 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="AngleSharp" Version="0.16.0" />
|
<PackageReference Include="AngleSharp" Version="0.16.0" />
|
||||||
<PackageReference Include="AWSSDK.S3" Version="3.7.1.4" />
|
<PackageReference Include="AWSSDK.S3" Version="3.7.1.19" />
|
||||||
<PackageReference Include="Cloneable" Version="1.3.0" />
|
<PackageReference Include="Cloneable" Version="1.3.0" />
|
||||||
<PackageReference Include="CodeHollow.FeedReader" Version="1.2.1" />
|
<PackageReference Include="CodeHollow.FeedReader" Version="1.2.1" />
|
||||||
<PackageReference Include="CommandLineParser" Version="2.8.0" />
|
<PackageReference Include="CommandLineParser" Version="2.8.0" />
|
||||||
<PackageReference Include="Discord.Net" Version="2.4.0" />
|
<PackageReference Include="Discord.Net" Version="2.4.0" />
|
||||||
<PackageReference Include="CoreCLR-NCalc" Version="2.2.92" />
|
<PackageReference Include="CoreCLR-NCalc" Version="2.2.92" />
|
||||||
<PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.41.1.138" />
|
<PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.41.1.138" />
|
||||||
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.52.0.2343" />
|
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.53.0.2378" />
|
||||||
<PackageReference Include="Google.Apis.Customsearch.v1" Version="1.49.0.2084" />
|
<PackageReference Include="Google.Apis.Customsearch.v1" Version="1.49.0.2084" />
|
||||||
<PackageReference Include="Google.Protobuf" Version="3.13.0" />
|
<PackageReference Include="Google.Protobuf" Version="3.17.3" />
|
||||||
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.32.0" />
|
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.38.0" />
|
||||||
<PackageReference Include="Grpc.Tools" Version="2.32.0">
|
<PackageReference Include="Grpc.Tools" Version="2.38.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="Html2Markdown" Version="4.0.0.427" />
|
<PackageReference Include="Html2Markdown" Version="4.0.0.427" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.8" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.8">
|
||||||
<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.Sqlite" Version="5.0.7" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.8" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
|
||||||
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.1.0" />
|
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.1.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
|
||||||
@@ -44,15 +44,15 @@
|
|||||||
<PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
|
<PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||||
<PackageReference Include="Scrutor" Version="3.3.0" />
|
<PackageReference Include="Scrutor" Version="3.3.0" />
|
||||||
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
|
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
|
||||||
<PackageReference Include="Serilog.Sinks.Seq" Version="5.0.1" />
|
<PackageReference Include="Serilog.Sinks.Seq" Version="5.0.1" />
|
||||||
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
|
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
|
||||||
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0010" />
|
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0010" />
|
||||||
<PackageReference Include="StackExchange.Redis" Version="2.2.4" />
|
<PackageReference Include="StackExchange.Redis" Version="2.2.62" />
|
||||||
<PackageReference Include="VideoLibrary" Version="3.1.2" />
|
<PackageReference Include="VideoLibrary" Version="3.1.2" />
|
||||||
<PackageReference Include="YamlDotNet" Version="11.2.0" />
|
<PackageReference Include="YamlDotNet" Version="11.2.1" />
|
||||||
<PackageReference Include="YoutubeExplode" Version="6.0.2" />
|
<PackageReference Include="YoutubeExplode" Version="6.0.5" />
|
||||||
<PackageReference Include="linq2db.EntityFrameworkCore" Version="5.3.1" />
|
<PackageReference Include="linq2db.EntityFrameworkCore" Version="5.4.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Primitives" Version="5.0.1" />
|
<PackageReference Include="Microsoft.Extensions.Primitives" Version="5.0.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user