From b1a1e12925a52a4b2ebc842a8ca3fb8c88007447 Mon Sep 17 00:00:00 2001 From: Micky5991 Date: Tue, 27 Feb 2018 02:47:58 +0100 Subject: [PATCH 1/4] Remove redundant configurations --- .../JustAnotherVoiceChat.Server.Dummy.csproj | 19 ---- ...otherVoiceChat.Server.GTMP.Resource.csproj | 39 ++----- .../JustAnotherVoiceChat.Server.GTMP.csproj | 32 ++---- ...JustAnotherVoiceChat.Server.Testing.csproj | 19 ---- ...otherVoiceChat.Server.Wrapper.Tests.csproj | 20 ---- ...JustAnotherVoiceChat.Server.Wrapper.csproj | 24 ---- .../src/Elements/Wrapper/NativeLibary.cs | 8 +- JustAnotherVoiceChat.Server.sln | 103 +++++++----------- 8 files changed, 59 insertions(+), 205 deletions(-) diff --git a/JustAnotherVoiceChat.Server.Dummy/JustAnotherVoiceChat.Server.Dummy.csproj b/JustAnotherVoiceChat.Server.Dummy/JustAnotherVoiceChat.Server.Dummy.csproj index 593a148..05bc766 100644 --- a/JustAnotherVoiceChat.Server.Dummy/JustAnotherVoiceChat.Server.Dummy.csproj +++ b/JustAnotherVoiceChat.Server.Dummy/JustAnotherVoiceChat.Server.Dummy.csproj @@ -5,25 +5,6 @@ netcoreapp2.0 7 false - Debug Linux;Debug Windows;Release Linux;Release Windows - - - TRACE;DEBUG;LINUX;NETCOREAPP2_0;NETCOREAPP2_0 - bin\Debug\Linux\ - - - TRACE;DEBUG;NETCOREAPP2_0 - bin\Debug\Windows\ - - - TRACE;RELEASE;NETCOREAPP2_0 - true - bin\Release\Windows\ - - - TRACE;RELEASE;LINUX;NETCOREAPP2_0 - true - bin\Release\Linux\ diff --git a/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj b/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj index 1a3d5b3..ee16f8b 100644 --- a/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj +++ b/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj @@ -12,48 +12,31 @@ v4.5.2 512 7 - Debug Linux;Debug Windows;Debug Windows GTMP;Release Linux;Release Windows + Debug;Debug GTMP;Release - - pdbonly - true - TRACE;LINUX - prompt - 4 - bin\Release\Linux\ - - - bin\Release\Windows\ - TRACE - true - pdbonly - - + true full false DEBUG;TRACE prompt 4 - bin\Debug\Windows\ + bin\Debug\ - - true - full - false - DEBUG;TRACE;LINUX - prompt - 4 - bin\Debug\Linux\ - - + true full false DEBUG;TRACE prompt 4 - ..\..\JustAnotherVoiceChat-GTMP\resources\justanothervoicechat\ + bin\Debug GTMP\ + + + TRACE + true + pdbonly + bin\Release\ diff --git a/JustAnotherVoiceChat.Server.GTMP/JustAnotherVoiceChat.Server.GTMP.csproj b/JustAnotherVoiceChat.Server.GTMP/JustAnotherVoiceChat.Server.GTMP.csproj index c7db373..a8e1b46 100644 --- a/JustAnotherVoiceChat.Server.GTMP/JustAnotherVoiceChat.Server.GTMP.csproj +++ b/JustAnotherVoiceChat.Server.GTMP/JustAnotherVoiceChat.Server.GTMP.csproj @@ -12,38 +12,20 @@ v4.5.2 512 7 - Debug Linux;Debug Windows;Release Linux;Release Windows - - true - full - false - DEBUG;TRACE;LINUX - prompt - 4 - bin\Debug\Linux\ - - - bin\Debug\Windows\ - DEBUG;TRACE - true - full - - + pdbonly true TRACE prompt 4 - bin\Release\Windows\ + bin\Release\ - - pdbonly - true - TRACE;LINUX - prompt - 4 - bin\Release\Linux\ + + DEBUG;TRACE + true + full + bin\Debug\ diff --git a/JustAnotherVoiceChat.Server.Testing/JustAnotherVoiceChat.Server.Testing.csproj b/JustAnotherVoiceChat.Server.Testing/JustAnotherVoiceChat.Server.Testing.csproj index 049a4b1..743cab4 100644 --- a/JustAnotherVoiceChat.Server.Testing/JustAnotherVoiceChat.Server.Testing.csproj +++ b/JustAnotherVoiceChat.Server.Testing/JustAnotherVoiceChat.Server.Testing.csproj @@ -4,23 +4,4 @@ false Debug Windows - - 0 - bin\Debug\Linux\ - TRACE;DEBUG;LINUX;NETSTANDARD1_2 - - - bin\Debug\Windows\ - TRACE;DEBUG;NETSTANDARD1_2 - - - bin\Release\Windows\ - TRACE;NETSTANDARD1_2 - true - - - bin\Release\Linux\ - TRACE;LINUX;NETSTANDARD1_2 - true - \ No newline at end of file diff --git a/JustAnotherVoiceChat.Server.Wrapper.Tests/JustAnotherVoiceChat.Server.Wrapper.Tests.csproj b/JustAnotherVoiceChat.Server.Wrapper.Tests/JustAnotherVoiceChat.Server.Wrapper.Tests.csproj index 90f94dd..3e773b7 100644 --- a/JustAnotherVoiceChat.Server.Wrapper.Tests/JustAnotherVoiceChat.Server.Wrapper.Tests.csproj +++ b/JustAnotherVoiceChat.Server.Wrapper.Tests/JustAnotherVoiceChat.Server.Wrapper.Tests.csproj @@ -3,7 +3,6 @@ Debug Windows netcoreapp2.0 false - Debug Linux;Debug Windows;Release Linux;Release Windows @@ -15,23 +14,4 @@ - - 0 - bin\Debug\Linux\ - TRACE;DEBUG;LINUX;NETCOREAPP2_0 - - - bin\Debug\Windows\ - TRACE;DEBUG;NETCOREAPP2_0 - - - bin\Release\Windows\ - TRACE;NETCOREAPP2_0 - true - - - bin\Release\Linux\ - TRACE;LINUX;NETCOREAPP2_0 - true - \ No newline at end of file diff --git a/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj b/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj index b4cf7c9..3834a0e 100644 --- a/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj +++ b/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj @@ -7,7 +7,6 @@ $(VoiceChatVersion) $(VoiceChatVersion) 7 - Debug Linux;Debug Windows;Release Linux;Release Windows JustAnotherVoiceChat-Server .NET Standard Wrapper JustAnotherVoiceChat-Server is the control unit of the JustAnotherVoiceChat TeamSpeak3-Plugin. It uses a dedicated TeamSpeak3-Server to communicate with other players on any .NET based multiplayer-server. 2018 JustAnotherVoiceChat @@ -20,29 +19,6 @@ JustAnotherVoiceChat contributors true - - 0 - true - bin\Debug\Linux\ - TRACE;DEBUG;LINUX;NETSTANDARD1_2 - - - bin\Debug\Windows\ - TRACE;DEBUG;NETSTANDARD1_2 - true - - - true - bin\Release\Windows\ - TRACE;NETSTANDARD1_2 - true - - - true - bin\Release\Linux\ - TRACE;LINUX;NETSTANDARD1_2 - true - diff --git a/JustAnotherVoiceChat.Server.Wrapper/src/Elements/Wrapper/NativeLibary.cs b/JustAnotherVoiceChat.Server.Wrapper/src/Elements/Wrapper/NativeLibary.cs index 529eaad..446da6a 100644 --- a/JustAnotherVoiceChat.Server.Wrapper/src/Elements/Wrapper/NativeLibary.cs +++ b/JustAnotherVoiceChat.Server.Wrapper/src/Elements/Wrapper/NativeLibary.cs @@ -34,12 +34,8 @@ namespace JustAnotherVoiceChat.Server.Wrapper.Elements.Wrapper { internal static class NativeLibary { - -#if LINUX - private const string JustAnotherVoiceChatLibrary = "libJustAnotherVoiceChat.Server.so"; -#else - private const string JustAnotherVoiceChatLibrary = "JustAnotherVoiceChat.Server.dll"; -#endif + + private const string JustAnotherVoiceChatLibrary = "JustAnotherVoiceChatServer"; [DllImport(JustAnotherVoiceChatLibrary)] internal static extern void JV_CreateServer(ushort port, string teamspeakServerId, ulong teamspeakChannelId, string teamspeakChannelPassword); diff --git a/JustAnotherVoiceChat.Server.sln b/JustAnotherVoiceChat.Server.sln index c76ce29..168573a 100644 --- a/JustAnotherVoiceChat.Server.sln +++ b/JustAnotherVoiceChat.Server.sln @@ -21,72 +21,47 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JustAnotherVoiceChat.Server EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug Linux|Any CPU = Debug Linux|Any CPU - Debug Windows GTMP|Any CPU = Debug Windows GTMP|Any CPU - Debug Windows|Any CPU = Debug Windows|Any CPU - Release Linux|Any CPU = Release Linux|Any CPU - Release Windows|Any CPU = Release Windows|Any CPU + Release|Any CPU = Release|Any CPU + Debug|Any CPU = Debug|Any CPU + Debug GTMP|Any CPU = Debug GTMP|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Linux|Any CPU.ActiveCfg = Debug Linux|Any CPU - {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Linux|Any CPU.Build.0 = Debug Linux|Any CPU - {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug Windows|Any CPU - {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Windows GTMP|Any CPU.Build.0 = Debug Windows|Any CPU - {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Windows|Any CPU.ActiveCfg = Debug Windows|Any CPU - {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug Windows|Any CPU.Build.0 = Debug Windows|Any CPU - {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release Linux|Any CPU.ActiveCfg = Release Linux|Any CPU - {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release Linux|Any CPU.Build.0 = Release Linux|Any CPU - {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release Windows|Any CPU.ActiveCfg = Release Windows|Any CPU - {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release Windows|Any CPU.Build.0 = Release Windows|Any CPU - {7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Linux|Any CPU.ActiveCfg = Debug Linux|Any CPU - {7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Linux|Any CPU.Build.0 = Debug Linux|Any CPU - {7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug Windows|Any CPU - {7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Windows GTMP|Any CPU.Build.0 = Debug Windows|Any CPU - {7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Windows|Any CPU.ActiveCfg = Debug Windows|Any CPU - {7362E09D-6D62-493B-86FF-00544D5967F8}.Debug Windows|Any CPU.Build.0 = Debug Windows|Any CPU - {7362E09D-6D62-493B-86FF-00544D5967F8}.Release Linux|Any CPU.ActiveCfg = Release Linux|Any CPU - {7362E09D-6D62-493B-86FF-00544D5967F8}.Release Linux|Any CPU.Build.0 = Release Linux|Any CPU - {7362E09D-6D62-493B-86FF-00544D5967F8}.Release Windows|Any CPU.ActiveCfg = Release Windows|Any CPU - {7362E09D-6D62-493B-86FF-00544D5967F8}.Release Windows|Any CPU.Build.0 = Release Windows|Any CPU - {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug Linux|Any CPU.ActiveCfg = Debug Linux|Any CPU - {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug Linux|Any CPU.Build.0 = Debug Linux|Any CPU - {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug Windows|Any CPU - {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug Windows|Any CPU.ActiveCfg = Debug Windows|Any CPU - {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug Windows|Any CPU.Build.0 = Debug Windows|Any CPU - {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release Linux|Any CPU.ActiveCfg = Release Linux|Any CPU - {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release Linux|Any CPU.Build.0 = Release Linux|Any CPU - {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release Windows|Any CPU.ActiveCfg = Release Windows|Any CPU - {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release Windows|Any CPU.Build.0 = Release Windows|Any CPU - {62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Linux|Any CPU.ActiveCfg = Debug Linux|Any CPU - {62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Linux|Any CPU.Build.0 = Debug Linux|Any CPU - {62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug Windows GTMP|Any CPU - {62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Windows GTMP|Any CPU.Build.0 = Debug Windows GTMP|Any CPU - {62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Windows|Any CPU.ActiveCfg = Debug Windows|Any CPU - {62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug Windows|Any CPU.Build.0 = Debug Windows|Any CPU - {62D8EA73-E9AA-435F-B58C-139C69507B26}.Release Linux|Any CPU.ActiveCfg = Release Linux|Any CPU - {62D8EA73-E9AA-435F-B58C-139C69507B26}.Release Linux|Any CPU.Build.0 = Release Linux|Any CPU - {62D8EA73-E9AA-435F-B58C-139C69507B26}.Release Windows|Any CPU.ActiveCfg = Release Windows|Any CPU - {62D8EA73-E9AA-435F-B58C-139C69507B26}.Release Windows|Any CPU.Build.0 = Release Windows|Any CPU - {AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Linux|Any CPU.ActiveCfg = Debug Linux|Any CPU - {AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Linux|Any CPU.Build.0 = Debug Linux|Any CPU - {AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug Windows|Any CPU - {AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Windows GTMP|Any CPU.Build.0 = Debug Windows|Any CPU - {AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Windows|Any CPU.ActiveCfg = Debug Windows|Any CPU - {AD192460-A5D5-461A-AEC3-476713B055DE}.Debug Windows|Any CPU.Build.0 = Debug Windows|Any CPU - {AD192460-A5D5-461A-AEC3-476713B055DE}.Release Linux|Any CPU.ActiveCfg = Release Linux|Any CPU - {AD192460-A5D5-461A-AEC3-476713B055DE}.Release Linux|Any CPU.Build.0 = Release Linux|Any CPU - {AD192460-A5D5-461A-AEC3-476713B055DE}.Release Windows|Any CPU.ActiveCfg = Release Windows|Any CPU - {AD192460-A5D5-461A-AEC3-476713B055DE}.Release Windows|Any CPU.Build.0 = Release Windows|Any CPU - {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Linux|Any CPU.ActiveCfg = Debug|Any CPU - {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Linux|Any CPU.Build.0 = Debug|Any CPU - {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Windows GTMP|Any CPU.ActiveCfg = Debug|Any CPU - {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Windows GTMP|Any CPU.Build.0 = Debug|Any CPU - {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Windows|Any CPU.ActiveCfg = Debug|Any CPU - {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug Windows|Any CPU.Build.0 = Debug|Any CPU - {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release Linux|Any CPU.ActiveCfg = Release|Any CPU - {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release Linux|Any CPU.Build.0 = Release|Any CPU - {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release Windows|Any CPU.ActiveCfg = Release|Any CPU - {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release Windows|Any CPU.Build.0 = Release|Any CPU + {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Release|Any CPU.Build.0 = Release|Any CPU + {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug GTMP|Any CPU.ActiveCfg = Debug|Any CPU + {3523B5C4-FF62-4D7C-8319-BB7FBECF8F51}.Debug GTMP|Any CPU.Build.0 = Debug|Any CPU + {7362E09D-6D62-493B-86FF-00544D5967F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7362E09D-6D62-493B-86FF-00544D5967F8}.Release|Any CPU.Build.0 = Release|Any CPU + {7362E09D-6D62-493B-86FF-00544D5967F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7362E09D-6D62-493B-86FF-00544D5967F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7362E09D-6D62-493B-86FF-00544D5967F8}.Debug GTMP|Any CPU.ActiveCfg = Debug|Any CPU + {7362E09D-6D62-493B-86FF-00544D5967F8}.Debug GTMP|Any CPU.Build.0 = Debug|Any CPU + {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Release|Any CPU.Build.0 = Release|Any CPU + {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug GTMP|Any CPU.ActiveCfg = Debug|Any CPU + {3195371E-03B7-4CDF-A587-2B9BE98940E5}.Debug GTMP|Any CPU.Build.0 = Debug|Any CPU + {62D8EA73-E9AA-435F-B58C-139C69507B26}.Release|Any CPU.ActiveCfg = Release|Any CPU + {62D8EA73-E9AA-435F-B58C-139C69507B26}.Release|Any CPU.Build.0 = Release|Any CPU + {62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug|Any CPU.Build.0 = Debug|Any CPU + {62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug GTMP|Any CPU.ActiveCfg = Debug GTMP|Any CPU + {62D8EA73-E9AA-435F-B58C-139C69507B26}.Debug GTMP|Any CPU.Build.0 = Debug GTMP|Any CPU + {AD192460-A5D5-461A-AEC3-476713B055DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AD192460-A5D5-461A-AEC3-476713B055DE}.Release|Any CPU.Build.0 = Release|Any CPU + {AD192460-A5D5-461A-AEC3-476713B055DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AD192460-A5D5-461A-AEC3-476713B055DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AD192460-A5D5-461A-AEC3-476713B055DE}.Debug GTMP|Any CPU.ActiveCfg = Debug|Any CPU + {AD192460-A5D5-461A-AEC3-476713B055DE}.Debug GTMP|Any CPU.Build.0 = Debug|Any CPU + {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Release|Any CPU.Build.0 = Release|Any CPU + {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug GTMP|Any CPU.ActiveCfg = Debug|Any CPU + {E5D508E4-CC84-446F-A4A2-1F512DA21D07}.Debug GTMP|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From f7f7dfa7d0085f48d7edbb825bc84d551d246e4e Mon Sep 17 00:00:00 2001 From: Micky5991 Date: Tue, 27 Feb 2018 02:51:42 +0100 Subject: [PATCH 2/4] Allow unsafe code in Wrapper --- .../JustAnotherVoiceChat.Server.Wrapper.csproj | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj b/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj index 3834a0e..80c2b9a 100644 --- a/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj +++ b/JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj @@ -19,6 +19,15 @@ JustAnotherVoiceChat contributors true + + true + + + true + + + true + From ae7f157e6d339f38a96cc73a812cee1b9612c66e Mon Sep 17 00:00:00 2001 From: Micky5991 Date: Tue, 27 Feb 2018 02:57:37 +0100 Subject: [PATCH 3/4] Fix output path of Debug GTMP --- .../JustAnotherVoiceChat.Server.GTMP.Resource.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj b/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj index ee16f8b..d5113e9 100644 --- a/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj +++ b/JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj @@ -30,7 +30,7 @@ DEBUG;TRACE prompt 4 - bin\Debug GTMP\ + ..\..\JustAnotherVoiceChat-GTMP\resources\justanothervoicechat\ TRACE @@ -96,4 +96,4 @@ --> - \ No newline at end of file + From a3e51b1f5f92242d8887a8d00e8926fb161fe63e Mon Sep 17 00:00:00 2001 From: Micky5991 Date: Tue, 27 Feb 2018 03:02:19 +0100 Subject: [PATCH 4/4] Rename files and output-paths to new folder and file structure --- appveyor.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ce570cc..283c6f2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,8 +23,8 @@ artifacts: - path: 'JustAnotherVoiceChat-%APPVEYOR_BUILD_VERSION%-GTMP.zip' name: GT-MP Resource - - path: 'JustAnotherVoiceChat.Server.dll' - name: Server x64 + - path: 'JustAnotherVoiceChatServer.dll' + name: Server Win x64 install: - mkdir C:\projects\dependencies @@ -53,27 +53,27 @@ build_script: - cd build - cmake .. -G "Visual Studio 15 2017 Win64" - cmake --build . --config Release - - cp src\Release\JustAnotherVoiceChat.Server.dll C:\projects\justanothervoicechat-server\ - - move src\Release\JustAnotherVoiceChat.Server.dll ..\..\JustAnotherVoiceChat.Server.Wrapper\ + - cp src\Release\JustAnotherVoiceChatServer.dll C:\projects\justanothervoicechat-server\ + - move src\Release\JustAnotherVoiceChatServer.dll ..\..\JustAnotherVoiceChat.Server.Wrapper\ # C# - cd C:\projects\justanothervoicechat-server - - dotnet build JustAnotherVoiceChat.Server.Wrapper\JustAnotherVoiceChat.Server.Wrapper.csproj -c "Release Windows" -f netstandard1.2 - - dotnet build JustAnotherVoiceChat.Server.GTMP\JustAnotherVoiceChat.Server.GTMP.csproj -c "Release Windows" -f net452 - - dotnet build JustAnotherVoiceChat.Server.GTMP.Resource\JustAnotherVoiceChat.Server.GTMP.Resource.csproj -c "Release Windows" -f net452 + - dotnet build JustAnotherVoiceChat.Server.Wrapper\JustAnotherVoiceChat.Server.Wrapper.csproj -c "Release" -f netstandard1.2 + - dotnet build JustAnotherVoiceChat.Server.GTMP\JustAnotherVoiceChat.Server.GTMP.csproj -c "Release" -f net452 + - dotnet build JustAnotherVoiceChat.Server.GTMP.Resource\JustAnotherVoiceChat.Server.GTMP.Resource.csproj -c "Release" -f net452 after_build: - - dotnet pack JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj -c "Release Windows" -o "..\" - - nuget pack JustAnotherVoiceChat.Server.GTMP\JustAnotherVoiceChat.Server.GTMP.csproj -Properties "Configuration=Release Windows" + - dotnet pack JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj -c "Release" -o "..\" + - nuget pack JustAnotherVoiceChat.Server.GTMP\JustAnotherVoiceChat.Server.GTMP.csproj -Properties "Configuration=Release" # Build GT-MP Resource - - cd C:\projects\justanothervoicechat-server\JustAnotherVoiceChat.Server.GTMP.Resource\bin\Release\Windows + - cd C:\projects\justanothervoicechat-server\JustAnotherVoiceChat.Server.GTMP.Resource\bin\Release - 7z a JustAnotherVoiceChat-%APPVEYOR_BUILD_VERSION%-GTMP.zip JustAnotherVoiceChat* meta.xml Client\JustAnotherVoiceChat.js - move JustAnotherVoiceChat-%APPVEYOR_BUILD_VERSION%-GTMP.zip C:\projects\justanothervoicechat-server\ test_script: - cd C:\projects\justanothervoicechat-server - - dotnet test JustAnotherVoiceChat.Server.Wrapper.Tests\JustAnotherVoiceChat.Server.Wrapper.Tests.csproj -c "Release Windows" --logger trx;LogFileName=results.xml + - dotnet test JustAnotherVoiceChat.Server.Wrapper.Tests\JustAnotherVoiceChat.Server.Wrapper.Tests.csproj -c "Release" --logger trx;LogFileName=results.xml on_finish: - ps: | @@ -101,7 +101,7 @@ deploy: prerelease: true draft: true description: $(APPVEYOR_REPO_COMMIT_MESSAGE) - artifact: /.*\.nupkg/, JustAnotherVoiceChat-$(appveyor_build_version)-GTMP.zip, JustAnotherVoiceChat.Server.dll + artifact: /.*\.nupkg/, JustAnotherVoiceChat-$(appveyor_build_version)-GTMP.zip, JustAnotherVoiceChatServer.dll on: branch: master appveyor_repo_tag: true