From 067c018422abc5f4e7ad1a72e8b2c730c28a430d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 19 Nov 2017 17:31:35 +0900
Subject: [PATCH] Cleanups

---
 osu-framework                           |  2 +-
 osu.Desktop.Deploy/packages.config      | 14 ----
 osu.Desktop/packages.config             | 20 ------
 osu.Game.Rulesets.Catch/packages.config |  5 --
 osu.Game.Rulesets.Mania/packages.config |  5 --
 osu.Game.Rulesets.Osu/packages.config   |  5 --
 osu.Game.Rulesets.Taiko/packages.config |  5 --
 osu.Game.Tests/OpenTK.dll.config        | 25 -------
 osu.Game.Tests/app.config               | 15 ----
 osu.Game.Tests/packages.config          | 10 ---
 osu.Game/packages.config                | 95 -------------------------
 11 files changed, 1 insertion(+), 200 deletions(-)
 delete mode 100644 osu.Desktop.Deploy/packages.config
 delete mode 100644 osu.Desktop/packages.config
 delete mode 100644 osu.Game.Rulesets.Catch/packages.config
 delete mode 100644 osu.Game.Rulesets.Mania/packages.config
 delete mode 100644 osu.Game.Rulesets.Osu/packages.config
 delete mode 100644 osu.Game.Rulesets.Taiko/packages.config
 delete mode 100644 osu.Game.Tests/OpenTK.dll.config
 delete mode 100644 osu.Game.Tests/app.config
 delete mode 100644 osu.Game.Tests/packages.config
 delete mode 100644 osu.Game/packages.config

diff --git a/osu-framework b/osu-framework
index 7d5df64338..90dbacf0c4 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 7d5df64338e3b3be7bdf3509e9c47a3e9b930430
+Subproject commit 90dbacf0c4f54a2076f1a0be98f8606b627cf947
diff --git a/osu.Desktop.Deploy/packages.config b/osu.Desktop.Deploy/packages.config
deleted file mode 100644
index 7725be5f5e..0000000000
--- a/osu.Desktop.Deploy/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
--->
-<packages>
-  <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net452" />
-  <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
-  <package id="NuGet.CommandLine" version="4.3.0" targetFramework="net461" developmentDependency="true" />
-  <package id="SharpCompress" version="0.18.1" targetFramework="net461" />
-  <package id="Splat" version="2.0.0" targetFramework="net452" />
-  <package id="squirrel.windows" version="1.7.8" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/osu.Desktop/packages.config b/osu.Desktop/packages.config
deleted file mode 100644
index 6b6361b578..0000000000
--- a/osu.Desktop/packages.config
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
--->
-<packages>
-  <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net45" />
-  <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
-  <package id="OpenTK" version="3.0.0-git00009" targetFramework="net461" />
-  <package id="SharpCompress" version="0.18.1" targetFramework="net461" />
-  <package id="Splat" version="2.0.0" targetFramework="net45" />
-  <package id="SQLitePCLRaw.bundle_green" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.core" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.linux" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.osx" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.v110_xp" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.8" targetFramework="net461" />
-  <package id="squirrel.windows" version="1.7.8" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch/packages.config b/osu.Game.Rulesets.Catch/packages.config
deleted file mode 100644
index cde428acea..0000000000
--- a/osu.Game.Rulesets.Catch/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.8.1" targetFramework="net461" />
-  <package id="OpenTK" version="3.0.0-git00009" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/packages.config b/osu.Game.Rulesets.Mania/packages.config
deleted file mode 100644
index cde428acea..0000000000
--- a/osu.Game.Rulesets.Mania/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.8.1" targetFramework="net461" />
-  <package id="OpenTK" version="3.0.0-git00009" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu/packages.config b/osu.Game.Rulesets.Osu/packages.config
deleted file mode 100644
index cde428acea..0000000000
--- a/osu.Game.Rulesets.Osu/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.8.1" targetFramework="net461" />
-  <package id="OpenTK" version="3.0.0-git00009" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko/packages.config b/osu.Game.Rulesets.Taiko/packages.config
deleted file mode 100644
index cde428acea..0000000000
--- a/osu.Game.Rulesets.Taiko/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.8.1" targetFramework="net461" />
-  <package id="OpenTK" version="3.0.0-git00009" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/osu.Game.Tests/OpenTK.dll.config b/osu.Game.Tests/OpenTK.dll.config
deleted file mode 100644
index 5620e3d9e2..0000000000
--- a/osu.Game.Tests/OpenTK.dll.config
+++ /dev/null
@@ -1,25 +0,0 @@
-<configuration>
-  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
-  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
-  <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
-  <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
-  <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
-  <dllmap os="linux" dll="libX11" target="libX11.so.6"/>
-  <dllmap os="linux" dll="libXi" target="libXi.so.6"/>
-  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
-  <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
-  <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
-  <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
-  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
-  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
-  <!-- XQuartz compatibility (X11 on Mac) -->
-  <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
-  <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
-  <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
-  <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
-  <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
-  <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
-</configuration>
diff --git a/osu.Game.Tests/app.config b/osu.Game.Tests/app.config
deleted file mode 100644
index 2f5b13a89d..0000000000
--- a/osu.Game.Tests/app.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/osu.Game.Tests/packages.config b/osu.Game.Tests/packages.config
deleted file mode 100644
index ecc44f0c70..0000000000
--- a/osu.Game.Tests/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
--->
-<packages>
-  <package id="NUnit" version="3.8.1" targetFramework="net461" />
-  <package id="OpenTK" version="3.0.0-git00009" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/osu.Game/packages.config b/osu.Game/packages.config
deleted file mode 100644
index 02ace918de..0000000000
--- a/osu.Game/packages.config
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
--->
-<packages>
-  <package id="DotNetZip" version="1.10.1" targetFramework="net461" />
-  <package id="Humanizer" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.af" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.ar" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.bg" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.bn-BD" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.cs" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.da" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.de" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.el" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.es" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.fa" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.fi-FI" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.fr" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.fr-BE" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.he" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.hr" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.hu" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.id" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.it" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.ja" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.lv" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.nb" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.nb-NO" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.nl" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.pl" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.pt" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.ro" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.ru" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.sk" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.sl" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.sr" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.sr-Latn" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.sv" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.tr" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.uk" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.uz-Cyrl-UZ" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.uz-Latn-UZ" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.vi" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.zh-CN" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.zh-Hans" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.zh-Hant" version="2.2.0" targetFramework="net461" />
-  <package id="Microsoft.CSharp" version="4.4.0" targetFramework="net461" />
-  <package id="Microsoft.Data.Sqlite.Core" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.Design" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.Relational" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.Sqlite" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.Sqlite.Core" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.Tools" version="2.0.0" targetFramework="net461" developmentDependency="true" />
-  <package id="Microsoft.Extensions.Caching.Abstractions" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
-  <package id="NUnit" version="3.8.1" targetFramework="net461" />
-  <package id="OpenTK" version="3.0.0-git00009" targetFramework="net461" />
-  <package id="Remotion.Linq" version="2.1.2" targetFramework="net461" />
-  <package id="SharpCompress" version="0.18.1" targetFramework="net461" />
-  <package id="SQLitePCLRaw.bundle_green" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.core" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.linux" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.osx" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.v110_xp" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.8" targetFramework="net461" />
-  <package id="System.Collections" version="4.3.0" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
-  <package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
-  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net461" />
-  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net461" />
-  <package id="System.Linq" version="4.3.0" targetFramework="net461" />
-  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
-  <package id="System.ObjectModel" version="4.3.0" targetFramework="net461" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
-  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
-  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Threading" version="4.3.0" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
-</packages>
\ No newline at end of file