Skip to content

Commit

Permalink
Some restructuring.
Browse files Browse the repository at this point in the history
  • Loading branch information
kellyelton committed Mar 18, 2013
1 parent ac3e77b commit c3ad975
Show file tree
Hide file tree
Showing 70 changed files with 4,473 additions and 4,283 deletions.
44 changes: 44 additions & 0 deletions OCTGN.sln
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octgn.Online.Client", "octg
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "o8build", "octgnFX\o8build\o8build.csproj", "{F31191FB-DD9E-4C6C-A37B-796D653DD864}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octgn.DataNew", "octgnFX\Octgn.DataNew\Octgn.DataNew.csproj", "{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octgn.Core", "octgnFX\Octgn.Core\Octgn.Core.csproj", "{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug x86|Any CPU = Debug x86|Any CPU
Expand Down Expand Up @@ -510,6 +514,46 @@ Global
{F31191FB-DD9E-4C6C-A37B-796D653DD864}.Release|ARM.ActiveCfg = Release|Any CPU
{F31191FB-DD9E-4C6C-A37B-796D653DD864}.Release|x64.ActiveCfg = Release|Any CPU
{F31191FB-DD9E-4C6C-A37B-796D653DD864}.Release|x86.ActiveCfg = Release|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Debug x86|Any CPU.ActiveCfg = Debug|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Debug x86|Any CPU.Build.0 = Debug|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Debug x86|ARM.ActiveCfg = Debug|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Debug x86|x64.ActiveCfg = Debug|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Debug x86|x86.ActiveCfg = Debug|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Debug|ARM.ActiveCfg = Debug|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Debug|x64.ActiveCfg = Debug|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Debug|x86.ActiveCfg = Debug|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Release_Test|Any CPU.ActiveCfg = Release|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Release_Test|Any CPU.Build.0 = Release|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Release_Test|ARM.ActiveCfg = Release|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Release_Test|x64.ActiveCfg = Release|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Release_Test|x86.ActiveCfg = Release|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Release|Any CPU.Build.0 = Release|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Release|ARM.ActiveCfg = Release|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Release|x64.ActiveCfg = Release|Any CPU
{59759960-0A48-45EC-ABB9-B4FAAD6D43EE}.Release|x86.ActiveCfg = Release|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Debug x86|Any CPU.ActiveCfg = Debug|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Debug x86|Any CPU.Build.0 = Debug|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Debug x86|ARM.ActiveCfg = Debug|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Debug x86|x64.ActiveCfg = Debug|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Debug x86|x86.ActiveCfg = Debug|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Debug|ARM.ActiveCfg = Debug|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Debug|x64.ActiveCfg = Debug|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Debug|x86.ActiveCfg = Debug|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Release_Test|Any CPU.ActiveCfg = Release|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Release_Test|Any CPU.Build.0 = Release|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Release_Test|ARM.ActiveCfg = Release|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Release_Test|x64.ActiveCfg = Release|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Release_Test|x86.ActiveCfg = Release|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Release|Any CPU.Build.0 = Release|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Release|ARM.ActiveCfg = Release|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Release|x64.ActiveCfg = Release|Any CPU
{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace Octgn.Library
namespace Octgn.Core
{
using Octgn.Data;
using Octgn.Library;

public class DataConfig : IDatabaseConfig
{
Expand Down
74 changes: 74 additions & 0 deletions octgnFX/Octgn.Core/Octgn.Core.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{9BDB193E-E3BA-4A1D-8C6E-ECABB6FFC7AB}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Octgn.Core</RootNamespace>
<AssemblyName>Octgn.Core</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="DataConfig.cs" />
<Compile Include="Plugin\IDeckBuilderPlugin.cs" />
<Compile Include="Plugin\IDeckBuilderPluginController.cs" />
<Compile Include="Plugin\IPlugin.cs" />
<Compile Include="Plugin\IPluginMenuItem.cs" />
<Compile Include="Plugin\PluginManager.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Octgn.Data\Octgn.Data.csproj">
<Project>{6c6e53ba-e75b-4e93-98ca-3c39ed908b2c}</Project>
<Name>Octgn.Data</Name>
</ProjectReference>
<ProjectReference Include="..\Octgn.Library\Octgn.Library.csproj">
<Project>{af4b3885-f178-4c6b-99c9-9eb178fec994}</Project>
<Name>Octgn.Library</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="log4net">
<HintPath>..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.IO.Abstractions">
<HintPath>..\..\packages\System.IO.Abstractions.1.4.0.41\lib\net35\System.IO.Abstractions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Octgn.Library.Plugin
namespace Octgn.Core.Plugin
{
using System.Collections.Generic;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Octgn.Library.Plugin
namespace Octgn.Core.Plugin
{
using Octgn.Data;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Octgn.Library.Plugin
namespace Octgn.Core.Plugin
{
using System;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
namespace Octgn.Library.Plugin
namespace Octgn.Core.Plugin
{
using System;

/// <summary>
/// Interface for creating plugin menu items.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.IO.Abstractions;
using System.Management.Instrumentation;
using System.Reflection;

using log4net;

internal static class PluginManager
{
internal static ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
internal static IFileSystem FS { get; set; }

static PluginManager()
Expand All @@ -34,7 +36,7 @@ internal static IQueryable<T> GetPlugins<T>()
}
catch (Exception e)
{
Trace.WriteLine(e.Message);
Log.Error("Problem loading plugin " + f.FullName, e);
}
}
// Load all plugins built into OCTGN
Expand Down
37 changes: 37 additions & 0 deletions octgnFX/Octgn.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Octgn.Core")]
[assembly: AssemblyDescription("Octgn 3.0 Core")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Octgn.")]
[assembly: AssemblyProduct("Octgn.Core")]
[assembly: AssemblyCopyright("Copyright © Octgn 2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: InternalsVisibleTo("Octgn")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("7bae7c0b-a5b0-4b1e-9cd0-60b31436c85a")]
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.11.56")]
[assembly: AssemblyFileVersion("3.0.11.56")]
5 changes: 5 additions & 0 deletions octgnFX/Octgn.Core/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.0" targetFramework="net40" />
<package id="System.IO.Abstractions" version="1.4.0.41" targetFramework="net40" />
</packages>
2 changes: 2 additions & 0 deletions octgnFX/Octgn.Data/DatabaseHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

namespace Octgn.Data
{
using Octgn.Library;

public class DatabaseHandler
{
private static Dictionary<string, List<string>> columnCache = new Dictionary<string, List<string>>();
Expand Down
Loading

0 comments on commit c3ad975

Please sign in to comment.