Skip to content

Commit baa344d

Browse files
committed
Merge branch 'develop'
2 parents 853c804 + e472575 commit baa344d

File tree

369 files changed

+21010
-13982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

369 files changed

+21010
-13982
lines changed

.editorconfig

+2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@ indent_size = tab
1313
tab_width = 4
1414
trim_trailing_whitespace = true
1515

16+
csharp_indent_switch_labels = false
17+
1618
[*.{tt,ttinclude}]
1719
insert_final_newline = false

.gitignore

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
33

4-
# Custom stuff
5-
Ts3ClientTests/
6-
74
# User-specific files
85
*.suo
96
*.user
@@ -30,6 +27,8 @@ cov-int/
3027
cov-int.zip
3128
latex/
3229

30+
/WebInterface/dist
31+
3332
# C++ Build results
3433
*.o
3534
*.obj

.travis.yml

-87
This file was deleted.

Directory.Build.targets

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Include="NLog" Version="4.5.11" />
4-
<PackageReference Include="System.Memory" Version="4.5.1" />
5-
<PackageReference Condition="'$(TargetFramework)'=='net46'" Include="System.ValueTuple" Version="4.5.0" />
3+
<PackageReference Include="NLog" Version="4.6.7" />
4+
<PackageReference Condition="'$(TargetFramework)' != 'netcoreapp2.2'" Include="System.Memory" Version="4.5.3" />
65
</ItemGroup>
76
</Project>

0 commit comments

Comments
 (0)