Skip to content

Commit

Permalink
Replaced tabs by 4 spaces to get a bit more style cop compliant.
Browse files Browse the repository at this point in the history
  • Loading branch information
remogloor committed Sep 9, 2010
1 parent 01190f6 commit 1a213cc
Show file tree
Hide file tree
Showing 164 changed files with 8,619 additions and 8,619 deletions.
174 changes: 87 additions & 87 deletions Ninject.build
@@ -1,96 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<project name="Ninject" default="all">
<include buildfile="Ninject.include" />
<include buildfile="Ninject.include" />

<property name="version" value="2.1.0.0" overwrite="true"/>
<property name="version" value="2.1.0.0" overwrite="true"/>

<target name="all" depends="core csl test"/>
<target name="all" depends="core csl test"/>

<target name="core" depends="init">
<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}" output="${current.path.build}/${product.assembly}" doc="${current.path.build}/${product.docfile}" keyfile="${path.src}/${product.keyfile}">
<arg line="/filealign:512" unless="${nant.settings.currentframework == 'mono-2.0'}"/>
<sources basedir="${path.src}">
<include name="${build.asminfo}"/>
<include name="${product.name}/**/*.cs"/>
</sources>
<references>
<include name="mscorlib.dll"/>
<include name="System.dll"/>
<include name="System.Core.dll"/>
<include name="System.Web.dll" unless="${build.platform == 'silverlight-2.0'}"/>
</references>
</csc>
</target>
<target name="core" depends="init">
<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}" output="${current.path.build}/${product.assembly}" doc="${current.path.build}/${product.docfile}" keyfile="${path.src}/${product.keyfile}">
<arg line="/filealign:512" unless="${nant.settings.currentframework == 'mono-2.0'}"/>
<sources basedir="${path.src}">
<include name="${build.asminfo}"/>
<include name="${product.name}/**/*.cs"/>
</sources>
<references>
<include name="mscorlib.dll"/>
<include name="System.dll"/>
<include name="System.Core.dll"/>
<include name="System.Web.dll" unless="${build.platform == 'silverlight-2.0'}"/>
</references>
</csc>
</target>

<target name="csl" depends="init core">
<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}" output="${current.path.build.extensions}/CommonServiceLocator.NinjectAdapter.dll">
<arg line="/filealign:512" unless="${nant.settings.currentframework == 'mono-2.0'}"/>
<sources basedir="${path.src}">
<include name="${build.asminfo}"/>
<include name="CommonServiceLocator.NinjectAdapter/**/*.cs"/>
</sources>
<references basedir="${current.path.build}">
<include name="mscorlib.dll"/>
<include name="System.dll"/>
<include name="System.Core.dll"/>
<include name="System.Web.dll"/>
<include name="${product.assembly}"/>
<include name="lib/Microsoft.Practices.ServiceLocation.dll"/>
</references>
</csc>
</target>
<target name="csl" depends="init core">
<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}" output="${current.path.build.extensions}/CommonServiceLocator.NinjectAdapter.dll">
<arg line="/filealign:512" unless="${nant.settings.currentframework == 'mono-2.0'}"/>
<sources basedir="${path.src}">
<include name="${build.asminfo}"/>
<include name="CommonServiceLocator.NinjectAdapter/**/*.cs"/>
</sources>
<references basedir="${current.path.build}">
<include name="mscorlib.dll"/>
<include name="System.dll"/>
<include name="System.Core.dll"/>
<include name="System.Web.dll"/>
<include name="${product.assembly}"/>
<include name="lib/Microsoft.Practices.ServiceLocation.dll"/>
</references>
</csc>
</target>

<target name="compile-tests" depends="core" unless="${skip.tests}" if="${build.platform == 'net-3.5' or build.platform == 'net-4.0'}">
<mkdir dir="${current.path.test}"/>
<copy todir="${current.path.test}" flatten="true">
<fileset basedir="${current.path.build}">
<include name="**/*.dll"/>
</fileset>
</copy>
<copy todir="${current.path.test}">
<fileset basedir="${path.tools.xunit}">
<include name="xunit.dll"/>
<include name="xunit.should.dll"/>
</fileset>
</copy>
<copy todir="${current.path.test}" if="${string::contains(build.platform, 'silverlight')}">
<fileset basedir="${path.tools.moq}/silverlight">
<include name="Moq.Silverlight.dll"/>
<include name="Castle.DynamicProxy-Silverlight.dll"/>
<include name="Castle.Core-Silverlight.dll"/>
</fileset>
</copy>
<copy todir="${current.path.test}" if="${not (string::contains(build.platform, 'silverlight'))}">
<fileset basedir="${path.tools.moq}/net-3.5">
<include name="Moq.dll"/>
</fileset>
</copy>
<copy todir="${current.path.test}/TestModules">
<fileset basedir="${path.src}/Ninject.Tests/TestModules">
<include name="Ninject.Tests.TestModule.dll"/>
</fileset>
</copy>
<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}"
<target name="compile-tests" depends="core" unless="${skip.tests}" if="${build.platform == 'net-3.5' or build.platform == 'net-4.0'}">
<mkdir dir="${current.path.test}"/>
<copy todir="${current.path.test}" flatten="true">
<fileset basedir="${current.path.build}">
<include name="**/*.dll"/>
</fileset>
</copy>
<copy todir="${current.path.test}">
<fileset basedir="${path.tools.xunit}">
<include name="xunit.dll"/>
<include name="xunit.should.dll"/>
</fileset>
</copy>
<copy todir="${current.path.test}" if="${string::contains(build.platform, 'silverlight')}">
<fileset basedir="${path.tools.moq}/silverlight">
<include name="Moq.Silverlight.dll"/>
<include name="Castle.DynamicProxy-Silverlight.dll"/>
<include name="Castle.Core-Silverlight.dll"/>
</fileset>
</copy>
<copy todir="${current.path.test}" if="${not (string::contains(build.platform, 'silverlight'))}">
<fileset basedir="${path.tools.moq}/net-3.5">
<include name="Moq.dll"/>
</fileset>
</copy>
<copy todir="${current.path.test}/TestModules">
<fileset basedir="${path.src}/Ninject.Tests/TestModules">
<include name="Ninject.Tests.TestModule.dll"/>
</fileset>
</copy>
<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}"
output="${current.path.test}/Ninject.Tests.dll">
<sources basedir="${path.src}">
<include name="Ninject.Tests/**/*.cs"/>
</sources>
<references basedir="${current.path.test}">
<include name="mscorlib.dll"/>
<include name="System.dll"/>
<include name="System.Core.dll"/>
<include name="System.Web.dll"/>
<include name="Moq.dll" if="${not (string::contains(build.platform, 'silverlight'))}"/>
<include name="Moq.Silverlight.dll" if="${string::contains(build.platform, 'silverlight')}"/>
<include name="Castle.DynamicProxy-Silverlight.dll" if="${string::contains(build.platform, 'silverlight')}"/>
<include name="Castle.Core-Silverlight.dll" if="${string::contains(build.platform, 'silverlight')}"/>
<include name="xunit.dll"/>
<include name="xunit.should.dll"/>
<include name="Ninject.dll"/>
</references>
<nowarn>
<warning number="1584"/>
</nowarn>
</csc>
</target>
<sources basedir="${path.src}">
<include name="Ninject.Tests/**/*.cs"/>
</sources>
<references basedir="${current.path.test}">
<include name="mscorlib.dll"/>
<include name="System.dll"/>
<include name="System.Core.dll"/>
<include name="System.Web.dll"/>
<include name="Moq.dll" if="${not (string::contains(build.platform, 'silverlight'))}"/>
<include name="Moq.Silverlight.dll" if="${string::contains(build.platform, 'silverlight')}"/>
<include name="Castle.DynamicProxy-Silverlight.dll" if="${string::contains(build.platform, 'silverlight')}"/>
<include name="Castle.Core-Silverlight.dll" if="${string::contains(build.platform, 'silverlight')}"/>
<include name="xunit.dll"/>
<include name="xunit.should.dll"/>
<include name="Ninject.dll"/>
</references>
<nowarn>
<warning number="1584"/>
</nowarn>
</csc>
</target>
</project>
32 changes: 16 additions & 16 deletions src/CommonServiceLocator.NinjectAdapter/NinjectServiceLocator.cs
Expand Up @@ -16,23 +16,23 @@

namespace CommonServiceLocator.NinjectAdapter
{
public class NinjectServiceLocator : ServiceLocatorImplBase
{
public IKernel Kernel { get; private set; }
public class NinjectServiceLocator : ServiceLocatorImplBase
{
public IKernel Kernel { get; private set; }

public NinjectServiceLocator(IKernel kernel)
{
Kernel = kernel;
}
public NinjectServiceLocator(IKernel kernel)
{
Kernel = kernel;
}

protected override object DoGetInstance(Type serviceType, string key)
{
return Kernel.Get(serviceType, key);
}
protected override object DoGetInstance(Type serviceType, string key)
{
return Kernel.Get(serviceType, key);
}

protected override IEnumerable<object> DoGetAllInstances(Type serviceType)
{
return Kernel.GetAll(serviceType);
}
}
protected override IEnumerable<object> DoGetAllInstances(Type serviceType)
{
return Kernel.GetAll(serviceType);
}
}
}
16 changes: 8 additions & 8 deletions src/Ninject.Tests/ExtensionsForIEnumerable.cs
Expand Up @@ -3,12 +3,12 @@

namespace Ninject.Tests
{
public static class ExtensionsForIEnumerable
{
public static void Map<T>(this IEnumerable<T> series, Action<T> action)
{
foreach (T item in series)
action(item);
}
}
public static class ExtensionsForIEnumerable
{
public static void Map<T>(this IEnumerable<T> series, Action<T> action)
{
foreach (T item in series)
action(item);
}
}
}
6 changes: 3 additions & 3 deletions src/Ninject.Tests/Fakes/AbstractWeapon.cs
Expand Up @@ -2,7 +2,7 @@

namespace Ninject.Tests.Fakes
{
public abstract class AbstractWeapon
{
}
public abstract class AbstractWeapon
{
}
}
42 changes: 21 additions & 21 deletions src/Ninject.Tests/Fakes/Barracks.cs
@@ -1,28 +1,28 @@
namespace Ninject.Tests.Fakes
{
public class Barracks
{
public Barracks()
{
}
public class Barracks
{
public Barracks()
{
}

public Barracks( IWarrior warrior )
{
Warrior = warrior;
}
public Barracks( IWarrior warrior )
{
Warrior = warrior;
}

public Barracks( IWeapon weapon )
{
Weapon = weapon;
}
public Barracks( IWeapon weapon )
{
Weapon = weapon;
}

public Barracks( IWarrior warrior, IWeapon weapon )
{
Warrior = warrior;
Weapon = weapon;
}
public Barracks( IWarrior warrior, IWeapon weapon )
{
Warrior = warrior;
Weapon = weapon;
}

public IWeapon Weapon { get; set; }
public IWarrior Warrior { get; set; }
}
public IWeapon Weapon { get; set; }
public IWarrior Warrior { get; set; }
}
}
8 changes: 4 additions & 4 deletions src/Ninject.Tests/Fakes/FootSoldier.cs
@@ -1,7 +1,7 @@
namespace Ninject.Tests.Fakes
{
public class FootSoldier : IWarrior
{
public IWeapon Weapon { get; set; }
}
public class FootSoldier : IWarrior
{
public IWeapon Weapon { get; set; }
}
}
8 changes: 4 additions & 4 deletions src/Ninject.Tests/Fakes/IWarrior.cs
Expand Up @@ -2,8 +2,8 @@

namespace Ninject.Tests.Fakes
{
public interface IWarrior
{
IWeapon Weapon { get; }
}
public interface IWarrior
{
IWeapon Weapon { get; }
}
}
8 changes: 4 additions & 4 deletions src/Ninject.Tests/Fakes/IWeapon.cs
Expand Up @@ -2,8 +2,8 @@

namespace Ninject.Tests.Fakes
{
public interface IWeapon
{
string Name { get; }
}
public interface IWeapon
{
string Name { get; }
}
}
38 changes: 19 additions & 19 deletions src/Ninject.Tests/Fakes/Ninja.cs
@@ -1,28 +1,28 @@
namespace Ninject.Tests.Fakes
{
internal class Ninja : IWarrior
{
public Ninja(IWeapon weapon)
{
Weapon = weapon;
}
internal class Ninja : IWarrior
{
public Ninja(IWeapon weapon)
{
Weapon = weapon;
}

[Inject]
internal IWeapon SecondaryWeapon { get; set; }
[Inject]
internal IWeapon SecondaryWeapon { get; set; }

[Inject]
private IWeapon SecretWeapon { get; set; }
[Inject]
private IWeapon SecretWeapon { get; set; }

public IWeapon SecretWeaponAccessor
{
get { return SecretWeapon; }
set { SecretWeapon = value; }
}
public IWeapon SecretWeaponAccessor
{
get { return SecretWeapon; }
set { SecretWeapon = value; }
}

#region IWarrior Members
#region IWarrior Members

public IWeapon Weapon { get; set; }
public IWeapon Weapon { get; set; }

#endregion
}
#endregion
}
}

0 comments on commit 1a213cc

Please sign in to comment.