diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 0c79614..0000000 --- a/.gitmodules +++ /dev/null @@ -1,10 +0,0 @@ -[submodule "lib/GladNet2"] - path = lib/GladNet2 - url = https://github.com/HelloKitty/GladNet2.0.git -[submodule "lib/LoggingServices"] - path = lib/LoggingServices - url = https://github.com/HelloKitty/.NetLoggingServices.git - branch = Net-3.5 -[submodule "lib/Net35Essentials"] - path = lib/Net35Essentials - url = https://github.com/HelloKitty/.Net3.5Essentials.git diff --git a/.travis.yml b/.travis.yml index cdc76e3..97b8f26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,16 +6,13 @@ before_install: install: - nuget install NUnit.Runners -Version 3.0.1 -OutputDirectory tests/testrunner - - nuget restore GladNet.Serializer.Protobuf.sln + - nuget restore GladNet.Serializer.Protobuf.sln -ConfigFile NuGet.config before_script: - - chmod +x ./lib/BuildDependencies.sh - chmod +x ./tests/RunTests.sh - chmod +x ./Build.sh script: - - cd "$TRAVIS_BUILD_DIR/lib" - - ./BuildDependencies.sh - cd "$TRAVIS_BUILD_DIR" - ./Build.sh - cd "$TRAVIS_BUILD_DIR/tests" diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 0000000..1d34c89 --- /dev/null +++ b/NuGet.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index a90e91a..e77f3d7 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,38 @@ GladNet2 serialization API implemented around Marc Gravell's Protobuf-net implementation of Google's protocol buffers. +Come chat: [![https://gitter.im/HelloKitty/GladNet2.0y](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/HelloKitty/GladNet2.0?utm_source=share-link&utm_medium=link&utm_campaign=share-link) + If you're looking for GladNet2: https://github.com/HelloKitty/GladNet2.0 -###Builds +## Implementations + +Lidgren's: https://github.com/HelloKitty/GladNet2-Lidgren + +Photon Server's: https://github.com/HelloKitty/GladNet.PhotonServer + +## Setup + +To use this project you'll first need a couple of things: + - Visual Studio 2015 + - Add Nuget Feed https://www.myget.org/F/hellokitty/api/v2 in VS (Options -> NuGet -> Package Sources) + +## Builds + +Available on a Nuget Feed: https://www.myget.org/F/hellokitty/api/v2 [![hellokitty MyGet Build Status](https://www.myget.org/BuildSource/Badge/hellokitty?identifier=29628124-43cc-4d0a-bdd9-6ac2a4933322)](https://www.myget.org/feed/Packages/hellokitty) + +##Tests + +#### Linux/Mono - Unit Tests +||Debug x86|Debug x64|Release x86|Release x64| +|:--:|:--:|:--:|:--:|:--:|:--:| +|**master**| N/A | N/A | N/A | [![Build Status](https://travis-ci.org/HelloKitty/GladNet.Serializer.Protobuf.svg?branch=master)](https://travis-ci.org/HelloKitty/GladNet.Serializer.Protobuf) | +|**dev**| N/A | N/A | N/A | [![Build Status](https://travis-ci.org/HelloKitty/GladNet.Serializer.Protobuf.svg?branch=dev)](https://travis-ci.org/HelloKitty/GladNet.Serializer.Protobuf)| + +#### Windows - Unit Tests + +(Done locally) -Linux/Mono: [![Build Status](https://travis-ci.org/HelloKitty/GladNet.Serializer.Protobuf.svg?branch=master)](https://travis-ci.org/HelloKitty/GladNet.Serializer.Protobuf) +##Licensing -Windows: (Tested Locally) +This project is licensed under the MIT license. diff --git a/lib/BuildDependencies.bat b/lib/BuildDependencies.bat deleted file mode 100644 index c2b86c0..0000000 --- a/lib/BuildDependencies.bat +++ /dev/null @@ -1,22 +0,0 @@ -call SubmoduleInit.bat < nul - -"%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild.exe" .\LoggingServices/LoggingServices.sln /p:Configuration=Release /p:Platform="Any CPU" -xcopy /R /E /Y /q ".\LoggingServices\src\LoggingServices\bin\Release" ".\Dependency Builds\LoggingServices\DLLs\" - -"%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild.exe" .\Net35Essentials/Net35Essentials.sln /p:Configuration=Release /p:Platform="Any CPU" -xcopy /R /E /Y /q ".\Net35Essentials\src\Net35Essentials\bin\Release" ".\Dependency Builds\Net35Essentials\DLLs\" - -nuget.exe restore GladNet2\GladNetV2.sln -CD .\GladNet2\Lib -call BuildDependencies.bat < nul -CD .. - -"%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild.exe" GladNetV2.sln /p:Configuration=Release /p:Platform="Any CPU" - -CD .. - -xcopy /R /E /Y /q ".\GladNet2\src\GladNet.Common\bin\Release" ".\Dependency Builds\GladNet\DLLs\" -xcopy /R /E /Y /q ".\GladNet2\src\GladNet.Serializer\bin\Release" ".\Dependency Builds\GladNet\DLLs\" -xcopy /R /E /Y /q ".\GladNet2\src\GladNet.Server.Common\bin\Release" ".\Dependency Builds\GladNet\DLLs\" - -PAUSE \ No newline at end of file diff --git a/lib/BuildDependencies.sh b/lib/BuildDependencies.sh deleted file mode 100644 index 0f7f18e..0000000 --- a/lib/BuildDependencies.sh +++ /dev/null @@ -1,22 +0,0 @@ -xbuild ./LoggingServices/LoggingServices.sln /p:Configuration=Release /p:Platform="Any CPU" -mkdir -p Dependency\ Builds/LoggingServices/DLLs/ -rsync -avv ./LoggingServices/src/LoggingServices/bin/Release/ Dependency\ Builds/LoggingServices/DLLs/ - -chmod +x ./GladNet2/lib/BuildDependencies.sh -cd GladNet2/lib/ -./BuildDependencies.sh -cd .. -nuget restore GladNetV2.sln -xbuild GladNetV2.sln /p:Configuration=Release /p:Platform="Any CPU" -cd .. - -mkdir -p Dependency\ Builds/GladNet/DLLs/ -rsync -avv ./GladNet2/src/GladNet.Common/bin/Release/ Dependency\ Builds/GladNet/DLLs/ -rsync -avv ./GladNet2/src/GladNet.Serializer/bin/Release/ Dependency\ Builds/GladNet/DLLs/ -rsync -avv ./GladNet2/src/GladNet.Server.Common/bin/Release/ Dependency\ Builds/GladNet/DLLs/ - - - -xbuild ./Net35Essentials/Net35Essentials.sln /p:Configuration=Release /p:Platform="Any CPU" -mkdir -p Dependency\ Builds/Net35Essentials/DLLs/ -rsync -avv ./Net35Essentials/src/Net35Essentials/bin/Release/ Dependency\ Builds/Net35Essentials/DLLs/ \ No newline at end of file diff --git a/lib/GladNet2 b/lib/GladNet2 deleted file mode 160000 index 6e8ab8f..0000000 --- a/lib/GladNet2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6e8ab8f818616806983c80356a7cc347b207959f diff --git a/lib/LoggingServices b/lib/LoggingServices deleted file mode 160000 index 91236c6..0000000 --- a/lib/LoggingServices +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 91236c671210642f0a1d87261d77188f11738b4e diff --git a/lib/Net35Essentials b/lib/Net35Essentials deleted file mode 160000 index c8f1df0..0000000 --- a/lib/Net35Essentials +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c8f1df02dbb7597a109574e2e00f117209da9040 diff --git a/lib/SubmoduleInit.bat b/lib/SubmoduleInit.bat deleted file mode 100644 index 09b179f..0000000 --- a/lib/SubmoduleInit.bat +++ /dev/null @@ -1,2 +0,0 @@ -call git.exe submodule update --init --recursive -PAUSE \ No newline at end of file diff --git a/lib/nuget.exe b/lib/nuget.exe deleted file mode 100644 index 324daa8..0000000 Binary files a/lib/nuget.exe and /dev/null differ diff --git a/src/GladNet.Serializer.Protobuf/GladNet.Serializer.Protobuf.csproj b/src/GladNet.Serializer.Protobuf/GladNet.Serializer.Protobuf.csproj index 42d2824..dfc92de 100644 --- a/src/GladNet.Serializer.Protobuf/GladNet.Serializer.Protobuf.csproj +++ b/src/GladNet.Serializer.Protobuf/GladNet.Serializer.Protobuf.csproj @@ -30,21 +30,29 @@ 4 + + ..\..\packages\Common.Logging.3.3.1\lib\net35\Common.Logging.dll + True + + + ..\..\packages\Common.Logging.Core.3.3.1\lib\net35\Common.Logging.Core.dll + True + ..\..\packages\fasterflect.2.1.3\lib\net35\Fasterflect.dll True - - ..\..\lib\Dependency Builds\GladNet\DLLs\GladNet.Common.dll - - - ..\..\lib\Dependency Builds\GladNet\DLLs\GladNet.Serializer.dll + + ..\..\packages\GladNet.Common.1.0.1\lib\net35\GladNet.Common.dll + True - - ..\..\lib\Dependency Builds\LoggingServices\DLLs\Logging.Services.dll + + ..\..\packages\GladNet.Serializer.1.0.1\lib\net35\GladNet.Serializer.dll + True - - ..\..\lib\Dependency Builds\Net35Essentials\DLLs\Net35Essentials.dll + + ..\..\packages\Net35Essentials.1.0.2\lib\net35\Net35Essentials.dll + True ..\..\packages\protobuf-net.2.0.0.668\lib\net35\protobuf-net.dll diff --git a/src/GladNet.Serializer.Protobuf/packages.config b/src/GladNet.Serializer.Protobuf/packages.config index f787ee4..5066154 100644 --- a/src/GladNet.Serializer.Protobuf/packages.config +++ b/src/GladNet.Serializer.Protobuf/packages.config @@ -1,5 +1,10 @@  + + + + + \ No newline at end of file diff --git a/tests/GladNet.Serializer.Protobuf.Tests/GladNet.Serializer.Protobuf.Tests.csproj b/tests/GladNet.Serializer.Protobuf.Tests/GladNet.Serializer.Protobuf.Tests.csproj index bb65989..284411c 100644 --- a/tests/GladNet.Serializer.Protobuf.Tests/GladNet.Serializer.Protobuf.Tests.csproj +++ b/tests/GladNet.Serializer.Protobuf.Tests/GladNet.Serializer.Protobuf.Tests.csproj @@ -30,21 +30,29 @@ 4 - - ..\..\lib\Dependency Builds\GladNet\DLLs\GladNet.Common.dll + + ..\..\packages\Common.Logging.3.3.1\lib\net35\Common.Logging.dll + True + + + ..\..\packages\Common.Logging.Core.3.3.1\lib\net35\Common.Logging.Core.dll + True - - ..\..\lib\Dependency Builds\GladNet\DLLs\GladNet.Serializer.dll + + ..\..\packages\GladNet.Common.1.0.1\lib\net35\GladNet.Common.dll + True - - ..\..\lib\Dependency Builds\LoggingServices\DLLs\Logging.Services.dll + + ..\..\packages\GladNet.Serializer.1.0.1\lib\net35\GladNet.Serializer.dll + True ..\..\packages\Moq.4.2.1510.2205\lib\net35\Moq.dll True - - ..\..\lib\Dependency Builds\Net35Essentials\DLLs\Net35Essentials.dll + + ..\..\packages\Net35Essentials.1.0.2\lib\net35\Net35Essentials.dll + True ..\..\packages\NUnit.3.0.1\lib\net20\nunit.framework.dll diff --git a/tests/GladNet.Serializer.Protobuf.Tests/packages.config b/tests/GladNet.Serializer.Protobuf.Tests/packages.config index e7d9e29..cc1151f 100644 --- a/tests/GladNet.Serializer.Protobuf.Tests/packages.config +++ b/tests/GladNet.Serializer.Protobuf.Tests/packages.config @@ -1,6 +1,11 @@  + + + + + \ No newline at end of file