Updated GraphicsTests to latest Ninject via Nuget

cleaned up some minor code quality issues in view and IRenderable Signed-off-by: Martin Evans <martindevans@gmail.com>
TomGillen · Dec 29, 2012 · 9af2ed4 · 9af2ed4
1 parent 2bb47f0
commit 9af2ed4
Show file tree

Hide file tree

Showing 37 changed files with 55,034 additions and 29 deletions.
diff --git a/Myre/Myre.Graphics/IRenderable.cs b/Myre/Myre.Graphics/IRenderable.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
 namespace Myre.Graphics
 {
     /// <summary>

diff --git a/Myre/Myre.Graphics/View.cs b/Myre/Myre.Graphics/View.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Myre.Entities.Behaviours;
-using Myre.Entities;
-using Microsoft.Xna.Framework.Graphics;
+using System.Collections.Generic;
 using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Myre.Entities;
+using Myre.Entities.Behaviours;
 
 namespace Myre.Graphics
 {
@@ -30,25 +27,12 @@ public Viewport Viewport
 
         public override void CreateProperties(Entity.ConstructionContext context)
         {
-            this.camera = context.CreateProperty<Camera>("camera");
-            this.viewport = context.CreateProperty<Viewport>("viewport");
+            camera = context.CreateProperty<Camera>("camera");
+            viewport = context.CreateProperty<Viewport>("viewport");
 
             base.CreateProperties(context);
         }
 
-        /*
-        public Property<Camera> Camera { get; private set; }
-        public Property<Viewport> Viewport { get; private set; }
-
-        public View(
-            Property<Camera> camera,
-            Property<Viewport> viewport)
-        {
-            this.Camera = camera;
-            this.Viewport = viewport;
-        }
-        */
-
         public void SetMetadata(RendererMetadata metadata)
         {
             metadata.Set("activeview", this);

diff --git a/Myre/Myre.sln b/Myre/Myre.sln
@@ -60,6 +60,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "(360) Myre.Physics2", "Myre.Physics2D\(360) Myre.Physics2.csproj", "{F47B81C7-36F7-4DD5-9437-EDEE749E8A30}"
 EndProject
 Global
+	GlobalSection(CodealikeProperties) = postSolution
+		SolutionGuid = baae5246-fe01-4f58-b258-9992ddf2bf95
+	EndGlobalSection
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = Myre.vsmdi
 	EndGlobalSection

diff --git a/Testing/GraphicsTests/GraphicsTests/(360) GraphicsTests.csproj b/Testing/GraphicsTests/GraphicsTests/(360) GraphicsTests.csproj
@@ -150,6 +150,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Xna.Framework">

diff --git a/Testing/GraphicsTests/GraphicsTests/(x86) GraphicsTests.csproj b/Testing/GraphicsTests/GraphicsTests/(x86) GraphicsTests.csproj
@@ -72,8 +72,9 @@
     <Reference Include="mscorlib">
       <Private>False</Private>
     </Reference>
-    <Reference Include="Ninject">
-      <HintPath>..\..\..\Libraries\x86\Ninject.dll</HintPath>
+    <Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Ninject.3.0.1.10\lib\net40\Ninject.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Private>False</Private>
@@ -179,6 +180,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.targets" />

diff --git a/Testing/GraphicsTests/GraphicsTests/packages.config b/Testing/GraphicsTests/GraphicsTests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Ninject" version="3.0.1.10" targetFramework="net40-Client" />
+</packages>
diff --git a/Testing/Myre.Testing.sln b/Testing/Myre.Testing.sln
@@ -53,6 +53,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Myre.Tests", "Myre.Tests\Myre.Tests.csproj", "{523C09C2-B475-4CCC-9CCE-C19B54E4C829}"
 EndProject
 Global
+	GlobalSection(CodealikeProperties) = postSolution
+		SolutionGuid = 20c0e23c-715a-46d9-b3da-81a12e264c29
+	EndGlobalSection
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = Myre.Testing.vsmdi
 	EndGlobalSection

diff --git a/Testing/packages/Ninject.3.0.1.10/Ninject.3.0.1.10.nupkg b/Testing/packages/Ninject.3.0.1.10/Ninject.3.0.1.10.nupkg
diff --git a/Testing/packages/Ninject.3.0.1.10/Ninject.3.0.1.10.nuspec b/Testing/packages/Ninject.3.0.1.10/Ninject.3.0.1.10.nuspec
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>Ninject</id>
+    <version>3.0.1.10</version>
+    <authors>Ninject Project Contributors</authors>
+    <owners>Ninject Project Contributors</owners>
+    <licenseUrl>https://github.com/ninject/ninject/raw/master/LICENSE.txt</licenseUrl>
+    <projectUrl>http://www.ninject.org/</projectUrl>
+    <iconUrl>https://github.com/ninject/ninject/raw/master/logos/Ninject-Logo32.png</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>Stop writing monolithic applications that make you feel like you have to move mountains to make the simplest of changes. Ninject helps you use the technique of dependency injection to break your applications into loosely-coupled, highly-cohesive components, and then glue them back together in a flexible manner.</description>
+    <summary>IoC container for .NET</summary>
+    <tags>Ninject ioc di</tags>
+    <references>
+      <reference file="Ninject.dll" />
+    </references>
+  </metadata>
+</package>
diff --git a/Testing/packages/Ninject.3.0.1.10/lib/net35/Ninject.dll b/Testing/packages/Ninject.3.0.1.10/lib/net35/Ninject.dll
diff --git a/Testing/packages/Ninject.3.0.1.10/lib/net35/Ninject.pdb b/Testing/packages/Ninject.3.0.1.10/lib/net35/Ninject.pdb