Merge pull request #1 from HelloKitty/dev

Switched to MyGet; Removed Submodules
HelloKitty · Feb 21, 2016 · 2681245 · 2681245
2 parents d8bd760 + c9f0654
commit 2681245
Show file tree

Hide file tree

Showing 15 changed files with 89 additions and 83 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git 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
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageRestore>
+    <add key="enabled" value="True" />
+    <add key="automatic" value="True" />
+  </packageRestore>
+  <activePackageSource>
+    <add key="All" value="(Aggregate source)" />
+  </activePackageSource>
+  <packageSources>
+    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="HelloKitty Github" value="https://www.myget.org/F/hellokitty/api/v2" />
+  </packageSources>
+</configuration>
diff --git 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
diff --git a/lib/BuildDependencies.sh b/lib/BuildDependencies.sh
diff --git a/lib/GladNet2 b/lib/GladNet2
diff --git a/lib/LoggingServices b/lib/LoggingServices
diff --git a/lib/Net35Essentials b/lib/Net35Essentials
diff --git a/lib/SubmoduleInit.bat b/lib/SubmoduleInit.bat
diff --git a/lib/nuget.exe b/lib/nuget.exe
diff --git a/src/GladNet.Serializer.Protobuf/GladNet.Serializer.Protobuf.csproj b/src/GladNet.Serializer.Protobuf/GladNet.Serializer.Protobuf.csproj
@@ -30,21 +30,29 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Common.Logging.3.3.1\lib\net35\Common.Logging.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Common.Logging.Core, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Common.Logging.Core.3.3.1\lib\net35\Common.Logging.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Fasterflect, Version=2.1.3.0, Culture=neutral, PublicKeyToken=38d18473284c1ca7, processorArchitecture=MSIL">
       <HintPath>..\..\packages\fasterflect.2.1.3\lib\net35\Fasterflect.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="GladNet.Common">
-      <HintPath>..\..\lib\Dependency Builds\GladNet\DLLs\GladNet.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="GladNet.Serializer">
-      <HintPath>..\..\lib\Dependency Builds\GladNet\DLLs\GladNet.Serializer.dll</HintPath>
+    <Reference Include="GladNet.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\GladNet.Common.1.0.1\lib\net35\GladNet.Common.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Logging.Services">
-      <HintPath>..\..\lib\Dependency Builds\LoggingServices\DLLs\Logging.Services.dll</HintPath>
+    <Reference Include="GladNet.Serializer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\GladNet.Serializer.1.0.1\lib\net35\GladNet.Serializer.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Net35Essentials">
-      <HintPath>..\..\lib\Dependency Builds\Net35Essentials\DLLs\Net35Essentials.dll</HintPath>
+    <Reference Include="Net35Essentials, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Net35Essentials.1.0.2\lib\net35\Net35Essentials.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <HintPath>..\..\packages\protobuf-net.2.0.0.668\lib\net35\protobuf-net.dll</HintPath>

diff --git a/src/GladNet.Serializer.Protobuf/packages.config b/src/GladNet.Serializer.Protobuf/packages.config
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Common.Logging" version="3.3.1" targetFramework="net35" />
+  <package id="Common.Logging.Core" version="3.3.1" targetFramework="net35" />
   <package id="fasterflect" version="2.1.3" targetFramework="net35" />
+  <package id="GladNet.Common" version="1.0.1" targetFramework="net35" />
+  <package id="GladNet.Serializer" version="1.0.1" targetFramework="net35" />
+  <package id="Net35Essentials" version="1.0.2" targetFramework="net35" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net35" />
 </packages>
diff --git 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 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GladNet.Common">
-      <HintPath>..\..\lib\Dependency Builds\GladNet\DLLs\GladNet.Common.dll</HintPath>
+    <Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Common.Logging.3.3.1\lib\net35\Common.Logging.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Common.Logging.Core, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Common.Logging.Core.3.3.1\lib\net35\Common.Logging.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="GladNet.Serializer">
-      <HintPath>..\..\lib\Dependency Builds\GladNet\DLLs\GladNet.Serializer.dll</HintPath>
+    <Reference Include="GladNet.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\GladNet.Common.1.0.1\lib\net35\GladNet.Common.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Logging.Services">
-      <HintPath>..\..\lib\Dependency Builds\LoggingServices\DLLs\Logging.Services.dll</HintPath>
+    <Reference Include="GladNet.Serializer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\GladNet.Serializer.1.0.1\lib\net35\GladNet.Serializer.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net35\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Net35Essentials">
-      <HintPath>..\..\lib\Dependency Builds\Net35Essentials\DLLs\Net35Essentials.dll</HintPath>
+    <Reference Include="Net35Essentials, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Net35Essentials.1.0.2\lib\net35\Net35Essentials.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework, Version=3.0.5813.39033, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NUnit.3.0.1\lib\net20\nunit.framework.dll</HintPath>

diff --git a/tests/GladNet.Serializer.Protobuf.Tests/packages.config b/tests/GladNet.Serializer.Protobuf.Tests/packages.config
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Common.Logging" version="3.3.1" targetFramework="net35" />
+  <package id="Common.Logging.Core" version="3.3.1" targetFramework="net35" />
+  <package id="GladNet.Common" version="1.0.1" targetFramework="net35" />
+  <package id="GladNet.Serializer" version="1.0.1" targetFramework="net35" />
   <package id="Moq" version="4.2.1510.2205" targetFramework="net35" />
+  <package id="Net35Essentials" version="1.0.2" targetFramework="net35" />
   <package id="NUnit" version="3.0.1" targetFramework="net35" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net35" />
 </packages>