From 70a5d6603db7429f4cd6b2b9a9f5900f6372c6d4 Mon Sep 17 00:00:00 2001
From: Kwoth <srki0509@gmail.com>
Date: Thu, 13 Apr 2017 03:06:52 +0200
Subject: [PATCH] Removed discord.net submodule

---
 .gitmodules                    |  4 --
 Discord.Net                    |  1 -
 global.json                    |  7 +---
 src/NadekoBot/NadekoBot.csproj | 71 ++++++++++++++++++++++++++++++++
 src/NadekoBot/NadekoBot.xproj  | 26 ------------
 src/NadekoBot/project.json     | 74 ----------------------------------
 6 files changed, 73 insertions(+), 110 deletions(-)
 delete mode 160000 Discord.Net
 create mode 100644 src/NadekoBot/NadekoBot.csproj
 delete mode 100644 src/NadekoBot/NadekoBot.xproj
 delete mode 100644 src/NadekoBot/project.json

diff --git a/.gitmodules b/.gitmodules
index 08cf3841..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "Discord.Net"]
-	path = Discord.Net
-	url = https://github.com/Kwoth/Discord.Net
-	branch = rogue-dev
diff --git a/Discord.Net b/Discord.Net
deleted file mode 160000
index d2229228..00000000
--- a/Discord.Net
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d2229228b92117899d65cd549a1f2853057b255b
diff --git a/global.json b/global.json
index 2c5832ca..89380fd6 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,3 @@
 {
-  "projects": [ "Discord.Net/src", "src" ],
-  "sdk": {
-    "version": "1.0.0-preview2-1-003177"
-  }
-}
+  "sdk": { "version": "1.0.0-rc3-004350" }
+}
\ No newline at end of file
diff --git a/src/NadekoBot/NadekoBot.csproj b/src/NadekoBot/NadekoBot.csproj
new file mode 100644
index 00000000..2f76d766
--- /dev/null
+++ b/src/NadekoBot/NadekoBot.csproj
@@ -0,0 +1,71 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>General purpose Discord bot written in C#.</Description>
+    <Copyright>Kwoth</Copyright>
+    <Authors>Kwoth</Authors>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssemblyName>NadekoBot</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>NadekoBot</PackageId>
+    <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8+wpa81</PackageTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="data\**\*;credentials.json;credentials_example.json;Modules\Music\Classes\PlaylistFullException.cs" />
+    <None Update="libsodium.dll;opus.dll;libsodium.so;libopus.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="data\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="data\musicdata\**\*">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Discord.Net\src\Discord.Net.Commands\Discord.Net.Commands.csproj" />
+    <ProjectReference Include="..\..\Discord.Net\src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AngleSharp" Version="0.9.9" />
+    <PackageReference Include="libvideo" Version="1.0.1" />
+    <PackageReference Include="CoreCLR-NCalc" Version="2.1.2" />
+    <PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.19.0.138" />
+    <PackageReference Include="Google.Apis.YouTube.v3" Version="1.20.0.701" />
+    <PackageReference Include="Google.Apis.Customsearch.v1" Version="1.20.0.466" />
+    <PackageReference Include="ImageSharp" Version="1.0.0-alpha4-00031" />
+    <PackageReference Include="ImageSharp.Drawing" Version="1.0.0-alpha4-00031" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.2-beta1" />
+    <PackageReference Include="NLog" Version="5.0.0-beta03" />
+    <PackageReference Include="System.Xml.XPath" Version="4.3.0" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'GlobalNadeko' ">
+    <DefineConstants>$(DefineConstants);GLOBAL_NADEKO</DefineConstants>
+    <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
+    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/NadekoBot/NadekoBot.xproj b/src/NadekoBot/NadekoBot.xproj
deleted file mode 100644
index c83a1175..00000000
--- a/src/NadekoBot/NadekoBot.xproj
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>45ec1473-c678-4857-a544-07dfe0d0b478</ProjectGuid>
-    <RootNamespace>NadekoBot</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <DnxInvisibleFolder Include="data\permissions\" />
-  </ItemGroup>
-  <ItemGroup>
-    <DnxInvisibleContent Include="data\questions.json" />
-    <DnxInvisibleContent Include="data\questions2.json" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/NadekoBot/project.json b/src/NadekoBot/project.json
deleted file mode 100644
index fe93d0d3..00000000
--- a/src/NadekoBot/project.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "description": "General purpose Discord bot written in C#.",
-  "authors": [ "Kwoth" ],
-  "copyright": "Kwoth",
-  "buildOptions": {
-    "emitEntryPoint": true,
-    "allowUnsafe": true,
-    "compile": {
-      "exclude": [ "data", "credentials.json", "credentials_example.json", "Modules/Music/Classes/PlaylistFullException.cs" ]
-    },
-    "copyToOutput": {
-      "include": [ "data" ],
-      "includeFiles": [ "libsodium.dll", "opus.dll", "libsodium.so", "libopus.so" ],
-      "exclude": [ "data/musicdata" ]
-    },
-    "define": []
-  },
-  "dependencies": {
-    "AngleSharp": "0.9.9",
-    "libvideo": "1.0.1",
-    "CoreCLR-NCalc": "2.1.2",
-    "Google.Apis.Urlshortener.v1": "1.19.0.138",
-    "Google.Apis.YouTube.v3": "1.20.0.701",
-    "Google.Apis.Customsearch.v1": "1.20.0.466",
-    "ImageSharp": "1.0.0-alpha4-00031",
-    "ImageSharp.Drawing": "1.0.0-alpha4-00031",
-    "Microsoft.EntityFrameworkCore": "1.1.0",
-    "Microsoft.EntityFrameworkCore.Design": "1.1.0",
-    "Microsoft.EntityFrameworkCore.Sqlite": "1.1.0",
-    "Microsoft.Extensions.Configuration": "1.1.0",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
-    "Microsoft.Extensions.Configuration.Json": "1.1.0",
-    "Microsoft.Extensions.DependencyInjection": "1.1.0",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.1.0",
-    "Microsoft.Extensions.PlatformAbstractions": "1.1.0",
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "1.1.0"
-    },
-    "Newtonsoft.Json": "9.0.2-beta1",
-    "NLog": "5.0.0-beta03",
-    "System.Xml.XPath": "4.3.0",
-    "Discord.Net.Commands": {
-      "target": "project",
-      "version": "1.0.0-*"
-    },
-    "Discord.Net.WebSocket": {
-      "target": "project",
-      "version": "1.0.0-*"
-    }
-  },
-  "tools": {
-    "Microsoft.EntityFrameworkCore.Tools.DotNet": "1.1.0-preview4-final",
-    "Microsoft.DotNet.Watcher.Tools": "1.1.0-preview4-final"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net45+win8+wpa81"
-      ]
-    }
-  },
-  "configurations": {
-    "GlobalNadeko": {
-      "buildOptions": {
-        "define": [ "GLOBAL_NADEKO" ],
-        "nowarn": [ "CS1573", "CS1591" ],
-        "optimize": true
-      }
-    }
-  }
-}