Skip to content

Commit 2681245

Browse files
committed
Merge pull request #1 from HelloKitty/dev
Switched to MyGet; Removed Submodules
2 parents d8bd760 + c9f0654 commit 2681245

15 files changed

Lines changed: 89 additions & 83 deletions

.gitmodules

Lines changed: 0 additions & 10 deletions
This file was deleted.

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,13 @@ before_install:
66

77
install:
88
- nuget install NUnit.Runners -Version 3.0.1 -OutputDirectory tests/testrunner
9-
- nuget restore GladNet.Serializer.Protobuf.sln
9+
- nuget restore GladNet.Serializer.Protobuf.sln -ConfigFile NuGet.config
1010

1111
before_script:
12-
- chmod +x ./lib/BuildDependencies.sh
1312
- chmod +x ./tests/RunTests.sh
1413
- chmod +x ./Build.sh
1514

1615
script:
17-
- cd "$TRAVIS_BUILD_DIR/lib"
18-
- ./BuildDependencies.sh
1916
- cd "$TRAVIS_BUILD_DIR"
2017
- ./Build.sh
2118
- cd "$TRAVIS_BUILD_DIR/tests"

NuGet.config

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageRestore>
4+
<add key="enabled" value="True" />
5+
<add key="automatic" value="True" />
6+
</packageRestore>
7+
<activePackageSource>
8+
<add key="All" value="(Aggregate source)" />
9+
</activePackageSource>
10+
<packageSources>
11+
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
12+
<add key="HelloKitty Github" value="https://www.myget.org/F/hellokitty/api/v2" />
13+
</packageSources>
14+
</configuration>

README.md

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,38 @@
22

33
GladNet2 serialization API implemented around Marc Gravell's Protobuf-net implementation of Google's protocol buffers.
44

5+
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)
6+
57
If you're looking for GladNet2: https://github.com/HelloKitty/GladNet2.0
68

7-
###Builds
9+
## Implementations
10+
11+
Lidgren's: https://github.com/HelloKitty/GladNet2-Lidgren
12+
13+
Photon Server's: https://github.com/HelloKitty/GladNet.PhotonServer
14+
15+
## Setup
16+
17+
To use this project you'll first need a couple of things:
18+
- Visual Studio 2015
19+
- Add Nuget Feed https://www.myget.org/F/hellokitty/api/v2 in VS (Options -> NuGet -> Package Sources)
20+
21+
## Builds
22+
23+
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)
24+
25+
##Tests
26+
27+
#### Linux/Mono - Unit Tests
28+
||Debug x86|Debug x64|Release x86|Release x64|
29+
|:--:|:--:|:--:|:--:|:--:|:--:|
30+
|**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) |
31+
|**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)|
32+
33+
#### Windows - Unit Tests
34+
35+
(Done locally)
836

9-
Linux/Mono: [![Build Status](https://travis-ci.org/HelloKitty/GladNet.Serializer.Protobuf.svg?branch=master)](https://travis-ci.org/HelloKitty/GladNet.Serializer.Protobuf)
37+
##Licensing
1038

11-
Windows: (Tested Locally)
39+
This project is licensed under the MIT license.

lib/BuildDependencies.bat

Lines changed: 0 additions & 22 deletions
This file was deleted.

lib/BuildDependencies.sh

Lines changed: 0 additions & 22 deletions
This file was deleted.

lib/GladNet2

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/LoggingServices

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/Net35Essentials

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/SubmoduleInit.bat

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)