Merge pull request #108 from peppy/general-fixes

Framework & OpenTK updates.

osu-framework

@@ -1 +1 @@
-Subproject commit a5f1aa927799360163dcda3387653339c4bb27fa
+Subproject commit 5eb743100d61dc19b34b09ac3530e2242c0adbc2

osu.Desktop.VisualTests/Program.cs

@@ -5,7 +5,7 @@ using System;
 using osu.Framework.Desktop;
 using osu.Framework.Platform;
 
-namespace osu.Framework.VisualTests
+namespace osu.Desktop.VisualTests
 {
     public static class Program
     {

osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs

@@ -1,23 +1,23 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using osu.Framework;
 using osu.Framework.GameModes.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Threading;
 using osu.Game;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Chat;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Online.Chat.Display;
-using osu.Framework;
+using OpenTK;
 
-namespace osu.Desktop.Tests
+namespace osu.Desktop.VisualTests.Tests
 {
     class TestCaseChatDisplay : TestCase
     {

osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs

@@ -1,10 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
+using System.Collections.Generic;
 using osu.Framework.GameModes.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.MathUtils;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Objects.Osu;
@@ -12,10 +13,9 @@ using osu.Game.GameModes.Play.Catch;
 using osu.Game.GameModes.Play.Mania;
 using osu.Game.GameModes.Play.Osu;
 using osu.Game.GameModes.Play.Taiko;
-using System.Collections.Generic;
+using OpenTK;
-using osu.Framework.Timing;
 
-namespace osu.Desktop.Tests
+namespace osu.Desktop.VisualTests.Tests
 {
     class TestCaseGamefield : TestCase
     {

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -1,20 +1,15 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Framework;
 using osu.Framework.GameModes.Testing;
-using osu.Framework.Timing;
 using osu.Framework.Graphics;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Objects.Osu;
 using osu.Game.Beatmaps.Objects.Osu.Drawable;
-using osu.Game.Beatmaps.Objects;
 
-namespace osu.Desktop.Tests
+namespace osu.Desktop.VisualTests.Tests
 {
     class TestCaseHitObjects : TestCase
     {

osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs

@@ -1,13 +1,12 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using OpenTK.Input;
 using osu.Framework.GameModes.Testing;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
+using OpenTK.Input;
 
-namespace osu.Desktop.Tests
+namespace osu.Desktop.VisualTests.Tests
 {
     class TestCaseKeyCounter : TestCase
     {

osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs

@@ -4,7 +4,7 @@
 using osu.Framework.GameModes.Testing;
 using osu.Game.GameModes.Menu;
 
-namespace osu.Desktop.Tests
+namespace osu.Desktop.VisualTests.Tests
 {
     class TestCaseMenuButtonSystem : TestCase
     {

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -1,17 +1,17 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
+using System.Collections.Generic;
 using osu.Framework.GameModes.Testing;
 using osu.Framework.MathUtils;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Objects.Osu;
-using System.Collections.Generic;
-using osu.Framework.Timing;
 using osu.Game.GameModes.Play;
+using OpenTK;
 
-namespace osu.Desktop.Tests
+namespace osu.Desktop.VisualTests.Tests
 {
     class TestCasePlayer : TestCase
     {

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -2,23 +2,20 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using OpenTK.Input;
 using osu.Framework.GameModes.Testing;
 using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Graphics.Transformations;
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.MathUtils;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.MathUtils;
+using osu.Game.GameModes.Play;
 using osu.Game.GameModes.Play.Catch;
 using osu.Game.GameModes.Play.Mania;
 using osu.Game.GameModes.Play.Osu;
 using osu.Game.GameModes.Play.Taiko;
-using osu.Game.GameModes.Play;
+using osu.Game.Graphics.UserInterface;
+using OpenTK;
+using OpenTK.Graphics;
 
-namespace osu.Desktop.Tests
+namespace osu.Desktop.VisualTests.Tests
 {
     class TestCaseScoreCounter : TestCase
     {

osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs

@@ -1,20 +1,16 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
+using System;
-using OpenTK.Graphics;
 using osu.Framework.GameModes.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics;
-using System;
+using OpenTK;
-using System.Collections.Generic;
+using OpenTK.Graphics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace osu.Desktop.Tests
+namespace osu.Desktop.VisualTests.Tests
 {
     class TestCaseTextAwesome : TestCase
     {

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -1,11 +1,11 @@
 // Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
+using osu.Framework;
 using osu.Framework.GameModes.Testing;
-using osu.Framework.Graphics.Cursor;
 using osu.Game;
 
-namespace osu.Framework.VisualTests
+namespace osu.Desktop.VisualTests
 {
     class VisualTestGame : OsuGameBase
     {

osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

@@ -6,7 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>osu.Desktop</RootNamespace>
+    <RootNamespace>osu.Desktop.VisualTests</RootNamespace>
     <AssemblyName>osu!</AssemblyName>
     <ManifestCertificateThumbprint>3CF060CD28877D0E3112948951A64B2A7CEEC909</ManifestCertificateThumbprint>
     <ManifestKeyFile>codesigning.pfx</ManifestKeyFile>
@@ -18,7 +18,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <StartupObject>osu.Framework.VisualTests.Program</StartupObject>
+    <StartupObject>osu.Desktop.VisualTests.Program</StartupObject>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
     <SignAssembly>false</SignAssembly>
     <TargetZone>LocalIntranet</TargetZone>

osu.Game.Tests/osu.Game.Tests.csproj

@@ -32,7 +32,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1337\lib\net20\OpenTK.dll</HintPath>
+      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

osu.Game.Tests/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NUnit" version="3.5.0" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1337" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
 </packages>

osu.Game/osu.Game.csproj

@@ -38,7 +38,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1337\lib\net20\OpenTK.dll</HintPath>
+      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">

osu.Game/packages.config

@@ -6,7 +6,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
 <packages>
   <package id="DotNetZip" version="1.10.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1337" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLiteNetExtensions" version="1.3.0" targetFramework="net45" />