Skip to content

Commit

Permalink
Updated all packages
Browse files Browse the repository at this point in the history
Removed packages folder
Added packages folder to gitignore
  • Loading branch information
kellyelton committed Mar 11, 2016
1 parent 0782685 commit ad998d1
Show file tree
Hide file tree
Showing 566 changed files with 956 additions and 974,845 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -78,3 +78,4 @@ _TeamCity.OCTGN
/octgnFX/Octgn/*.tmp_proj
/installer/*.exe
/.HistoryData
/packages
31 changes: 23 additions & 8 deletions octgnFX/Octgn.Core/EmptyPackage.cs
@@ -1,12 +1,14 @@
namespace Octgn.Core
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.Versioning;

using NuGet;
namespace Octgn.Core
{
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.Versioning;

using NuGet;

public class EmptyPackage : IPackage
{
public string Id { get; private set; }
Expand Down Expand Up @@ -66,6 +68,11 @@ public Stream GetStream()
throw new NotImplementedException();
}

public void ExtractContents(IFileSystem fileSystem, string extractPath)
{
throw new NotImplementedException();
}

public bool IsAbsoluteLatestVersion { get; private set; }

public bool IsLatestVersion { get; private set; }
Expand All @@ -75,5 +82,13 @@ public Stream GetStream()
public DateTimeOffset? Published { get; private set; }

public IEnumerable<IPackageAssemblyReference> AssemblyReferences { get; private set; }

public bool DevelopmentDependency
{
get
{
throw new NotImplementedException();
}
}
}
}
42 changes: 18 additions & 24 deletions octgnFX/Octgn.Core/Octgn.Core.csproj
Expand Up @@ -81,7 +81,6 @@
<Compile Include="Prefs.cs" />
<Compile Include="Properties\Annotations.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ProxyGenerator\RazorTemplateEngine.cs" />
<Compile Include="Tabletop\GameEngine.cs" />
<Compile Include="Tabletop\GameState.cs" />
<Compile Include="Util\BigInteger.cs" />
Expand All @@ -105,40 +104,35 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="Ionic.Zip">
<HintPath>..\..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll</HintPath>
<Reference Include="Ionic.Zip, Version=1.9.8.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetZip.1.9.8\lib\net20\Ionic.Zip.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\..\packages\log4net.2.0.5\lib\net40-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.XmlTransform">
<HintPath>..\..\packages\Microsoft.Web.Xdt.1.0.0\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
<Reference Include="Microsoft.Web.XmlTransform, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Newtonsoft.Json.6.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NuGet.Core, Version=2.7.41101.299, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\NuGet.Core.2.7.2\lib\net40-Client\NuGet.Core.dll</HintPath>
<Reference Include="NuGet.Core, Version=2.10.1.766, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\NuGet.Core.2.10.1\lib\net40-Client\NuGet.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="RazorEngine">
<HintPath>..\..\packages\RazorEngine.3.3.0\lib\net40\RazorEngine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.IO.Abstractions, Version=1.4.0.69, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\System.IO.Abstractions.1.4.0.69\lib\net35\System.IO.Abstractions.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="System.IO.Abstractions, Version=2.0.0.124, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.IO.Abstractions.2.0.0.124\lib\net40\System.IO.Abstractions.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="WindowsBase" />
Expand Down
86 changes: 0 additions & 86 deletions octgnFX/Octgn.Core/ProxyGenerator/RazorTemplateEngine.cs

This file was deleted.

14 changes: 6 additions & 8 deletions octgnFX/Octgn.Core/packages.config
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetZip" version="1.9.1.8" targetFramework="net40" />
<package id="log4net" version="2.0.2" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
<package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net40" />
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net40" />
<package id="NuGet.Core" version="2.7.2" targetFramework="net40" />
<package id="RazorEngine" version="3.3.0" targetFramework="net40" />
<package id="System.IO.Abstractions" version="1.4.0.69" targetFramework="net40" />
<package id="DotNetZip" version="1.9.8" targetFramework="net40" />
<package id="log4net" version="2.0.5" targetFramework="net40" />
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net40" />
<package id="NuGet.Core" version="2.10.1" targetFramework="net40" />
<package id="System.IO.Abstractions" version="2.0.0.124" targetFramework="net40" />
</packages>
6 changes: 3 additions & 3 deletions octgnFX/Octgn.DataNew/Octgn.DataNew.csproj
Expand Up @@ -105,9 +105,9 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="log4net, Version=1.2.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\..\packages\log4net.2.0.5\lib\net40-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
Expand Down
2 changes: 1 addition & 1 deletion octgnFX/Octgn.DataNew/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.2" targetFramework="net40" />
<package id="log4net" version="2.0.5" targetFramework="net40" />
</packages>
18 changes: 9 additions & 9 deletions octgnFX/Octgn.Library/Octgn.Library.csproj
Expand Up @@ -72,19 +72,19 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=1.2.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\..\packages\log4net.2.0.5\lib\net40-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Newtonsoft.Json.6.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.8.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Abstractions, Version=1.4.0.69, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\System.IO.Abstractions.1.4.0.69\lib\net35\System.IO.Abstractions.dll</HintPath>
<Reference Include="System.IO.Abstractions, Version=2.0.0.124, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.IO.Abstractions.2.0.0.124\lib\net40\System.IO.Abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Xml.Linq" />
Expand Down
6 changes: 3 additions & 3 deletions octgnFX/Octgn.Library/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.2" targetFramework="net40" />
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net40" />
<package id="System.IO.Abstractions" version="1.4.0.69" targetFramework="net40" />
<package id="log4net" version="2.0.5" targetFramework="net40" />
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net40" />
<package id="System.IO.Abstractions" version="2.0.0.124" targetFramework="net40" />
</packages>
14 changes: 9 additions & 5 deletions octgnFX/Octgn.Online.GameService/App.config
Expand Up @@ -4,10 +4,10 @@
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections>
<appSettings>
<add key="LOGENTRIES_TOKEN" value="" />

<add key="log4net.Internal.Debug" value="false" />
<add key="LOGENTRIES_ACCOUNT_KEY" value="" />
<add key="LOGENTRIES_LOCATION" value="" />


<add key="ServerPath" value="of.octgn.net" />
<add key="XmppUsername" value="gameserv-test" />
<add key="XmppPassword" value="password" />
Expand Down Expand Up @@ -53,11 +53,15 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.12.0" newVersion="1.2.12.0" />
<bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down

0 comments on commit ad998d1

Please sign in to comment.