More work on the installer, cleanup, back to MIT because i read unlicensed is illegal in some countries 🤦
This commit is contained in:
NadekoBot.isslicense.md
src/NadekoBot
DataStructures
ModuleBehaviors
Migrations
Modules
NadekoBot.csNadekoBot.csprojNadekoBot.issServices
_Extensions
@ -1,5 +1,4 @@
|
||||
using Discord;
|
||||
using Discord.WebSocket;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace NadekoBot.DataStructures.ModuleBehaviors
|
||||
|
@ -1,6 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace NadekoBot.Migrations
|
||||
{
|
||||
|
@ -2,9 +2,7 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Metadata;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using NadekoBot.Services.Database;
|
||||
using NadekoBot.Services.Database.Models;
|
||||
|
||||
namespace NadekoBot.Migrations
|
||||
{
|
||||
|
@ -1,8 +1,6 @@
|
||||
using Discord;
|
||||
using Discord.Commands;
|
||||
using NadekoBot.Attributes;
|
||||
using NadekoBot.Services;
|
||||
using NadekoBot.Services.Administration;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace NadekoBot.Modules.Administration
|
||||
|
@ -1,16 +1,4 @@
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Discord.Commands;
|
||||
using Discord;
|
||||
using NadekoBot.Attributes;
|
||||
using NadekoBot.Extensions;
|
||||
using NadekoBot.Services;
|
||||
|
||||
namespace NadekoBot.Modules.Gambling
|
||||
namespace NadekoBot.Modules.Gambling
|
||||
{
|
||||
//public partial class Gambling
|
||||
//{
|
||||
|
@ -2,7 +2,6 @@
|
||||
using Discord.Commands;
|
||||
using NadekoBot.Extensions;
|
||||
using NadekoBot.Services;
|
||||
using NadekoBot.Services.Administration;
|
||||
using NLog;
|
||||
using System.Globalization;
|
||||
using System.Threading.Tasks;
|
||||
|
@ -25,7 +25,6 @@ using NadekoBot.Services.Administration;
|
||||
using NadekoBot.Services.Permissions;
|
||||
using NadekoBot.Services.Utility;
|
||||
using NadekoBot.Services.Help;
|
||||
using NadekoBot.Extensions;
|
||||
|
||||
namespace NadekoBot
|
||||
{
|
||||
@ -222,6 +221,7 @@ namespace NadekoBot
|
||||
|
||||
private async Task LoginAsync(string token)
|
||||
{
|
||||
_log.Info("Logging in...");
|
||||
//connect
|
||||
await Client.LoginAsync(TokenType.Bot, token).ConfigureAwait(false);
|
||||
await Client.StartAsync().ConfigureAwait(false);
|
||||
@ -231,6 +231,7 @@ namespace NadekoBot
|
||||
foreach (var s in Client.Shards)
|
||||
s.Ready += () => Task.FromResult(Interlocked.Increment(ref readyCount));
|
||||
|
||||
_log.Info("Waiting for all shards to connect...");
|
||||
while (readyCount < Client.Shards.Count)
|
||||
await Task.Delay(100).ConfigureAwait(false);
|
||||
}
|
||||
@ -243,6 +244,7 @@ namespace NadekoBot
|
||||
|
||||
await LoginAsync(Credentials.Token).ConfigureAwait(false);
|
||||
|
||||
_log.Info("Loading serveices...");
|
||||
AddServices();
|
||||
|
||||
sw.Stop();
|
||||
|
@ -19,7 +19,7 @@
|
||||
<AssemblyVersion>1.0.0.0</AssemblyVersion>
|
||||
<FileVersion>1.0.0.0</FileVersion>
|
||||
<ApplicationIcon>nadeko_icon.ico</ApplicationIcon>
|
||||
<RuntimeIdentifiers>win7-x64;ubuntu.14.04-x64;osx.10.10-x64</RuntimeIdentifiers>
|
||||
<RuntimeIdentifiers>win7-x64<!--;ubuntu.14.04-x64;osx.10.10-x64 --></RuntimeIdentifiers>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Version)' == '' ">
|
||||
@ -28,6 +28,10 @@
|
||||
<Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>copy credentials_example.json credentials.json </PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="data\**\*;credentials.json" />
|
||||
<None Update="credentials_example.json">
|
||||
|
@ -1,28 +0,0 @@
|
||||
; -- Example1.iss --
|
||||
; Demonstrates copying 3 files and creating an icon.
|
||||
|
||||
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
|
||||
#define sysfolder "system"
|
||||
|
||||
|
||||
[Setup]
|
||||
AppName=NadekoBot
|
||||
AppVersion=1.41
|
||||
DefaultDirName={pf}\NadekoBot
|
||||
DefaultGroupName=NadekoBot
|
||||
UninstallDisplayIcon={app}\NadekoBot.exe
|
||||
Compression=lzma2
|
||||
SolidCompression=yes
|
||||
OutputDir=userdocs:Inno Setup Examples Output
|
||||
|
||||
[Files]
|
||||
Source: "bin\Release\PublishOutput\win7-x64\*"; DestDir: "{app}\system"; Flags: recursesubdirs
|
||||
Source: "..\..\docs\Readme.md"; DestDir: "{app}"; Flags: isreadme
|
||||
|
||||
[Icons]
|
||||
; for pretty install directory
|
||||
Name: "{app}\NadekoBot"; Filename: "{app}\{#sysfolder}\NadekoBot.exe"; IconFilename: "{app}\{#sysfolder}\nadeko_icon.ico"
|
||||
Name: "{app}\credentials"; Filename: "{app}\{#sysfolder}\credentials.json"
|
||||
Name: "{app}\data"; Filename: "{app}\{#sysfolder}\data"
|
||||
; desktop shortcut
|
||||
Name: "{commondesktop}\NadekoBot"; Filename: "{app}\NadekoBot";
|
@ -13,7 +13,6 @@ using NadekoBot.DataStructures;
|
||||
using System.Collections.Immutable;
|
||||
using NadekoBot.DataStructures.ModuleBehaviors;
|
||||
using NadekoBot.Services.Database.Models;
|
||||
using NadekoBot.Services;
|
||||
using System.IO;
|
||||
using Discord.Net;
|
||||
|
||||
|
@ -3,7 +3,6 @@ using NadekoBot.Services.Database.Models;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Linq;
|
||||
using Discord;
|
||||
using Discord.WebSocket;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace NadekoBot.Services.Permissions
|
||||
|
@ -4,7 +4,6 @@ using System.Collections.Concurrent;
|
||||
using System.Linq;
|
||||
using Discord;
|
||||
using Discord.WebSocket;
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace NadekoBot.Services.Permissions
|
||||
|
@ -1,10 +1,8 @@
|
||||
using NadekoBot.DataStructures.ModuleBehaviors;
|
||||
using NadekoBot.Services.Database.Models;
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Discord;
|
||||
using NLog;
|
||||
|
@ -1,8 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace NadekoBot.Extensions
|
||||
{
|
||||
|
Reference in New Issue
Block a user