Merge pull request #2479 from peppy/add-net471-dep

Add squirrel dependency on net471
Update squirrel path
2026-05-16 10:22:53 +08:00 · 2018-05-02 17:00:02 +08:00 · 2018-05-02 16:37:44 +08:00 · 2018-05-02 16:33:48 +08:00 · 2018-05-02 16:23:48 +08:00 · 2018-05-02 16:23:48 +08:00
57 changed files with 429 additions and 206 deletions
@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RulesetTests (catch)" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net471/osu.Game.Rulesets.Catch.Tests.exe" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <envs>
+      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
+    </envs>
+    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
+    <browser url="http://localhost:5000" />
+    <method />
+  </configuration>
+</component>
@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RulesetTests (mania)" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net471/osu.Game.Rulesets.Mania.Tests.exe" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <envs>
+      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
+    </envs>
+    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
+    <browser url="http://localhost:5000" />
+    <method />
+  </configuration>
+</component>
@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RulesetTests (osu!)" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net471/osu.Game.Rulesets.Osu.Tests.exe" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <envs>
+      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
+    </envs>
+    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
+    <browser url="http://localhost:5000" />
+    <method />
+  </configuration>
+</component>
@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RulesetTests (taiko)" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net471/osu.Game.Rulesets.Taiko.Tests.exe" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <envs>
+      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
+    </envs>
+    <option name="USE_MONO" value="0" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
+    <browser url="http://localhost:5000" />
+    <method />
+  </configuration>
+</component>
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="VisualTests (net461)" type="DotNetProject" factoryName=".NET Project" singleton="true">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net461/osu.Game.Tests.exe" />
+  <configuration default="false" name="VisualTests (net471)" type="DotNetProject" factoryName=".NET Project" singleton="true">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net471/osu.Game.Tests.exe" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.6.1" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
    <method />
  </configuration>
 </component>
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu! (net461)" type="DotNetProject" factoryName=".NET Project" singleton="true">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net461/osu!.exe" />
+  <configuration default="false" name="osu! (net471)" type="DotNetProject" factoryName=".NET Project" singleton="true">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net471/osu!.exe" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop" />
    <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.6.1" />
+    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
    <method />
  </configuration>
 </component>
@@ -2,13 +2,13 @@
    "version": "0.2.0",
    "configurations": [
        {
-            "name": "VisualTests (Debug, net461)",
+            "name": "VisualTests (Debug, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/osu.Game.Tests/bin/Debug/net461/osu.Game.Tests.exe",
+            "program": "${workspaceRoot}/osu.Game.Tests/bin/Debug/net471/osu.Game.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug, msbuild)",
            "runtimeExecutable": null,
@@ -16,13 +16,13 @@
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Release, net461)",
+            "name": "VisualTests (Release, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/osu.Game.Tests/bin/Debug/net461/osu.Game.Tests.exe",
+            "program": "${workspaceRoot}/osu.Game.Tests/bin/Debug/net471/osu.Game.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release, msbuild)",
            "runtimeExecutable": null,
@@ -30,13 +30,13 @@
            "console": "internalConsole"
        },
        {
-            "name": "osu! (Debug, net461)",
+            "name": "osu! (Debug, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/osu.Desktop/bin/Debug/net461/osu!.exe",
+            "program": "${workspaceRoot}/osu.Desktop/bin/Debug/net471/osu!.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug, msbuild)",
            "runtimeExecutable": null,
@@ -44,13 +44,13 @@
            "console": "internalConsole"
        },
        {
-            "name": "osu! (Release, net461)",
+            "name": "osu! (Release, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/osu.Desktop/bin/Release/net461/osu!.exe",
+            "program": "${workspaceRoot}/osu.Desktop/bin/Release/net471/osu!.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release, msbuild)",
            "runtimeExecutable": null,
@@ -8,7 +8,7 @@
            "type": "shell",
            "command": "msbuild",
            "args": [
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -22,7 +22,7 @@
            "command": "msbuild",
            "args": [
                "/p:Configuration=Release",
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -64,7 +64,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Restore (net461)",
+            "label": "Restore (net471)",
            "type": "shell",
            "command": "nuget",
            "args": [
@@ -8,7 +8,7 @@ This is still heavily under development and is not intended for end-user use. Th

 # Requirements

- A desktop platform that can compile .NET 4.6.1. We recommend using [Visual Studio Community Edition](https://www.visualstudio.com/) (Windows), [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) (macOS) or [MonoDevelop](http://www.monodevelop.com/download/) (Linux), all of which are free. [Visual Studio Code](https://code.visualstudio.com/) may also be used but requires further setup steps which are not covered here.
+- A desktop platform that can compile .NET 4.7.1. We recommend using [Visual Studio Community Edition](https://www.visualstudio.com/) (Windows), [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/) (macOS) or [MonoDevelop](http://www.monodevelop.com/download/) (Linux), all of which are free. [Visual Studio Code](https://code.visualstudio.com/) may also be used but requires further setup steps which are not covered here.

 # Getting Started
 - Clone the repository including submodules (`git clone --recurse-submodules https://github.com/ppy/osu`)
@@ -1,26 +1,26 @@
-clone_depth: 1
-version: '{branch}-{build}'
-image: Visual Studio 2017
-configuration: Debug
-cache:
-  - C:\ProgramData\chocolatey\bin -> appveyor.yml
-  - C:\ProgramData\chocolatey\lib -> appveyor.yml
-  - inspectcode -> appveyor.yml
-  - packages -> **\packages.config
-install:
-  - cmd: git submodule update --init --recursive --depth=5
-  - cmd: choco install resharper-clt -y
-  - cmd: choco install nvika -y
-  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.4/CodeFileSanity.exe
-before_build:
-  - cmd: CodeFileSanity.exe
-  - cmd: nuget restore -verbosity quiet
-environment:
-  TargetFramework: net461
-build:
-  project: osu.sln
-  parallel: true
-  verbosity: minimal
-after_build:
-  - cmd: inspectcode --o="inspectcodereport.xml" --projects:osu.Game* --caches-home="inspectcode" osu.sln > NUL
+clone_depth: 1
+version: '{branch}-{build}'
+image: Visual Studio 2017
+configuration: Debug
+cache:
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+  - inspectcode -> appveyor.yml
+  - packages -> **\packages.config
+install:
+  - cmd: git submodule update --init --recursive --depth=5
+  - cmd: choco install resharper-clt -y
+  - cmd: choco install nvika -y
+  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.4/CodeFileSanity.exe
+before_build:
+  - cmd: CodeFileSanity.exe
+  - cmd: nuget restore -verbosity quiet
+environment:
+  TargetFramework: net471
+build:
+  project: osu.sln
+  parallel: true
+  verbosity: minimal
+after_build:
+  - cmd: inspectcode --o="inspectcodereport.xml" --projects:osu.Game* --caches-home="inspectcode" osu.sln > NUL
  - cmd: NVika parsereport "inspectcodereport.xml" --treatwarningsaserrors
@@ -21,11 +21,11 @@ after_build:
  - appveyor DownloadFile https://puu.sh/A6g5K/4d08705438.enc # signing certificate
  - cmd: appveyor-tools\secure-file -decrypt 4d08705438.enc -secret %decode_secret% -out %HOMEPATH%\deanherbert.pfx
  - appveyor DownloadFile https://puu.sh/A6g75/fdc6f19b04.enc # deploy configuration
-  - cmd: appveyor-tools\secure-file -decrypt fdc6f19b04.enc -secret %decode_secret% -out osu.Desktop.Deploy\bin\Debug\net461\osu.Desktop.Deploy.exe.config
-  - cd osu.Desktop.Deploy\bin\Debug\net461\
+  - cmd: appveyor-tools\secure-file -decrypt fdc6f19b04.enc -secret %decode_secret% -out osu.Desktop.Deploy\bin\Debug\net471\osu.Desktop.Deploy.exe.config
+  - cd osu.Desktop.Deploy\bin\Debug\net471\
  - osu.Desktop.Deploy.exe %code_signing_password%
 environment:
-  TargetFramework: net461
+  TargetFramework: net471
  decode_secret:
    secure: i67IC2xj6DjjxmA6Oj2jing3+MwzLkq6CbGsjfZ7rdY=
  code_signing_password:
@@ -7,7 +7,7 @@
            "name": "Deploy (Debug)",
            "request": "launch",
            "type": "mono",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Desktop.Deploy.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Desktop.Deploy.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug)",
            "runtimeExecutable": null,
@@ -18,7 +18,7 @@
            "name": "Deploy (Release)",
            "request": "launch",
            "type": "clr",
-            "program": "${workspaceRoot}/bin/Release/net461/osu.Desktop.Deploy.exe",
+            "program": "${workspaceRoot}/bin/Release/net471/osu.Desktop.Deploy.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release)",
            "runtimeExecutable": null,
@@ -19,7 +19,7 @@ namespace osu.Desktop.Deploy
    {
        private static string packages => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".nuget", "packages");
        private static string nugetPath => Path.Combine(packages, @"nuget.commandline\4.5.1\tools\NuGet.exe");
-        private static string squirrelPath => Path.Combine(packages, @"squirrel.windows\1.7.8\tools\Squirrel.exe");
+        private static string squirrelPath => Path.Combine(packages, @"squirrel.windows\1.8.0\tools\Squirrel.exe");
        private const string msbuild_path = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe";

        public static string StagingFolder = ConfigurationManager.AppSettings["StagingFolder"];
@@ -115,7 +115,7 @@ namespace osu.Desktop.Deploy
            checkReleaseFiles();

            write("Running squirrel build...");
-            runCommand(squirrelPath, $"--releasify {stagingPath}\\{nupkgFilename(version)} --setupIcon {iconPath} --icon {iconPath} {codeSigningCmd} --no-msi");
+            runCommand(squirrelPath, $"--releasify {stagingPath}\\{nupkgFilename(version)} --framework-version=net471 --setupIcon {iconPath} --icon {iconPath} {codeSigningCmd} --no-msi");

            //prune again to clean up before upload.
            pruneReleases();
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\osu.Game.props" />
  <PropertyGroup Label="Project">
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net471</TargetFrameworks>
    <OutputType>Exe</OutputType>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -12,7 +12,7 @@
  <ItemGroup Label="Package References">
    <PackageReference Include="NuGet.CommandLine" Version="4.5.1" />
    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="squirrel.windows" Version="1.7.8" Condition="'$(TargetFramework)' == 'net461'" />
+    <PackageReference Include="squirrel.windows" Version="1.8.0" Condition="'$(TargetFramework)' == 'net471'" />
    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
    <PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />
  </ItemGroup>
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\osu.Game.props" />
  <PropertyGroup Label="Project">
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net471;netcoreapp2.0</TargetFrameworks>
    <OutputType>WinExe</OutputType>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -10,11 +10,11 @@
    <Title>osu!lazer</Title>
    <Product>osu!lazer</Product>
    <ApplicationIcon>lazer.ico</ApplicationIcon>
-    <Version>0.0.0.0</Version>
-    <FileVersion>0.0.0.0</FileVersion>
+    <Version>0.0.0</Version>
+    <FileVersion>0.0.0</FileVersion>
  </PropertyGroup>
  <PropertyGroup Label="Defines">
-    <DefineConstants Condition="'$(TargetFramework)' == 'net461'">$(DefineConstants);NET_FRAMEWORK</DefineConstants>
+    <DefineConstants Condition="'$(TargetFramework)' == 'net471'">$(DefineConstants);NET_FRAMEWORK</DefineConstants>
  </PropertyGroup>
  <PropertyGroup>
    <StartupObject>osu.Desktop.Program</StartupObject>
@@ -31,9 +31,9 @@
  </ItemGroup>
  <ItemGroup Label="Package References">
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
-    <PackageReference Include="squirrel.windows" Version="1.7.8" Condition="'$(TargetFramework)' == 'net461'" />
+    <PackageReference Include="squirrel.windows" Version="1.8.0" Condition="'$(TargetFramework)' == 'net471'" />
  </ItemGroup>
  <ItemGroup Label="Resources">
    <EmbeddedResource Include="lazer.ico" />
  </ItemGroup>
-</Project>
+</Project>
@@ -2,13 +2,13 @@
    "version": "0.2.0",
    "configurations": [
        {
-            "name": "VisualTests (Debug, net461)",
+            "name": "VisualTests (Debug, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Game.Rulesets.Catch.Tests.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Catch.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug, msbuild)",
            "runtimeExecutable": null,
@@ -16,13 +16,13 @@
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Release, net461)",
+            "name": "VisualTests (Release, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Game.Rulesets.Catch.Tests.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Catch.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release, msbuild)",
            "runtimeExecutable": null,
@@ -9,7 +9,7 @@
            "command": "msbuild",
            "args": [
                "osu.Game.Rulesets.Catch.Tests.csproj",
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -24,7 +24,7 @@
            "args": [
                "osu.Game.Rulesets.Catch.Tests.csproj",
                "/p:Configuration=Release",
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -66,7 +66,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Restore (net461)",
+            "label": "Restore (net471)",
            "type": "shell",
            "command": "nuget",
            "args": [
@@ -2,7 +2,7 @@
  <Import Project="..\osu.TestProject.props" />
  <PropertyGroup Label="Project">
    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
@@ -2,13 +2,13 @@
    "version": "0.2.0",
    "configurations": [
        {
-            "name": "VisualTests (Debug, net461)",
+            "name": "VisualTests (Debug, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Game.Rulesets.Mania.Tests.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Mania.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug, msbuild)",
            "runtimeExecutable": null,
@@ -16,13 +16,13 @@
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Release, net461)",
+            "name": "VisualTests (Release, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Game.Rulesets.Mania.Tests.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Mania.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release, msbuild)",
            "runtimeExecutable": null,
@@ -9,7 +9,7 @@
            "command": "msbuild",
            "args": [
                "osu.Game.Rulesets.Mania.Tests.csproj",
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -24,7 +24,7 @@
            "args": [
                "osu.Game.Rulesets.Mania.Tests.csproj",
                "/p:Configuration=Release",
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -66,7 +66,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Restore (net461)",
+            "label": "Restore (net471)",
            "type": "shell",
            "command": "nuget",
            "args": [
@@ -2,7 +2,7 @@
  <Import Project="..\osu.TestProject.props" />
  <PropertyGroup Label="Project">
    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj" />
@@ -2,13 +2,13 @@
    "version": "0.2.0",
    "configurations": [
        {
-            "name": "VisualTests (Debug, net461)",
+            "name": "VisualTests (Debug, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Game.Rulesets.Osu.Tests.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Osu.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug, msbuild)",
            "runtimeExecutable": null,
@@ -16,13 +16,13 @@
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Release, net461)",
+            "name": "VisualTests (Release, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Game.Rulesets.Osu.Tests.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Osu.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release, msbuild)",
            "runtimeExecutable": null,
@@ -9,7 +9,7 @@
            "command": "msbuild",
            "args": [
                "osu.Game.Rulesets.Osu.Tests.csproj",
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -24,7 +24,7 @@
            "args": [
                "osu.Game.Rulesets.Osu.Tests.csproj",
                "/p:Configuration=Release",
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -66,7 +66,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Restore (net461)",
+            "label": "Restore (net471)",
            "type": "shell",
            "command": "nuget",
            "args": [
@@ -2,7 +2,7 @@
  <Import Project="..\osu.TestProject.props" />
  <PropertyGroup Label="Project">
    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
@@ -2,13 +2,13 @@
    "version": "0.2.0",
    "configurations": [
        {
-            "name": "VisualTests (Debug, net461)",
+            "name": "VisualTests (Debug, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Game.Rulesets.Taiko.Tests.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Taiko.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug, msbuild)",
            "runtimeExecutable": null,
@@ -16,13 +16,13 @@
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Release, net461)",
+            "name": "VisualTests (Release, net471)",
            "windows": {
                "type": "clr"
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net461/osu.Game.Rulesets.Taiko.Tests.exe",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Taiko.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release, msbuild)",
            "runtimeExecutable": null,
@@ -9,7 +9,7 @@
            "command": "msbuild",
            "args": [
                "osu.Game.Rulesets.Taiko.Tests.csproj",
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -24,7 +24,7 @@
            "args": [
                "osu.Game.Rulesets.Taiko.Tests.csproj",
                "/p:Configuration=Release",
-                "/p:TargetFramework=net461",
+                "/p:TargetFramework=net471",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -66,7 +66,7 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Restore (net461)",
+            "label": "Restore (net471)",
            "type": "shell",
            "command": "nuget",
            "args": [
@@ -2,7 +2,7 @@
  <Import Project="..\osu.TestProject.props" />
  <PropertyGroup Label="Project">
    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
@@ -116,8 +116,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
        // [TestCase(with_sb)]
        public void TestParity(string beatmap)
        {
-            var beatmaps = decode(beatmap);
-            beatmaps.jsonDecoded.ShouldDeepEqual(beatmaps.legacyDecoded);
+            var legacy = decode(beatmap, out Beatmap json);
+            json.ShouldDeepEqual(legacy);
        }

        /// <summary>
@@ -126,15 +126,20 @@ namespace osu.Game.Tests.Beatmaps.Formats
        /// </summary>
        /// <param name="filename">The .osu file to decode.</param>
        /// <returns>The <see cref="Beatmap"/> after being decoded by an <see cref="LegacyBeatmapDecoder"/>.</returns>
-        private Beatmap decodeAsJson(string filename) => decode(filename).jsonDecoded;
+        private Beatmap decodeAsJson(string filename)
+        {
+            decode(filename, out Beatmap jsonDecoded);
+            return jsonDecoded;
+        }

        /// <summary>
        /// Reads a .osu file first with a <see cref="LegacyBeatmapDecoder"/>, serializes the resulting <see cref="Beatmap"/> to JSON
        /// and then deserializes the result back into a <see cref="Beatmap"/> through an <see cref="JsonBeatmapDecoder"/>.
        /// </summary>
        /// <param name="filename">The .osu file to decode.</param>
+        /// <param name="jsonDecoded">The <see cref="Beatmap"/> after being decoded by an <see cref="JsonBeatmapDecoder"/>.</param>
        /// <returns>The <see cref="Beatmap"/> after being decoded by an <see cref="LegacyBeatmapDecoder"/>.</returns>
-        private (Beatmap legacyDecoded, Beatmap jsonDecoded) decode(string filename)
+        private Beatmap decode(string filename, out Beatmap jsonDecoded)
        {
            using (var stream = Resource.OpenResource(filename))
            using (var sr = new StreamReader(stream))
@@ -149,7 +154,9 @@ namespace osu.Game.Tests.Beatmaps.Formats
                    sw.Flush();

                    ms.Position = 0;
-                    return (legacyDecoded, new JsonBeatmapDecoder().Decode(sr2));
+
+                    jsonDecoded = new JsonBeatmapDecoder().Decode(sr2);
+                    return legacyDecoded;
                }
            }
        }
@@ -52,6 +52,9 @@ namespace osu.Game.Tests.Visual
                infoWedge.UpdateBeatmap(beatmap);
            });

+            // select part is redundant, but wait for load isn't
+            selectBeatmap(beatmap.Value.Beatmap);
+
            AddWaitStep(3);

            AddStep("hide", () => { infoWedge.State = Visibility.Hidden; });
@@ -63,10 +66,11 @@ namespace osu.Game.Tests.Visual
            foreach (var rulesetInfo in rulesets.AvailableRulesets)
            {
                var ruleset = rulesetInfo.CreateInstance();
-                beatmaps.Add(createTestBeatmap(rulesetInfo));
+                var testBeatmap = createTestBeatmap(rulesetInfo);

-                var name = rulesetInfo.ShortName;
-                selectBeatmap(name);
+                beatmaps.Add(testBeatmap);
+
+                selectBeatmap(testBeatmap);

                // TODO: adjust cases once more info is shown for other gamemodes
                switch (ruleset)
@@ -108,14 +112,14 @@ namespace osu.Game.Tests.Visual
            AddAssert("check no infolabels", () => !infoWedge.Info.InfoLabelContainer.Children.Any());
        }

-        private void selectBeatmap(string name)
+        private void selectBeatmap(Beatmap b)
        {
-            var infoBefore = infoWedge.Info;
+            BeatmapInfoWedge.BufferedWedgeInfo infoBefore = null;

-            AddStep($"select {name} beatmap", () =>
+            AddStep($"select {b.Metadata.Title} beatmap", () =>
            {
-                beatmap.Value = new TestWorkingBeatmap(beatmaps.First(b => b.BeatmapInfo.Ruleset.ShortName == name));
-                infoWedge.UpdateBeatmap(beatmap);
+                infoBefore = infoWedge.Info;
+                infoWedge.UpdateBeatmap(beatmap.Value = new TestWorkingBeatmap(b));
            });

            AddUntilStep(() => infoWedge.Info != infoBefore, "wait for async load");
@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestCasePlayerLoader : OsuTestCase
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuGameBase game)
+        {
+            AddStep("load dummy beatmap", () => Add(new PlayerLoader(new Player
+            {
+                InitialBeatmap = new DummyWorkingBeatmap(game),
+                AllowPause = false,
+                AllowLeadIn = false,
+                AllowResults = false,
+            })));
+        }
+    }
+}
@@ -5,7 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Profile;
 using osu.Game.Overlays.Profile.Header;
@@ -17,6 +19,7 @@ namespace osu.Game.Tests.Visual
    public class TestCaseUserProfile : OsuTestCase
    {
        private readonly TestUserProfileOverlay profile;
+        private APIAccess api;

        public override IReadOnlyList<Type> RequiredTypes => new[]
        {
@@ -32,6 +35,12 @@ namespace osu.Game.Tests.Visual
            Add(profile = new TestUserProfileOverlay());
        }

+        [BackgroundDependencyLoader]
+        private void load(APIAccess api)
+        {
+            this.api = api;
+        }
+
        protected override void LoadComplete()
        {
            base.LoadComplete();
@@ -79,9 +88,10 @@ namespace osu.Game.Tests.Visual
            {
                Username = @"peppy",
                Id = 2,
+                IsSupporter = true,
                Country = new Country { FullName = @"Australia", FlagName = @"AU" },
                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg"
-            }));
+            }, api.IsLoggedIn));

            checkSupporterTag(true);

@@ -91,7 +101,7 @@ namespace osu.Game.Tests.Visual
                Id = 3103765,
                Country = new Country { FullName = @"Japan", FlagName = @"JP" },
                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
-            }));
+            }, api.IsLoggedIn));

            AddStep("Hide", profile.Hide);
            AddStep("Show without reload", profile.Show);
@@ -2,7 +2,7 @@
  <Import Project="..\osu.TestProject.props" />
  <PropertyGroup Label="Project">
    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
@@ -373,17 +373,18 @@ namespace osu.Game.Beatmaps.Formats
            if (parser == null)
                parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser();

-            var obj = parser.Parse(line);
+            var obj = parser.Parse(line, getOffsetTime());

            if (obj != null)
            {
-                obj.StartTime = getOffsetTime(obj.StartTime);
                beatmap.HitObjects.Add(obj);
            }
        }

        private int getOffsetTime(int time) => time + (ApplyOffsets ? offset : 0);

+        private double getOffsetTime() => ApplyOffsets ? offset : 0;
+
        private double getOffsetTime(double time) => time + (ApplyOffsets ? offset : 0);
    }
 }
@@ -60,6 +60,9 @@ namespace osu.Game.Configuration
            Set(OsuSetting.ShowFpsDisplay, false);

            Set(OsuSetting.ShowStoryboard, true);
+            Set(OsuSetting.BeatmapSkins, true);
+            Set(OsuSetting.BeatmapHitsounds, true);
+
            Set(OsuSetting.CursorRotation, true);

            Set(OsuSetting.MenuParallax, true);
@@ -133,6 +136,8 @@ namespace osu.Game.Configuration
        Skin,
        ScreenshotFormat,
        ScreenshotCaptureMenuCursor,
-        SongSelectRightMouseScroll
+        SongSelectRightMouseScroll,
+        BeatmapSkins,
+        BeatmapHitsounds
    }
 }
@@ -1,14 +1,13 @@
 // Copyright (c) 2007-2018 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.IO;
 using osu.Framework.IO.Stores;

 namespace osu.Game.IO.Archives
 {
-    public abstract class ArchiveReader : IDisposable, IResourceStore<byte[]>
+    public abstract class ArchiveReader : IResourceStore<byte[]>
    {
        /// <summary>
        /// Opens a stream for reading a specific file from this archive.
@@ -11,7 +11,7 @@ namespace osu.Game.Online.API.Requests
    public class GetMessagesRequest : APIRequest<List<Message>>
    {
        private readonly List<Channel> channels;
-        private long? since;
+        private readonly long? since;

        public GetMessagesRequest(List<Channel> channels, long? sinceId)
        {
@@ -7,7 +7,7 @@ namespace osu.Game.Online.API.Requests
 {
    public class GetUserRequest : APIRequest<User>
    {
-        private long? userId;
+        private readonly long? userId;

        public GetUserRequest(long? userId = null)
        {
@@ -201,6 +201,8 @@ namespace osu.Game
                return;
            }

+            Ruleset.Value = s.Ruleset;
+
            Beatmap.Value = BeatmapManager.GetWorkingBeatmap(s.Beatmap);
            Beatmap.Value.Mods.Value = s.Mods;

@@ -188,6 +188,20 @@ namespace osu.Game
            FileStore.Cleanup();

            AddInternal(api);
+
+            GlobalActionContainer globalBinding;
+
+            CursorOverrideContainer = new CursorOverrideContainer { RelativeSizeAxes = Axes.Both };
+            CursorOverrideContainer.Child = globalBinding = new GlobalActionContainer(this)
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = content = new OsuTooltipContainer(CursorOverrideContainer.Cursor) { RelativeSizeAxes = Axes.Both }
+            };
+
+            base.Content.Add(new DrawSizePreservingFillContainer { Child = CursorOverrideContainer });
+
+            KeyBindingStore.Register(globalBinding);
+            dependencies.Cache(globalBinding);
        }

        private void runMigrations()
@@ -217,20 +231,6 @@ namespace osu.Game
        {
            base.LoadComplete();

-            GlobalActionContainer globalBinding;
-
-            CursorOverrideContainer = new CursorOverrideContainer { RelativeSizeAxes = Axes.Both };
-            CursorOverrideContainer.Child = globalBinding = new GlobalActionContainer(this)
-            {
-                RelativeSizeAxes = Axes.Both,
-                Child = content = new OsuTooltipContainer(CursorOverrideContainer.Cursor) { RelativeSizeAxes = Axes.Both }
-            };
-
-            base.Content.Add(new DrawSizePreservingFillContainer { Child = CursorOverrideContainer });
-
-            KeyBindingStore.Register(globalBinding);
-            dependencies.Cache(globalBinding);
-
            // TODO: This is temporary until we reimplement the local FPS display.
            // It's just to allow end-users to access the framework FPS display without knowing the shortcut key.
            fpsDisplayVisible = LocalConfig.GetBindable<bool>(OsuSetting.ShowFpsDisplay);
@@ -307,6 +307,8 @@ namespace osu.Game.Overlays.Chat
            {
                public override bool IsRemovable => false;

+                public override bool IsSwitchable => false;
+
                public ChannelSelectorTabItem(Channel value) : base(value)
                {
                    Depth = float.MaxValue;
@@ -92,22 +92,18 @@ namespace osu.Game.Overlays.Profile.Header

        public void ShowBadges(Badge[] badges)
        {
-            switch (badges.Length)
+            if (badges == null || badges.Length == 0)
            {
-                case 0:
-                    Hide();
-                    return;
-                case 1:
-                    badgeCountText.Hide();
-                    break;
-                default:
-                    badgeCountText.Show();
-                    badgeCountText.Text = $"{badges.Length} badges";
-                    break;
+                Hide();
+                return;
            }

-            Show();
            badgeCount = badges.Length;
+
+            badgeCountText.FadeTo(badgeCount > 1 ? 1 : 0);
+            badgeCountText.Text = $"{badges.Length} badges";
+
+            Show();
            visibleBadge = 0;

            badgeFlowContainer.Clear();
@@ -19,6 +19,11 @@ namespace osu.Game.Rulesets.Objects.Legacy
    public abstract class ConvertHitObjectParser : HitObjectParser
    {
        public override HitObject Parse(string text)
+        {
+            return Parse(text, 0);
+        }
+
+        public HitObject Parse(string text, double offset)
        {
            try
            {
@@ -146,7 +151,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                }
                else if ((type & ConvertHitObjectType.Spinner) > 0)
                {
-                    result = CreateSpinner(new Vector2(512, 384) / 2, Convert.ToDouble(split[5], CultureInfo.InvariantCulture));
+                    result = CreateSpinner(new Vector2(512, 384) / 2, Convert.ToDouble(split[5], CultureInfo.InvariantCulture) + offset);

                    if (split.Length > 6)
                        readCustomSampleBanks(split[6], bankInfo);
@@ -164,13 +169,13 @@ namespace osu.Game.Rulesets.Objects.Legacy
                        readCustomSampleBanks(string.Join(":", ss.Skip(1)), bankInfo);
                    }

-                    result = CreateHold(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo, endTime);
+                    result = CreateHold(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo, endTime + offset);
                }

                if (result == null)
                    throw new InvalidOperationException($@"Unknown hit object type {type}.");

-                result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture);
+                result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture) + offset;
                result.Samples = convertSoundType(soundType, bankInfo);

                return result;
@@ -26,14 +26,14 @@ namespace osu.Game.Screens
            return false;
        }

-        public override bool Push(Screen screen)
+        public override void Push(Screen screen)
        {
            // When trying to push a non-loaded screen, load it asynchronously and re-invoke Push
            // once it's done.
            if (screen.LoadState == LoadState.NotLoaded)
            {
                LoadComponentAsync(screen, d => Push((BackgroundScreen)d));
-                return true;
+                return;
            }

            // Make sure the in-progress loading is complete before pushing the screen.
@@ -41,8 +41,6 @@ namespace osu.Game.Screens
                Thread.Sleep(1);

            base.Push(screen);
-
-            return true;
        }

        protected override void Update()
@@ -178,7 +178,7 @@ namespace osu.Game.Screens.Edit
            }

            currentScreen.Beatmap.BindTo(Beatmap);
-            screenContainer.Add(currentScreen);
+            LoadComponentAsync(currentScreen, screenContainer.Add);
        }

        protected override bool OnWheel(InputState state)
@@ -43,6 +43,8 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers

        public override void Add(HitObjectMask drawable)
        {
+            if (drawable == null) throw new ArgumentNullException(nameof(drawable));
+
            base.Add(drawable);

            drawable.Selected += onMaskSelected;
@@ -53,6 +55,8 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers

        public override bool Remove(HitObjectMask drawable)
        {
+            if (drawable == null) throw new ArgumentNullException(nameof(drawable));
+
            var result = base.Remove(drawable);

            if (result)
@@ -39,6 +39,7 @@ namespace osu.Game.Screens.Menu
        private Bindable<bool> menuVoice;
        private Bindable<bool> menuMusic;
        private Track track;
+        private WorkingBeatmap beatmap;

        [BackgroundDependencyLoader]
        private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
@@ -69,9 +70,8 @@ namespace osu.Game.Screens.Menu
                }
            }

-            Beatmap.Value = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-
-            track = Beatmap.Value.Track;
+            beatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
+            track = beatmap.Track;

            welcome = audio.Sample.Get(@"welcome");
            seeya = audio.Sample.Get(@"seeya");
@@ -81,6 +81,8 @@ namespace osu.Game.Screens.Menu
        {
            base.OnEntering(last);

+            Game.Beatmap.Value = beatmap;
+
            if (menuVoice)
                welcome.Play();

@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Play
        private DrawableStoryboard storyboard;
        private Container storyboardContainer;

-        private bool loadedSuccessfully => RulesetContainer?.Objects.Any() == true;
+        public bool LoadedBeatmapSuccessfully => RulesetContainer?.Objects.Any() == true;

        [BackgroundDependencyLoader]
        private void load(AudioManager audio, APIAccess api, OsuConfigManager config)
@@ -86,10 +86,7 @@ namespace osu.Game.Screens.Play

            WorkingBeatmap working = Beatmap.Value;
            if (working is DummyWorkingBeatmap)
-            {
-                Exit();
                return;
-            }

            sampleRestart = audio.Sample.Get(@"Gameplay/restart");

@@ -122,14 +119,15 @@ namespace osu.Game.Screens.Play
                }

                if (!RulesetContainer.Objects.Any())
-                    throw new InvalidOperationException("Beatmap contains no hit objects!");
+                {
+                    Logger.Error(new InvalidOperationException("Beatmap contains no hit objects!"), "Beatmap contains no hit objects!");
+                    return;
+                }
            }
            catch (Exception e)
            {
                Logger.Error(e, "Could not load beatmap sucessfully!");
-
                //couldn't load, hard abort!
-                Exit();
                return;
            }

@@ -293,7 +291,7 @@ namespace osu.Game.Screens.Play
        {
            base.OnEntering(last);

-            if (!loadedSuccessfully)
+            if (!LoadedBeatmapSuccessfully)
                return;

            Content.Alpha = 0;
@@ -343,7 +341,7 @@ namespace osu.Game.Screens.Play
                return base.OnExiting(next);
            }

-            if (loadedSuccessfully)
+            if (LoadedBeatmapSuccessfully)
                pauseContainer?.Pause();

            return true;
@@ -159,14 +159,14 @@ namespace osu.Game.Screens.Play

                        loadTask = null;

-                        if (!Push(player))
-                            Exit();
+                        //By default, we want to load the player and never be returned to.
+                        //Note that this may change if the player we load requested a re-run.
+                        ValidForResume = false;
+
+                        if (player.LoadedBeatmapSuccessfully)
+                            Push(player);
                        else
-                        {
-                            //By default, we want to load the player and never be returned to.
-                            //Note that this may change if the player we load requested a re-run.
-                            ValidForResume = false;
-                        }
+                            Exit();
                    });
                }, 500);
            }
@@ -15,6 +15,8 @@ namespace osu.Game.Screens.Play.PlayerSettings
        private readonly PlayerSliderBar<double> dimSliderBar;
        private readonly PlayerSliderBar<double> blurSliderBar;
        private readonly PlayerCheckbox showStoryboardToggle;
+        private readonly PlayerCheckbox beatmapSkinsToggle;
+        private readonly PlayerCheckbox beatmapHitsoundsToggle;

        public VisualSettings()
        {
@@ -34,7 +36,9 @@ namespace osu.Game.Screens.Play.PlayerSettings
                {
                    Text = "Toggles:"
                },
-                showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboards" }
+                showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboards" },
+                beatmapSkinsToggle = new PlayerCheckbox { LabelText = "Beatmap skins" },
+                beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hitsounds" }
            };
        }

@@ -44,6 +48,8 @@ namespace osu.Game.Screens.Play.PlayerSettings
            dimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.DimLevel);
            blurSliderBar.Bindable = config.GetBindable<double>(OsuSetting.BlurLevel);
            showStoryboardToggle.Bindable = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
+            beatmapSkinsToggle.Bindable = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
+            beatmapHitsoundsToggle.Bindable = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
        }
    }
 }
@@ -223,11 +223,11 @@ namespace osu.Game.Screens.Ranking

        private class DateTimeDisplay : Container
        {
-            private DateTime datetime;
+            private readonly DateTime date;

-            public DateTimeDisplay(DateTime datetime)
+            public DateTimeDisplay(DateTime date)
            {
-                this.datetime = datetime;
+                this.date = date;

                AutoSizeAxes = Axes.Y;

@@ -251,7 +251,7 @@ namespace osu.Game.Screens.Ranking
                    {
                        Origin = Anchor.CentreLeft,
                        Anchor = Anchor.CentreLeft,
-                        Text = datetime.ToShortDateString(),
+                        Text = date.ToShortDateString(),
                        Padding = new MarginPadding { Horizontal = 10, Vertical = 5 },
                        Colour = Color4.White,
                    },
@@ -259,7 +259,7 @@ namespace osu.Game.Screens.Ranking
                    {
                        Origin = Anchor.CentreRight,
                        Anchor = Anchor.CentreRight,
-                        Text = datetime.ToShortTimeString(),
+                        Text = date.ToShortTimeString(),
                        Padding = new MarginPadding { Horizontal = 10, Vertical = 5 },
                        Colour = Color4.White,
                    }
@@ -16,11 +16,22 @@ namespace osu.Game.Screens.Select.Carousel

        protected List<CarouselItem> InternalChildren = new List<CarouselItem>();

+        /// <summary>
+        /// Used to assign a monotonically increasing ID to children as they are added. This member is
+        /// incremented whenever a child is added.
+        /// </summary>
+        private ulong currentChildID;
+
        public override List<DrawableCarouselItem> Drawables
        {
            get
            {
                var drawables = base.Drawables;
+
+                // if we are explicitly not present, don't ever present children.
+                // without this check, children drawables can potentially be presented without their group header.
+                if (DrawableRepresentation.Value?.IsPresent == false) return drawables;
+
                foreach (var c in InternalChildren)
                    drawables.AddRange(c.Drawables);
                return drawables;
@@ -39,6 +50,7 @@ namespace osu.Game.Screens.Select.Carousel
        public virtual void AddChild(CarouselItem i)
        {
            i.State.ValueChanged += v => ChildItemStateChanged(i, v);
+            i.ChildID = ++currentChildID;
            InternalChildren.Add(i);
        }

@@ -24,16 +24,18 @@ namespace osu.Game.Screens.Select.Carousel
            {
                var items = new List<DrawableCarouselItem>();

-                var self = drawableRepresentation.Value;
+                var self = DrawableRepresentation.Value;
                if (self?.IsPresent == true) items.Add(self);

                return items;
            }
        }

+        private int creationOrder;
+
        protected CarouselItem()
        {
-            drawableRepresentation = new Lazy<DrawableCarouselItem>(CreateDrawableRepresentation);
+            DrawableRepresentation = new Lazy<DrawableCarouselItem>(CreateDrawableRepresentation);

            Filtered.ValueChanged += v =>
            {
@@ -42,15 +44,23 @@ namespace osu.Game.Screens.Select.Carousel
            };
        }

-        private readonly Lazy<DrawableCarouselItem> drawableRepresentation;
+        protected readonly Lazy<DrawableCarouselItem> DrawableRepresentation;

+        /// <summary>
+        /// Used as a default sort method for <see cref="CarouselItem"/>s of differing types.
+        /// </summary>
+        internal ulong ChildID;
+
+        /// <summary>
+        /// Create a fresh drawable version of this item. If you wish to consume the current representation, use <see cref="DrawableRepresentation"/> instead.
+        /// </summary>
        protected abstract DrawableCarouselItem CreateDrawableRepresentation();

        public virtual void Filter(FilterCriteria criteria)
        {
        }

-        public virtual int CompareTo(FilterCriteria criteria, CarouselItem other) => GetHashCode().CompareTo(other.GetHashCode());
+        public virtual int CompareTo(FilterCriteria criteria, CarouselItem other) => ChildID.CompareTo(other.ChildID);
    }

    public enum CarouselItemState
@@ -113,6 +113,31 @@ namespace osu.Game.Skinning
                string path = getPathForFile(name);
                return path == null ? null : underlyingStore.Get(path);
            }
+
+            #region IDisposable Support
+
+            private bool isDisposed;
+
+            protected virtual void Dispose(bool disposing)
+            {
+                if (!isDisposed)
+                {
+                    isDisposed = true;
+                }
+            }
+
+            ~LegacySkinResourceStore()
+            {
+                Dispose(false);
+            }
+
+            public void Dispose()
+            {
+                Dispose(true);
+                GC.SuppressFinalize(this);
+            }
+
+            #endregion
        }
    }
 }
@@ -4,9 +4,11 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Configuration;

 namespace osu.Game.Skinning
 {
@@ -14,17 +16,37 @@ namespace osu.Game.Skinning
    {
        public event Action SourceChanged;

-        public Drawable GetDrawableComponent(string componentName) => source.GetDrawableComponent(componentName) ?? fallbackSource?.GetDrawableComponent(componentName);
+        private Bindable<bool> beatmapSkins = new Bindable<bool>();
+        private Bindable<bool> beatmapHitsounds = new Bindable<bool>();

-        public Texture GetTexture(string componentName) => source.GetTexture(componentName) ?? fallbackSource.GetTexture(componentName);
+        public Drawable GetDrawableComponent(string componentName)
+        {
+            Drawable sourceDrawable;
+            if (beatmapSkins && (sourceDrawable = source.GetDrawableComponent(componentName)) != null)
+                return sourceDrawable;
+            return fallbackSource?.GetDrawableComponent(componentName);
+        }

-        public SampleChannel GetSample(string sampleName) => source.GetSample(sampleName) ?? fallbackSource?.GetSample(sampleName);
+        public Texture GetTexture(string componentName)
+        {
+            Texture sourceTexture;
+            if (beatmapSkins && (sourceTexture = source.GetTexture(componentName)) != null)
+                return sourceTexture;
+            return fallbackSource.GetTexture(componentName);
+        }
+
+        public SampleChannel GetSample(string sampleName)
+        {
+            SampleChannel sourceChannel;
+            if (beatmapHitsounds && (sourceChannel = source.GetSample(sampleName)) != null)
+                return sourceChannel;
+            return fallbackSource?.GetSample(sampleName);
+        }

        public TValue? GetValue<TConfiguration, TValue>(Func<TConfiguration, TValue?> query) where TConfiguration : SkinConfiguration where TValue : struct
        {
            TValue? val = null;
-            var conf = (source as Skin)?.Configuration as TConfiguration;
-            if (conf != null)
+            if ((source as Skin)?.Configuration is TConfiguration conf)
                val = query?.Invoke(conf);

            return val ?? fallbackSource?.GetValue(query);
@@ -33,8 +55,7 @@ namespace osu.Game.Skinning
        public TValue GetValue<TConfiguration, TValue>(Func<TConfiguration, TValue> query) where TConfiguration : SkinConfiguration where TValue : class
        {
            TValue val = null;
-            var conf = (source as Skin)?.Configuration as TConfiguration;
-            if (conf != null)
+            if ((source as Skin)?.Configuration is TConfiguration conf)
                val = query?.Invoke(conf);

            return val ?? fallbackSource?.GetValue(query);
@@ -60,6 +81,18 @@ namespace osu.Game.Skinning
            return dependencies;
        }

+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            beatmapSkins = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
+            beatmapSkins.ValueChanged += val => onSourceChanged();
+            beatmapSkins.TriggerChange();
+
+            beatmapHitsounds = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
+            beatmapHitsounds.ValueChanged += val => onSourceChanged();
+            beatmapHitsounds.TriggerChange();
+        }
+
        protected override void LoadComplete()
        {
            base.LoadComplete();
@@ -15,18 +15,14 @@ namespace osu.Game.Tests.Visual
        {
            protected override string MainResourceFile => File.Exists(base.MainResourceFile) ? base.MainResourceFile : Assembly.GetExecutingAssembly().Location;

-            private readonly TestCaseTestRunner.TestRunner runner;
+            private TestCaseTestRunner.TestRunner runner;

-            public OsuTestCaseTestRunner()
+            protected override void LoadAsyncComplete()
            {
-                runner = new TestCaseTestRunner.TestRunner();
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                Add(runner);
+                // this has to be run here rather than LoadComplete because
+                // TestCase.cs is checking the IsLoaded state (on another thread) and expects
+                // the runner to be loaded at that point.
+                Add(runner = new TestCaseTestRunner.TestRunner());
            }

            public void RunTestBlocking(TestCase test) => runner.RunTestBlocking(test);
@@ -12,12 +12,13 @@ namespace osu.Game.Users
        public abstract Color4 GetAppropriateColour(OsuColour colours);
    }

-    public abstract class UserStatusAvailable : UserStatus
+    public class UserStatusOnline : UserStatus
    {
+        public override string Message => @"Online";
        public override Color4 GetAppropriateColour(OsuColour colours) => colours.BlueDarker;
    }

-    public abstract class UserStatusBusy : UserStatus
+    public abstract class UserStatusBusy : UserStatusOnline
    {
        public override Color4 GetAppropriateColour(OsuColour colours) => colours.YellowDark;
    }
@@ -28,17 +29,12 @@ namespace osu.Game.Users
        public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray7;
    }

-    public class UserStatusOnline : UserStatusAvailable
-    {
-        public override string Message => @"Online";
-    }
-
-    public class UserStatusSpectating : UserStatusAvailable
+    public class UserStatusSpectating : UserStatusOnline
    {
        public override string Message => @"Spectating a game";
    }

-    public class UserStatusInLobby : UserStatusAvailable
+    public class UserStatusInLobby : UserStatusOnline
    {
        public override string Message => @"in Multiplayer Lobby";
    }
@@ -53,13 +49,13 @@ namespace osu.Game.Users
        public override string Message => @"Multiplaying";
    }

-    public class UserStatusModding : UserStatus
+    public class UserStatusModding : UserStatusOnline
    {
        public override string Message => @"Modding a map";
        public override Color4 GetAppropriateColour(OsuColour colours) => colours.PurpleDark;
    }

-    public class UserStatusDoNotDisturb : UserStatus
+    public class UserStatusDoNotDisturb : UserStatusBusy
    {
        public override string Message => @"Do not disturb";
        public override Color4 GetAppropriateColour(OsuColour colours) => colours.RedDark;