Restructured the project structure back to the way it was, there's no reasonable way to split the modules

src/Nadeko.Bot.Common/GlobalUsings.cs

@@ -1,34 +0,0 @@
-// // global using System.Collections.Concurrent;
-global using NonBlocking;
-//
-// // packages
-// global using Serilog;
-global using Humanizer;
-//
-// // nadekobot
-global using NadekoBot;
-global using NadekoBot.Services;
-global using Nadeko.Common; // new project
-global using NadekoBot.Common; // old + nadekobot specific things
-global using NadekoBot.Common.Attributes;
-global using NadekoBot.Extensions;
-// global using Nadeko.Medusa;
-
-// discord
-global using Discord;
-global using Discord.Commands;
-global using Discord.Net;
-global using Discord.WebSocket;
-
-// aliases
-global using GuildPerm = Discord.GuildPermission;
-global using ChannelPerm = Discord.ChannelPermission;
-global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-// global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-global using JetBrains.Annotations;
-
-
-global using Serilog;

src/Nadeko.Bot.Common/Nadeko.Bot.Common.csproj

@@ -1,43 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Discord.Net" Version="3.204.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Nadeko.Bot.Db\Nadeko.Bot.Db.csproj" />
-        <ProjectReference Include="..\Nadeko.Common\Nadeko.Common.csproj" />
-        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-        <PackageReference Include="OneOf.SourceGenerator" Version="3.0.263" />
-        <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta17" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="2.1.8" />
-        <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
-        <PackageReference Include="SixLabors.Shapes" Version="1.0.0-beta0009" />
-        <PackageReference Include="CommandLineParser" Version="2.9.1" />
-        <PackageReference Include="Humanizer" Version="2.14.1">
-            <PrivateAssets>all</PrivateAssets>
-            <Publish>True</Publish>
-        </PackageReference>
-        
-        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-        
-        <ProjectReference Include="..\Nadeko.Medusa\Nadeko.Medusa.csproj" />
-        
-        <ProjectReference Include="..\Nadeko.Bot.Generators.Strings\Nadeko.Bot.Generators.Strings.csproj" OutputItemType="Analyzer" />
-        <ProjectReference Include="..\Nadeko.Bot.Generators.Cloneable\Nadeko.Bot.Generators.Cloneable.csproj" OutputItemType="Analyzer" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <AdditionalFiles Include="..\NadekoBot\data\strings\responses\responses.en-US.json">
-        <Link>responses.en-US.json</Link>
-      </AdditionalFiles>
-    </ItemGroup>
-
-</Project>

src/Nadeko.Bot.Db/.globalconfig

@@ -1 +0,0 @@
-dotnet_diagnostic.CS8981.severity = none

src/Nadeko.Bot.Db/GlobalUsings.cs

@@ -1,30 +0,0 @@
-// // global using System.Collections.Concurrent;
-// global using NonBlocking;
-//
-// // packages
-// global using Serilog;
-// global using Humanizer;
-//
-// // nadekobot
-global using NadekoBot;
-global using Nadeko.Common;
-// global using NadekoBot.Common; // old + nadekobot specific things
-// global using NadekoBot.Common.Attributes;
-// global using NadekoBot.Extensions;
-// global using Nadeko.Medusa;
-
-// // discord
-// global using Discord;
-// global using Discord.Commands;
-// global using Discord.Net;
-// global using Discord.WebSocket;
-//
-// // aliases
-// global using GuildPerm = Discord.GuildPermission;
-// global using ChannelPerm = Discord.ChannelPermission;
-// global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-// global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-// global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-// global using JetBrains.Annotations;

src/Nadeko.Bot.Db/Nadeko.Bot.Db.csproj

@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <RootNamespace>NadekoBot.Db</RootNamespace>
-        <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="linq2db.EntityFrameworkCore" Version="8.1.0" />
-
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.3">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
-        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
-
-        <PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Nadeko.Common\Nadeko.Common.csproj" />
-    </ItemGroup>
-
-
-
-
-
-
-
-</Project>

src/Nadeko.Bot.Db/Nadeko.Bot.Db.csproj.DotSettings

@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cgiveaway/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Nadeko.Bot.Generators.Cloneable/Nadeko.Bot.Generators.Cloneable.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>latest</LangVersion>
-        <IncludeBuildOutput>false</IncludeBuildOutput>
-        <IsRoslynComponent>true</IsRoslynComponent>
-        <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
-    </ItemGroup>
-</Project>

src/Nadeko.Bot.Modules.Administration/GlobalUsings.cs

@@ -1,32 +0,0 @@
-// // global using System.Collections.Concurrent;
-global using NonBlocking;
-//
-// // packages
-global using Serilog;
-global using Humanizer;
-global using Newtonsoft;
-//
-// // nadekobot
-// global using NadekoBot;
-global using NadekoBot.Services;
-global using Nadeko.Common; // new project
-global using NadekoBot.Common; // old + nadekobot specific things
-global using NadekoBot.Common.Attributes;
-global using NadekoBot.Extensions;
-// global using Nadeko.Medusa;
-
-// discord
-global using Discord;
-global using Discord.Commands;
-global using Discord.Net;
-global using Discord.WebSocket;
-
-// aliases
-global using GuildPerm = Discord.GuildPermission;
-global using ChannelPerm = Discord.ChannelPermission;
-global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-// global using JetBrains.Annotations;

src/Nadeko.Bot.Modules.Administration/Nadeko.Bot.Modules.Administration.csproj

@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-    
-    <ItemGroup>
-        <PackageReference Include="CsvHelper" Version="31.0.2" />
-        <PackageReference Include="Discord.Net" Version="3.204.0" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    </ItemGroup>
-    
-    <ItemGroup>
-      <ProjectReference Include="..\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj" />
-      <ProjectReference Include="..\Nadeko.Bot.Modules.Gambling\Nadeko.Bot.Modules.Gambling.csproj" />
-    </ItemGroup>
-    
-    <ItemGroup>
-      <Folder Include="UserPunish\_common\" />
-      <Folder Include="UserPunish\_common\db\" />
-    </ItemGroup>
-
-</Project>

src/Nadeko.Bot.Modules.Expresssions/GlobalUsings.cs

@@ -1,31 +0,0 @@
-// // global using System.Collections.Concurrent;
-global using NonBlocking;
-//
-// // packages
-// global using Serilog;
-// global using Humanizer;
-//
-// // nadekobot
-// global using NadekoBot;
-// global using NadekoBot.Services;
-global using Nadeko.Common; // new project
-global using NadekoBot.Common; // old + nadekobot specific things
-// global using NadekoBot.Common.Attributes;
-global using NadekoBot.Extensions;
-// global using Nadeko.Medusa;
-
-// discord
-global using Discord;
-global using Discord.Commands;
-global using Discord.Net;
-global using Discord.WebSocket;
-
-// aliases
-global using GuildPerm = Discord.GuildPermission;
-global using ChannelPerm = Discord.ChannelPermission;
-global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-// global using JetBrains.Annotations;

src/Nadeko.Bot.Modules.Expresssions/Nadeko.Bot.Modules.Expresssions.csproj

@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <RootNamespace>NadekoBot.Modules.Expresssions</RootNamespace>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj" />
-      <ProjectReference Include="..\Nadeko.Common\Nadeko.Common.csproj" />
-      <ProjectReference Include="..\Nadeko.Bot.Db\Nadeko.Bot.Db.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Discord.Net" Version="3.204.0" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    </ItemGroup>
-
-</Project>

src/Nadeko.Bot.Modules.Gambling/Gambling/GlobalUsings.cs

@@ -1,30 +0,0 @@
-// global using System.Collections.Concurrent;
-global using NonBlocking;
-
-// packages
-global using Serilog;
-global using Humanizer;
-
-// nadekobot
-global using NadekoBot;
-global using NadekoBot.Services;
-global using Nadeko.Common; // new project
-global using NadekoBot.Common; // old + nadekobot specific things
-global using NadekoBot.Common.Attributes;
-global using NadekoBot.Extensions;
-
-// discord
-global using Discord;
-global using Discord.Commands;
-global using Discord.Net;
-global using Discord.WebSocket;
-
-// aliases
-global using GuildPerm = Discord.GuildPermission;
-global using ChannelPerm = Discord.ChannelPermission;
-global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-global using JetBrains.Annotations;

src/Nadeko.Bot.Modules.Gambling/Nadeko.Bot.Modules.Gambling.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj"/>
-        <ProjectReference Include="..\Nadeko.Econ\Nadeko.Econ.csproj"/>
-       
-        <ProjectReference Include="..\Nadeko.Bot.Generators.Cloneable\Nadeko.Bot.Generators.Cloneable.csproj" OutputItemType="Analyzer"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="CoreCLR-NCalc" Version="3.0.203" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-        <PackageReference Include="SharpToken" Version="1.2.14" />
-    </ItemGroup>
-
-
-</Project>

src/Nadeko.Bot.Modules.Help/GlobalUsings.cs

@@ -1,32 +0,0 @@
-// // global using System.Collections.Concurrent;
-global using NonBlocking;
-//
-// // packages
-global using Serilog;
-global using Humanizer;
-global using Newtonsoft;
-//
-// // nadekobot
-// global using NadekoBot;
-global using NadekoBot.Services;
-global using Nadeko.Common; // new project
-global using NadekoBot.Common; // old + nadekobot specific things
-global using NadekoBot.Common.Attributes;
-global using NadekoBot.Extensions;
-// global using Nadeko.Medusa;
-
-// discord
-global using Discord;
-global using Discord.Commands;
-global using Discord.Net;
-global using Discord.WebSocket;
-
-// aliases
-global using GuildPerm = Discord.GuildPermission;
-global using ChannelPerm = Discord.ChannelPermission;
-global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-// global using JetBrains.Annotations;

src/Nadeko.Bot.Modules.Help/Nadeko.Bot.Modules.Help.csproj

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj"/>
-
-        <ProjectReference Include="..\Nadeko.Bot.Generators.Cloneable\Nadeko.Bot.Generators.Cloneable.csproj" OutputItemType="Analyzer"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="AWSSDK.S3" Version="3.7.307" />
-    </ItemGroup>
-
-</Project>

src/Nadeko.Bot.Modules.Music/GlobalUsings.cs

@@ -1,30 +0,0 @@
-// global using System.Collections.Concurrent;
-global using NonBlocking;
-
-// packages
-global using Serilog;
-global using Humanizer;
-
-// nadekobot
-global using NadekoBot;
-global using NadekoBot.Services;
-global using Nadeko.Common; // new project
-global using NadekoBot.Common; // old + nadekobot specific things
-global using NadekoBot.Common.Attributes;
-global using NadekoBot.Extensions;
-
-// discord
-global using Discord;
-global using Discord.Commands;
-global using Discord.Net;
-global using Discord.WebSocket;
-
-// aliases
-global using GuildPerm = Discord.GuildPermission;
-global using ChannelPerm = Discord.ChannelPermission;
-global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-global using JetBrains.Annotations;

src/Nadeko.Bot.Modules.Music/Nadeko.Bot.Modules.Music.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\ayu\Ayu.Discord.Voice\Ayu.Discord.Voice.csproj"/>
-        <ProjectReference Include="..\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj"/>
-        <ProjectReference Include="..\Nadeko.Bot.Modules.Searches\Nadeko.Bot.Modules.Searches.csproj"/>
-
-        <ProjectReference Include="..\Nadeko.Bot.Generators.Cloneable\Nadeko.Bot.Generators.Cloneable.csproj" OutputItemType="Analyzer"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    </ItemGroup>
-
-
-</Project>

src/Nadeko.Bot.Modules.Patronage/GlobalUsings.cs

@@ -1,30 +0,0 @@
-// global using System.Collections.Concurrent;
-global using NonBlocking;
-
-// packages
-global using Serilog;
-global using Humanizer;
-
-// nadekobot
-global using NadekoBot;
-global using NadekoBot.Services;
-global using Nadeko.Common; // new project
-global using NadekoBot.Common; // old + nadekobot specific things
-global using NadekoBot.Common.Attributes;
-global using NadekoBot.Extensions;
-
-// discord
-global using Discord;
-global using Discord.Commands;
-global using Discord.Net;
-global using Discord.WebSocket;
-
-// aliases
-global using GuildPerm = Discord.GuildPermission;
-global using ChannelPerm = Discord.ChannelPermission;
-global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-global using JetBrains.Annotations;

src/Nadeko.Bot.Modules.Patronage/Nadeko.Bot.Modules.Patronage.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj"/>
-        <ProjectReference Include="..\Nadeko.Bot.Modules.Gambling\Nadeko.Bot.Modules.Gambling.csproj"/>
-
-        <ProjectReference Include="..\Nadeko.Bot.Generators.Cloneable\Nadeko.Bot.Generators.Cloneable.csproj" OutputItemType="Analyzer"/>
-    </ItemGroup>
-
-</Project>

src/Nadeko.Bot.Modules.Permisssions/GlobalUsings.cs

@@ -1,32 +0,0 @@
-// // global using System.Collections.Concurrent;
-global using NonBlocking;
-//
-// // packages
-global using Serilog;
-global using Humanizer;
-global using Newtonsoft;
-//
-// // nadekobot
-// global using NadekoBot;
-global using NadekoBot.Services;
-global using Nadeko.Common; // new project
-global using NadekoBot.Common; // old + nadekobot specific things
-global using NadekoBot.Common.Attributes;
-global using NadekoBot.Extensions;
-// global using Nadeko.Medusa;
-
-// discord
-global using Discord;
-global using Discord.Commands;
-global using Discord.Net;
-global using Discord.WebSocket;
-
-// aliases
-global using GuildPerm = Discord.GuildPermission;
-global using ChannelPerm = Discord.ChannelPermission;
-global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-// global using JetBrains.Annotations;

src/Nadeko.Bot.Modules.Permisssions/Nadeko.Bot.Modules.Permisssions.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj"/>
-        <ProjectReference Include="..\Nadeko.Bot.Db\Nadeko.Bot.Db.csproj"/>
-
-        <ProjectReference Include="..\Nadeko.Bot.Generators.Cloneable\Nadeko.Bot.Generators.Cloneable.csproj" OutputItemType="Analyzer"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Discord.Net.Core" Version="3.204.0" />
-    </ItemGroup>
-
-</Project>

src/Nadeko.Bot.Modules.Searches/GlobalUsings.cs

@@ -1,32 +0,0 @@
-// // global using System.Collections.Concurrent;
-global using NonBlocking;
-//
-// // packages
-global using Serilog;
-global using Humanizer;
-global using Newtonsoft;
-//
-// // nadekobot
-// global using NadekoBot;
-global using NadekoBot.Services;
-global using Nadeko.Common; // new project
-global using NadekoBot.Common; // old + nadekobot specific things
-global using NadekoBot.Common.Attributes;
-global using NadekoBot.Extensions;
-// global using Nadeko.Medusa;
-
-// discord
-global using Discord;
-global using Discord.Commands;
-global using Discord.Net;
-global using Discord.WebSocket;
-
-// aliases
-global using GuildPerm = Discord.GuildPermission;
-global using ChannelPerm = Discord.ChannelPermission;
-global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-// global using JetBrains.Annotations;

src/Nadeko.Bot.Modules.Searches/Nadeko.Bot.Modules.Searches.csproj

@@ -1,33 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj"/>
-        <ProjectReference Include="..\Nadeko.Bot.Db\Nadeko.Bot.Db.csproj"/>
-
-        <ProjectReference Include="..\Nadeko.Bot.Generators.Cloneable\Nadeko.Bot.Generators.Cloneable.csproj" OutputItemType="Analyzer"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="AngleSharp" Version="1.1.2" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-        <PackageReference Include="CsvHelper" Version="31.0.2" />
-        <PackageReference Include="MorseCode.ITask" Version="2.0.3"/>
-
-        <!-- Stream Notifications -->
-        <PackageReference Include="TwitchLib.Api" Version="3.9.0" />
-
-        <!-- Feeds, ... ? -->
-        <PackageReference Include="CodeHollow.FeedReader" Version="1.2.6"/>
-
-        <!-- .hs, nothing else -->
-        <PackageReference Include="Html2Markdown" Version="6.2.0.3" />
-    </ItemGroup>
-
-</Project>

src/Nadeko.Bot.Modules.Utility/GlobalUsings.cs

@@ -1,32 +0,0 @@
-// // global using System.Collections.Concurrent;
-global using NonBlocking;
-//
-// // packages
-global using Serilog;
-global using Humanizer;
-global using Newtonsoft;
-//
-// // nadekobot
-// global using NadekoBot;
-global using NadekoBot.Services;
-global using Nadeko.Common; // new project
-global using NadekoBot.Common; // old + nadekobot specific things
-global using NadekoBot.Common.Attributes;
-global using NadekoBot.Extensions;
-// global using Nadeko.Medusa;
-
-// discord
-global using Discord;
-global using Discord.Commands;
-global using Discord.Net;
-global using Discord.WebSocket;
-
-// aliases
-global using GuildPerm = Discord.GuildPermission;
-global using ChannelPerm = Discord.ChannelPermission;
-global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-// global using JetBrains.Annotations;

src/Nadeko.Bot.Modules.Utility/Nadeko.Bot.Modules.Utility.csproj

@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-
-        <!-- .eval -->
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.5.0" />
-
-        <!-- .calc -->
-        <PackageReference Include="CoreCLR-NCalc" Version="3.0.203" />
-
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj" />
-        <ProjectReference Include="..\Nadeko.Bot.Modules.Searches\Nadeko.Bot.Modules.Searches.csproj" />
-
-        <ProjectReference Include="..\Nadeko.Bot.Generators.Cloneable\Nadeko.Bot.Generators.Cloneable.csproj" OutputItemType="Analyzer" />
-    </ItemGroup>
-
-</Project>

src/Nadeko.Bot.Modules.Xp/GlobalUsings.cs

@@ -1,32 +0,0 @@
-// // global using System.Collections.Concurrent;
-global using NonBlocking;
-//
-// // packages
-global using Serilog;
-global using Humanizer;
-global using Newtonsoft;
-//
-// // nadekobot
-// global using NadekoBot;
-global using NadekoBot.Services;
-global using Nadeko.Common; // new project
-global using NadekoBot.Common; // old + nadekobot specific things
-global using NadekoBot.Common.Attributes;
-global using NadekoBot.Extensions;
-// global using Nadeko.Medusa;
-
-// discord
-global using Discord;
-global using Discord.Commands;
-global using Discord.Net;
-global using Discord.WebSocket;
-
-// aliases
-global using GuildPerm = Discord.GuildPermission;
-global using ChannelPerm = Discord.ChannelPermission;
-global using BotPermAttribute = Discord.Commands.RequireBotPermissionAttribute;
-global using LeftoverAttribute = Discord.Commands.RemainderAttribute;
-global using TypeReaderResult = NadekoBot.Common.TypeReaders.TypeReaderResult;
-
-// non-essential
-// global using JetBrains.Annotations;

src/Nadeko.Bot.Modules.Xp/Nadeko.Bot.Modules.Xp.csproj

@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="linq2db.EntityFrameworkCore" Version="8.1.0" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Nadeko.Bot.Common\Nadeko.Bot.Common.csproj"/>
-        <ProjectReference Include="..\Nadeko.Bot.Db\Nadeko.Bot.Db.csproj"/>
-
-
-        <ProjectReference Include="..\Nadeko.Bot.Generators.Cloneable\Nadeko.Bot.Generators.Cloneable.csproj" OutputItemType="Analyzer"/>
-    </ItemGroup>
-</Project>

src/Nadeko.Common/GlobalUsings.cs

@@ -1 +0,0 @@
-global using NonBlocking;

src/Nadeko.Common/Nadeko.Common.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
-        <PackageReference Include="NonBlocking" Version="2.1.2" />
-        <PackageReference Include="OneOf" Version="3.0.263" />
-
-        <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
-    </ItemGroup>
-</Project>

src/Nadeko.Econ/GlobalUsings.cs

@@ -1 +0,0 @@
-global using Nadeko.Common;

src/Nadeko.Econ/Nadeko.Econ.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Nadeko.Common\Nadeko.Common.csproj" />
-    </ItemGroup>
-
-</Project>

src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj

@@ -10,11 +10,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.61.0" />
-    <PackageReference Include="Serilog" Version="2.12.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.62.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="YamlDotNet" Version="13.0.2" />
+    <PackageReference Include="YamlDotNet" Version="15.1.2" />
   </ItemGroup>
   
 </Project>

src/NadekoBot.Generators/NadekoBot.Generators.csproj

@@ -7,13 +7,13 @@
         <IsRoslynComponent>true</IsRoslynComponent>
         <ImplicitUsings>true</ImplicitUsings>
     </PropertyGroup>
-    
+
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="all" GeneratePathProperty="true" />
     </ItemGroup>
-    
+
     <PropertyGroup>
         <GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
     </PropertyGroup>
@@ -24,3 +24,4 @@
         </ItemGroup>
     </Target>
 </Project>
+

src/NadekoBot.Tests/NadekoBot.Tests.csproj

@@ -6,15 +6,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="NUnit" Version="3.13.3" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageReference Include="NUnit" Version="4.1.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Nadeko.Bot.Modules.Administration\Nadeko.Bot.Modules.Administration.csproj" />
-      <ProjectReference Include="..\Nadeko.Common\Nadeko.Common.csproj" />
-      <ProjectReference Include="..\Nadeko.Econ\Nadeko.Econ.csproj" />
       <ProjectReference Include="..\NadekoBot\NadekoBot.csproj" />
     </ItemGroup>
 

src/NadekoBot/Db/Models/anti/AntiSpamIgnore.cs

@@ -7,6 +7,6 @@ public class AntiSpamIgnore : DbEntity
     public override int GetHashCode()
         => ChannelId.GetHashCode();
 
-    public override bool Equals(object obj)
-        => obj is AntiSpamIgnore inst ? inst.ChannelId == ChannelId : false;
+    public override bool Equals(object? obj)
+        => obj is AntiSpamIgnore inst && inst.ChannelId == ChannelId;
 }

src/NadekoBot/Db/Models/anti/AntiSpamSetting.cs

@@ -1,5 +1,6 @@
 namespace Nadeko.Bot.Db.Models;
 
+#nullable disable
 public class AntiSpamSetting : DbEntity
 {
     public int GuildConfigId { get; set; }

src/NadekoBot/Db/Models/giveaway/GiveawayModel.cs

@@ -1,5 +1,6 @@
 namespace NadekoBot.Db.Models;
 
+#nullable disable
 public sealed class GiveawayModel
 {
     public int Id { get; set; }

src/NadekoBot/Db/Models/giveaway/GiveawayUser.cs

@@ -1,5 +1,6 @@
 namespace NadekoBot.Db.Models;
 
+#nullable disable
 public sealed class GiveawayUser
 {
     public int Id { get; set; }