Merge pull request #932 from peppy/nuget-update

Update nuget packages
2025-03-20 03:47:28 +08:00 · 2017-06-13 16:07:19 +09:00 · 2017-06-13 16:07:19 +09:00 · 0e7afc91fa
commit 0e7afc91fa
parent d6e042aec0 3ca80eb149
30 changed files with 169 additions and 78 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ea2797c611a494369e1d3292c55f51b19bc5eeb2
+Subproject commit e63cfd9ba44a40750dff0617ba6f08ffbfcc7fde
--- a/osu.Desktop.Deploy/App.config
+++ b/osu.Desktop.Deploy/App.config
@ -31,6 +31,10 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
        <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="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.17.1.0" newVersion="0.17.1.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj
+++ b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj
@ -49,10 +49,6 @@
      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
      <Private>True</Private>
@ -73,15 +69,19 @@
      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="Squirrel, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+    <Reference Include="Squirrel, Version=1.7.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\Squirrel.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
--- a/osu.Desktop.Deploy/packages.config
+++ b/osu.Desktop.Deploy/packages.config
@ -7,7 +7,8 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
  <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.2" targetFramework="net452" />
-  <package id="NuGet.CommandLine" version="3.5.0" targetFramework="net452" developmentDependency="true" />
+  <package id="NuGet.CommandLine" version="4.1.0" targetFramework="net452" developmentDependency="true" />
+  <package id="SharpCompress" version="0.17.1" targetFramework="net452" />
  <package id="Splat" version="2.0.0" targetFramework="net452" />
-  <package id="squirrel.windows" version="1.5.2" targetFramework="net452" />
+  <package id="squirrel.windows" version="1.7.5" targetFramework="net452" />
 </packages>
--- a/osu.Desktop.Tests/app.config
+++ b/osu.Desktop.Tests/app.config
@ -0,0 +1,11 @@
+<?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>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/osu.Desktop.Tests/osu.Desktop.Tests.csproj
+++ b/osu.Desktop.Tests/osu.Desktop.Tests.csproj
@ -37,8 +37,9 @@
    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
-    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@ -100,6 +101,7 @@
    <None Include="..\osu.licenseheader">
      <Link>osu.licenseheader</Link>
    </None>
+    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
--- a/osu.Desktop.Tests/packages.config
+++ b/osu.Desktop.Tests/packages.config
@ -5,7 +5,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
 -->
 <packages>
  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
-  <package id="NUnit" version="3.6.1" targetFramework="net45" />
+  <package id="NUnit" version="3.7.1" 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" />
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@ -87,11 +87,13 @@
    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
    </Reference>
-    <Reference Include="SharpCompress, Version=0.15.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\SharpCompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
+    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
--- a/osu.Desktop.VisualTests/packages.config
+++ b/osu.Desktop.VisualTests/packages.config
@ -5,8 +5,8 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
 -->
 <packages>
  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
-  <package id="SharpCompress" version="0.15.2" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
+  <package id="SharpCompress" version="0.17.1" 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" />
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@ -121,18 +121,23 @@
    </Reference>
    <Reference Include="mscorlib" />
    <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\NuGet.Squirrel.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="Squirrel, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+    <Reference Include="Squirrel, Version=1.7.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\Squirrel.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
--- a/osu.Desktop/packages.config
+++ b/osu.Desktop/packages.config
@ -7,7 +7,8 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
  <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net45" />
  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
  <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
+  <package id="SharpCompress" version="0.17.1" targetFramework="net45" />
  <package id="Splat" version="2.0.0" targetFramework="net45" />
-  <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
+  <package id="squirrel.windows" version="1.7.5" targetFramework="net45" />
 </packages>
--- a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
+++ b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
@ -33,8 +33,9 @@
    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
--- a/osu.Game.Rulesets.Catch/packages.config
+++ b/osu.Game.Rulesets.Catch/packages.config
@ -5,5 +5,5 @@ 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="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
 </packages>
--- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
+++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
@ -33,8 +33,9 @@
    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
--- a/osu.Game.Rulesets.Mania/packages.config
+++ b/osu.Game.Rulesets.Mania/packages.config
@ -5,5 +5,5 @@ 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="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
 </packages>
--- a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
+++ b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
@ -34,8 +34,9 @@
    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
--- a/osu.Game.Rulesets.Osu/packages.config
+++ b/osu.Game.Rulesets.Osu/packages.config
@ -5,5 +5,5 @@ 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="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
 </packages>
--- a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
+++ b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
@ -33,8 +33,9 @@
    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
--- a/osu.Game.Rulesets.Taiko/packages.config
+++ b/osu.Game.Rulesets.Taiko/packages.config
@ -4,5 +4,5 @@ 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="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
 </packages>
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@ -30,11 +30,13 @@
    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
    </Reference>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
    <Reference Include="SQLite.Net">
--- a/osu.Game.Tests/packages.config
+++ b/osu.Game.Tests/packages.config
@ -4,8 +4,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.6.1" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
+  <package id="NUnit" version="3.7.1" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" 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" />
 </packages>
--- a/osu.Game/Graphics/UserInterface/LoadingAnimation.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingAnimation.cs
@ -1,15 +1,48 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using OpenTK;

 namespace osu.Game.Graphics.UserInterface
 {
-    public class LoadingAnimation : SpriteText
+    public class LoadingAnimation : VisibilityContainer
    {
+        private readonly TextAwesome spinner;
+
        public LoadingAnimation()
        {
-            Text = "Loading";
+            Size = new Vector2(20);
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Children = new Drawable[]
+            {
+                spinner = new TextAwesome
+                {
+                    TextSize = 20,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Icon = FontAwesome.fa_spinner
+                }
+            };
        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            spinner.RotateTo(360, 2000);
+            using (spinner.BeginDelayedSequence(2000))
+                spinner.Loop();
+        }
+
+        private const float transition_duration = 500;
+
+        protected override void PopIn() => FadeIn(transition_duration * 5, EasingTypes.OutQuint);
+
+        protected override void PopOut() => FadeOut(transition_duration, EasingTypes.OutQuint);
    }
-}
+}
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@ -12,7 +12,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Threading;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Chat;
@ -33,7 +32,9 @@ namespace osu.Game.Overlays

        private ScheduledDelegate messageRequest;

-        private readonly Container currentChannelContainer;
+        private readonly Container<DrawableChannel> currentChannelContainer;
+
+        private readonly LoadingAnimation loading;

        private readonly FocusedTextBox inputTextBox;

@ -104,7 +105,7 @@ namespace osu.Game.Overlays
                                {
                                    RelativeSizeAxes = Axes.Both,
                                },
-                                currentChannelContainer = new Container
+                                currentChannelContainer = new Container<DrawableChannel>
                                {
                                    RelativeSizeAxes = Axes.Both,
                                    Padding = new MarginPadding
@ -138,7 +139,8 @@ namespace osu.Game.Overlays
                                            HoldFocus = true,
                                        }
                                    }
-                                }
+                                },
+                                loading = new LoadingAnimation(),
                            }
                        },
                        new Container
@ -274,14 +276,7 @@ namespace osu.Game.Overlays

        private void initializeChannels()
        {
-            SpriteText loading;
-            Add(loading = new OsuSpriteText
-            {
-                Text = @"initialising chat...",
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                TextSize = 40,
-            });
+            loading.Show();

            messageRequest?.Cancel();

@ -290,9 +285,6 @@ namespace osu.Game.Overlays
            {
                Scheduler.Add(delegate
                {
-                    loading.FadeOut(100);
-                    loading.Expire();
-
                    addChannel(channels.Find(c => c.Name == @"#lazer"));
                    addChannel(channels.Find(c => c.Name == @"#osu"));
                    addChannel(channels.Find(c => c.Name == @"#lobby"));
@ -336,13 +328,17 @@ namespace osu.Game.Overlays
                if (loaded == null)
                {
                    currentChannelContainer.FadeOut(500, EasingTypes.OutQuint);
+                    loading.Show();

                    loaded = new DrawableChannel(currentChannel);
                    loadedChannels.Add(loaded);
                    LoadComponentAsync(loaded, l =>
                    {
+                        if (currentChannel.Messages.Any())
+                            loading.Hide();
+
                        currentChannelContainer.Clear(false);
-                        currentChannelContainer.Add(l);
+                        currentChannelContainer.Add(loaded);
                        currentChannelContainer.FadeIn(500, EasingTypes.OutQuint);
                    });
                }
@ -386,6 +382,7 @@ namespace osu.Game.Overlays

            req.Success += delegate (List<Message> messages)
            {
+                loading.Hide();
                channel.AddNewMessages(messages.ToArray());
                Debug.Write("success!");
            };
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@ -29,7 +29,7 @@ namespace osu.Game.Overlays
            State = Visibility.Visible;
        }

-        private void onDialogOnStateChanged(OverlayContainer dialog, Visibility v)
+        private void onDialogOnStateChanged(VisibilityContainer dialog, Visibility v)
        {
            if (v != Visibility.Hidden) return;

--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@ -9,6 +9,7 @@ using OpenTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.SearchableList;
@ -29,6 +30,8 @@ namespace osu.Game.Overlays
        protected override SearchableListFilterControl<SocialSortCriteria, SortDirection> CreateFilterControl() => new FilterControl();

        private IEnumerable<User> users;
+        private readonly LoadingAnimation loading;
+
        public IEnumerable<User> Users
        {
            get { return users; }
@ -68,6 +71,8 @@ namespace osu.Game.Overlays
                    Spacing = new Vector2(10f),
                },
            };
+
+            Add(loading = new LoadingAnimation());
        }

        [BackgroundDependencyLoader]
@ -83,8 +88,14 @@ namespace osu.Game.Overlays

            // no this is not the correct data source, but it's something.
            var request = new GetUsersRequest();
-            request.Success += res => Users = res.Select(e => e.User);
+            request.Success += res =>
+            {
+                Users = res.Select(e => e.User);
+                loading.Hide();
+            };
+
            api.Queue(request);
+            loading.Show();
        }

        public void APIStateChanged(APIAccess api, APIState state)
--- a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Toolbar
                stateContainer.StateChanged -= stateChanged;
        }

-        private void stateChanged(OverlayContainer c, Visibility state)
+        private void stateChanged(VisibilityContainer c, Visibility state)
        {
            switch (state)
            {
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@ -80,8 +80,8 @@ namespace osu.Game.Screens.Select
                lookup.Success += res =>
                {
                    if (beatmap != requestedBeatmap)
-                            //the beatmap has been changed since we started the lookup.
-                            return;
+                        //the beatmap has been changed since we started the lookup.
+                        return;

                    requestedBeatmap.Metrics = res;
                    Schedule(() => updateMetrics(res));
@ -89,6 +89,7 @@ namespace osu.Game.Screens.Select
                lookup.Failure += e => updateMetrics(null);

                api.Queue(lookup);
+                loading.Show();
            }

            updateMetrics(requestedBeatmap.Metrics, false);
@ -104,6 +105,9 @@ namespace osu.Game.Screens.Select
            var hasRatings = metrics?.Ratings.Any() ?? false;
            var hasRetriesFails = (metrics?.Retries.Any() ?? false) && metrics.Fails.Any();

+            if (failOnMissing)
+                loading.Hide();
+
            if (hasRatings)
            {
                var ratings = metrics.Ratings.ToList();
@ -320,11 +324,13 @@ namespace osu.Game.Screens.Select
                            }
                        },
                    },
-                }
+                },
+                loading = new LoadingAnimation()
            };
        }

        private APIAccess api;
+        private readonly LoadingAnimation loading;

        [BackgroundDependencyLoader]
        private void load(OsuColour colour, APIAccess api)
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@ -12,6 +12,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Threading;
 using osu.Game.Database;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@ -25,6 +26,8 @@ namespace osu.Game.Screens.Select.Leaderboards

        public Action<Score> ScoreSelected;

+        private readonly LoadingAnimation loading;
+
        private IEnumerable<Score> scores;
        public IEnumerable<Score> Scores
        {
@ -86,6 +89,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                        },
                    },
                },
+                loading = new LoadingAnimation()
            };
        }

@ -117,6 +121,7 @@ namespace osu.Game.Screens.Select.Leaderboards
        }

        private GetScoresRequest getScoresRequest;
+
        private void updateScores()
        {
            if (!IsLoaded) return;
@ -126,8 +131,14 @@ namespace osu.Game.Screens.Select.Leaderboards

            if (api == null || Beatmap == null) return;

+            loading.Show();
+
            getScoresRequest = new GetScoresRequest(Beatmap);
-            getScoresRequest.Success += r => Scores = r.Scores;
+            getScoresRequest.Success += r =>
+            {
+                Scores = r.Scores;
+                loading.Hide();
+            };
            api.Queue(getScoresRequest);
        }

--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@ -39,12 +39,13 @@
    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
    </Reference>
-    <Reference Include="SharpCompress, Version=0.15.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
-      <HintPath Condition="Exists('$(SolutionDir)\packages\sharpcompress.0.15.2')">$(SolutionDir)\packages\sharpcompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
-      <HintPath Condition="Exists('$(SolutionDir)\packages\SharpCompress.0.15.2')">$(SolutionDir)\packages\SharpCompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
+    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
    </Reference>
    <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
--- a/osu.Game/packages.config
+++ b/osu.Game/packages.config
@ -6,8 +6,8 @@ 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="10.0.2" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
-  <package id="SharpCompress" version="0.15.2" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
+  <package id="SharpCompress" version="0.17.1" 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" />