diff --git a/.dockerignore b/.dockerignore index cc1d10545..e8639ce94 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,6 +5,8 @@ !src/NadekoBot/** # Use NadekoBot.Coordinator project !src/NadekoBot.Coordinator/** +# Use Generators project +!src/NadekoBot.Generators/** # Use Ayu stuff !src/ayu/** diff --git a/Dockerfile b/Dockerfile index 4d2286144..b9725ef1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ WORKDIR /source COPY src/NadekoBot/*.csproj src/NadekoBot/ 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/ RUN dotnet restore src/NadekoBot/ diff --git a/README.md b/README.md index bdbd3f78d..65ee237e9 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,5 @@ -# :warning: Experimental Branch. Things will break. :warning: - ## 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 - -- 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: Added docker support, installation guide at \ No newline at end of file +## Installation \ No newline at end of file diff --git a/src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj b/src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj index 4f3a48d2e..cd7078d7a 100644 --- a/src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj +++ b/src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/NadekoBot/NadekoBot.csproj b/src/NadekoBot/NadekoBot.csproj index caa89c61d..adc3ee751 100644 --- a/src/NadekoBot/NadekoBot.csproj +++ b/src/NadekoBot/NadekoBot.csproj @@ -10,33 +10,33 @@ - + - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + @@ -44,15 +44,15 @@ - + - + - - - + + +