Merge branch 'develop'

Splamy · Oct 21, 2019 · baa344d · baa344d
2 parents 853c804 + e472575
commit baa344d
Show file tree

Hide file tree

Showing 369 changed files with 21,010 additions and 13,982 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -13,5 +13,7 @@ indent_size = tab
 tab_width = 4
 trim_trailing_whitespace = true
 
+csharp_indent_switch_labels = false
+
 [*.{tt,ttinclude}]
 insert_final_newline = false
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,6 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
-# Custom stuff
-Ts3ClientTests/
-
 # User-specific files
 *.suo
 *.user
@@ -30,6 +27,8 @@ cov-int/
 cov-int.zip
 latex/
 
+/WebInterface/dist
+
 # C++ Build results
 *.o
 *.obj

diff --git a/.travis.yml b/.travis.yml
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,7 +1,6 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="NLog" Version="4.5.11" />
-    <PackageReference Include="System.Memory" Version="4.5.1" />
-    <PackageReference Condition="'$(TargetFramework)'=='net46'" Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="NLog" Version="4.6.7" />
+    <PackageReference Condition="'$(TargetFramework)' != 'netcoreapp2.2'"  Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
 </Project>