Skip to content

Commit

Permalink
Switched to MyGet instead of Submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
HelloKitty committed Feb 21, 2016
1 parent 88824fd commit c9f0654
Show file tree
Hide file tree
Showing 14 changed files with 58 additions and 80 deletions.
10 changes: 0 additions & 10 deletions .gitmodules

This file was deleted.

5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 14 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -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>
22 changes: 0 additions & 22 deletions lib/BuildDependencies.bat

This file was deleted.

22 changes: 0 additions & 22 deletions lib/BuildDependencies.sh

This file was deleted.

1 change: 0 additions & 1 deletion lib/GladNet2
Submodule GladNet2 deleted from 6e8ab8
1 change: 0 additions & 1 deletion lib/LoggingServices
Submodule LoggingServices deleted from 91236c
1 change: 0 additions & 1 deletion lib/Net35Essentials
Submodule Net35Essentials deleted from c8f1df
2 changes: 0 additions & 2 deletions lib/SubmoduleInit.bat

This file was deleted.

Binary file removed lib/nuget.exe
Binary file not shown.
26 changes: 17 additions & 9 deletions src/GladNet.Serializer.Protobuf/GladNet.Serializer.Protobuf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions src/GladNet.Serializer.Protobuf/packages.config
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions tests/GladNet.Serializer.Protobuf.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit c9f0654

Please sign in to comment.