chore: add travis ci

.travis.yml

@@ -0,0 +1,7 @@
+language: csharp
+solution: src/Live\ Map.sln
+script:
+    - xbuild /p:Configuration=Release /p:Platform=Unix src/Live\ Map.sln
+notifications:
+    webhooks:
+        secure: "Fu1CjQiphlvok3BPJNFc4Xx7SP4DvZK84tItIHqCLIgF+VqiIZBkaVMtQ3ipeYMYPWTrZtHW+xdyUsTGaRkD85E+vVijAYDmBDh3ewf0nmcNLHx639cLBAttPBieH11KrICAZOMvabzhVic0cQSDcn0+V1aRsv+XMF45pLPaMwCdW9Kz/eeE7PsbNR7GWL2fxsYKsFSvaVE+lXEyOk89rOxuHJmXje794YeS0EcZPdwKQggL27mW09QObwm27PGOWeD3ngxBoZ3dR6EHDUVdlvJitH4EzbUUiHi458oddhL3HxyOjYcjsv2sGyex0+ItxAqVrgB6bWgjRhwHQWXfSC6D5+JN7icT3ZVn+X9viUwPMMht/B/knYNb/j6YbsBqtoTBR8s5DJp5r0J6Ku1wT+RW7mSEIUTwGpQO4Zd9449cZUP5/zA77HMzhmCqFSDByah6xKucKPicAxPFLYSS7wxy3qcbNXoMKSlOoZ0McL4CYjilnIhY9apJ086OvoCy5YlfzvsDTVeJLgL62j6aQNiuFsOdxkggWS/Lfwchc0joGopPKHpj5LgueQ+oQDsRKdb0EkeiWB3W3P54RqBz1UeeViVc5H4ua5DUlDU3U/gUda4TRT0T7jfGKt8uWiKiUyvWhC8OonQfJEoBTayb4g3Hilc4e12MMf+GixQ5CNo="

CHANGELOG.rst

@@ -2,6 +2,20 @@ Changelog
 =========
 
 
+v2.2.1 (01-11-2017)
+-------------------
+
+Fix
+~~~
+- Fixed typo in README.md. [Tom Grobbe]
+- Fixed async write errors. [Jordan Dalton]
+
+Other
+~~~~~
+- Merge remote-tracking branch 'origin/TomGrobbe-patch-1' into develop.
+  [Jordan Dalton]
+
+
 v2.2.0 (30-10-2017)
 -------------------
 
@@ -20,6 +34,10 @@ New
 
   They all take a dynamic object that represnts the blips to modify.
 
+Changes
+~~~~~~~
+- Update version and changelog. [Jordan Dalton]
+
 Fix
 ~~~
 - Fixed native failing on restart. [Jordan Dalton]

README.md

@@ -1,5 +1,8 @@
 # fivem-live_map
 
+Master: [![Master Build](https://travis-ci.org/TGRHavoc/live_map.svg?branch=master)](https://travis-ci.org/TGRHavoc/live_map)
+Develop: [![Develop Build](https://travis-ci.org/TGRHavoc/live_map.svg?branch=develop)](https://travis-ci.org/TGRHavoc/live_map)
+
 This is the "backend" code for the live_map addon for FiveM that is ran on the
 game server.
 It creates a websocket server so that it can communicate to the
@@ -82,7 +85,7 @@ Below you can find information on some server-only events. This can only be call
 Example usage:
 ```lua
 -- Get the player's identifier
-identifiier = GetPlayerIdentifier(source, 0)
+identifier = GetPlayerIdentifier(source, 0)
 
 -- Set the player's "Name" to "Havoc"
 TriggerEvent("livemap:internal_AddPlayerData", identifier, "Name", "Havoc")
@@ -102,4 +105,3 @@ TriggerEvent("livemap:internal_RemovePlayer", identifier)
 * [Hellslicer/WebSocketServer](https://github.com/Hellslicer/WebSocketServer/blob/master/WebSocketEventListener.cs)
 * [deniszykov/WebSocketListener](https://github.com/deniszykov/WebSocketListener)
 * [JamesNK/Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json)
-

src/Live Map.sln

@@ -9,12 +9,15 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
+		Release|Unix = Release|Unix
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{15269C18-91AF-4129-8FA0-3601D1B0C6D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{15269C18-91AF-4129-8FA0-3601D1B0C6D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{15269C18-91AF-4129-8FA0-3601D1B0C6D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15269C18-91AF-4129-8FA0-3601D1B0C6D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15269C18-91AF-4129-8FA0-3601D1B0C6D2}.Release|Unix.ActiveCfg = Release|Unix
+		{15269C18-91AF-4129-8FA0-3601D1B0C6D2}.Release|Unix.Build.0 = Release|Unix
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Live Map/Live Map.csproj

@@ -30,9 +30,17 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Unix' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin/Release/</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CitizenFX.Core">
-      <HintPath>F:\fx-artifacts\374\citizen\clr2\lib\mono\4.5\CitizenFX.Core.dll</HintPath>
+      <HintPath>lib\CitizenFX.Core.dll</HintPath>
     </Reference>
     <Reference Include="deniszykov.WebSocketListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7f78616efb4a208d, processorArchitecture=MSIL">
       <HintPath>..\packages\deniszykov.WebSocketListener.4.0.0\lib\net45\deniszykov.WebSocketListener.dll</HintPath>
@@ -55,18 +63,22 @@
     <Compile Include="LiveMap.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SocketHandler.cs" />
-    <Compile Include="SocketWrapper.cs" />
     <Compile Include="WebSocketServer.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="lib\CitizenFX.Core.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>COPY /Y "$(TargetPath)" "F:\fx-server\resources\live_map\server"
-COPY /Y "$(TargetDir)\deniszykov.WebSocketListener.dll" "F:\fx-server\resources\live_map"
-COPY /Y "$(TargetDir)\Newtonsoft.Json.dll" "F:\fx-server\resources\live_map"</PostBuildEvent>
+  <PropertyGroup Condition=" '$(Platform)' != 'Unix'">
+    <PostBuildEvent>
+	COPY /Y "$(TargetPath)" "F:\fx-server\resources\live_map\server"
+    COPY /Y "$(TargetDir)\deniszykov.WebSocketListener.dll" "F:\fx-server\resources\live_map"
+    COPY /Y "$(TargetDir)\Newtonsoft.Json.dll" "F:\fx-server\resources\live_map"
+	</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

version.json

@@ -1,3 +1,3 @@
 {
-  "resource" : "2.2.0"
+  "resource" : "2.2.1"
 }