Merge branch 'v2-rewrite'

.github/workflows/dotnet.yml

@@ -2,9 +2,9 @@ name: .NET
 
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches:
+      - '*'
 
 jobs:
   build:
@@ -20,6 +20,6 @@ jobs:
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --no-restore
+      run: dotnet build --configuration Release --no-restore
     - name: Test
       run: dotnet test --no-restore --verbosity normal

.gitignore

@@ -3,12 +3,6 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
-# Development module
-**/Modules/Dev.cs
-
-# Lavalink
-Lavalink/
-
 # User-specific files
 *.rsuser
 *.suo
@@ -19,19 +13,24 @@ Lavalink/
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Mono auto generated files
+mono_crash.*
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
 x64/
 x86/
+[Ww][Ii][Nn]32/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+[Ll]ogs/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -45,9 +44,10 @@ Generated\ Files/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUNIT
+# NUnit
 *.VisualState.xml
 TestResult.xml
+nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -62,6 +62,9 @@ project.lock.json
 project.fragment.lock.json
 artifacts/
 
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
 # StyleCop
 StyleCopReport.xml
 
@@ -128,9 +131,6 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding add-in
-.JustCode
-
 # TeamCity is a build add-in
 _TeamCity*
 
@@ -141,6 +141,11 @@ _TeamCity*
 .axoCover/*
 !.axoCover/settings.json
 
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -188,6 +193,8 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
+# NuGet Symbol Packages
+*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
@@ -212,6 +219,8 @@ BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
+*.appxbundle
+*.appxupload
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -261,7 +270,9 @@ ServiceFabricBackup/
 *.bim.layout
 *.bim_*.settings
 *.rptproj.rsuser
-*- Backup*.rdl
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -297,10 +308,6 @@ paket-files/
 # FAKE - F# Make
 .fake/
 
-# JetBrains Rider
-.idea/
-*.sln.iml
-
 # CodeRush personal settings
 .cr/personal
 
@@ -344,3 +351,12 @@ ASALocalRun/
 
 # BeatPulse healthcheck temp database
 healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd

Fergun.sln

@@ -1,37 +1,31 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.2.32210.308
+VisualStudioVersion = 17.1.31911.260
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fergun", "src\Fergun.csproj", "{FF19917E-6D1C-4EBD-A553-F73456BE0138}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fergun", "src\Fergun.csproj", "{2084CFF0-83BC-46FA-A969-479DE6282984}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C33EBAE0-0E14-4465-9108-814C568171D0}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		nuget.config = nuget.config
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fergun.Tests", "Tests\Fergun.Tests\Fergun.Tests.csproj", "{5CC63A1D-B041-458D-96F7-BAA0FC33434C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fergun.Tests", "tests\Fergun.Tests\Fergun.Tests.csproj", "{A80CD8CE-6020-47B7-B01D-827FB90C2F1C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FF19917E-6D1C-4EBD-A553-F73456BE0138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF19917E-6D1C-4EBD-A553-F73456BE0138}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF19917E-6D1C-4EBD-A553-F73456BE0138}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF19917E-6D1C-4EBD-A553-F73456BE0138}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5CC63A1D-B041-458D-96F7-BAA0FC33434C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5CC63A1D-B041-458D-96F7-BAA0FC33434C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5CC63A1D-B041-458D-96F7-BAA0FC33434C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5CC63A1D-B041-458D-96F7-BAA0FC33434C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2084CFF0-83BC-46FA-A969-479DE6282984}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2084CFF0-83BC-46FA-A969-479DE6282984}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2084CFF0-83BC-46FA-A969-479DE6282984}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2084CFF0-83BC-46FA-A969-479DE6282984}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A80CD8CE-6020-47B7-B01D-827FB90C2F1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A80CD8CE-6020-47B7-B01D-827FB90C2F1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A80CD8CE-6020-47B7-B01D-827FB90C2F1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A80CD8CE-6020-47B7-B01D-827FB90C2F1C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C45D081F-C4E5-4F74-B770-CBEC38915AC1}
+		SolutionGuid = {9A586EE0-5827-4A7C-8383-549C6D9D021C}
 	EndGlobalSection
 EndGlobal