From 1a8aa8746972f55a1f9247304538a3fdc963cb66 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Mar 2018 18:55:27 +0900
Subject: [PATCH] Make everything better

---
 .vscode/tasks.json                                     | 2 ++
 OpenTK.props                                           | 6 ------
 osu-framework                                          | 2 +-
 osu-resources                                          | 2 +-
 osu.Desktop/OsuGameDesktop.cs                          | 3 +--
 osu.Desktop/osu.Desktop.csproj                         | 4 +---
 osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj | 4 +---
 osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj | 4 +---
 osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj     | 4 +---
 osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj | 4 +---
 osu.Game.Tests/osu.Game.Tests.csproj                   | 4 +---
 osu.Game/osu.Game.csproj                               | 4 +---
 12 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 OpenTK.props

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 3378a83616..b1d2c6b57d 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -37,6 +37,7 @@
             "args": [
                 "build",
                 "--no-restore",
+                "osu.Desktop",
                 "/p:TargetFramework=netcoreapp2.0",
                 "/p:GenerateFullPaths=true",
                 "/m",
@@ -52,6 +53,7 @@
             "args": [
                 "build",
                 "--no-restore",
+                "osu.Desktop",
                 "/p:TargetFramework=netcoreapp2.0",
                 "/p:Configuration=Release",
                 "/p:GenerateFullPaths=true",
diff --git a/OpenTK.props b/OpenTK.props
deleted file mode 100644
index 8708670f2c..0000000000
--- a/OpenTK.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Contains required properties for OpenTK includes. -->
-<Project>
-  <ItemGroup Label="OpenTK">
-    <PackageReference Include="ppy.OpenTK.NS20" Version="1.0.3" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/osu-framework b/osu-framework
index a6cea54d05..ced746ac27 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit a6cea54d056ef6f565752f45e8a0a28a00e99030
+Subproject commit ced746ac27b30019ef2cdc3a15e6df4a18ac9585
diff --git a/osu-resources b/osu-resources
index 3958127d95..b335a7195d 160000
--- a/osu-resources
+++ b/osu-resources
@@ -1 +1 @@
-Subproject commit 3958127d95ee230021e9946c989400e71c9dbb3c
+Subproject commit b335a7195d60ab8d83ae9eba1150ee022163f3ba
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index fddc6af2f4..3704d2d5d8 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -100,7 +99,7 @@ namespace osu.Desktop
             {
                 desktopWindow.CursorState |= CursorState.Hidden;
 
-                desktopWindow.Icon = new Icon(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
+                desktopWindow.SetIconFromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
                 desktopWindow.Title = Name;
 
                 desktopWindow.FileDrop += fileDrop;
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 5d346603db..2262bbc515 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.Game.props" />
-  <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFramework Condition="'$(BuildingInsideVisualStudio)' == 'true'">net461</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' != 'true'">net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
index 00933445c9..aa4d06cf64 100644
--- a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
+++ b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.Game.props" />
-  <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFramework Condition="'$(BuildingInsideVisualStudio)' == 'true'">net461</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' != 'true'">net461;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
index 155dd8b4f6..a1f08e9299 100644
--- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
+++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.Game.props" />
-  <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFramework Condition="'$(BuildingInsideVisualStudio)' == 'true'">net461</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' != 'true'">net461;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
index af32f48b36..a58d3b6795 100644
--- a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
+++ b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.Game.props" />
-  <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFramework Condition="'$(BuildingInsideVisualStudio)' == 'true'">net461</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' != 'true'">net461;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
index 9c5353c4fe..d7794aaafd 100644
--- a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
+++ b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.Game.props" />
-  <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFramework Condition="'$(BuildingInsideVisualStudio)' == 'true'">net461</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' != 'true'">net461;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 0f09d97f0f..5b9a1f11e4 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.Game.props" />
-  <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFramework Condition="'$(BuildingInsideVisualStudio)' == 'true'">net461</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' != 'true'">net461;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 34a5944e7f..b42d76e331 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.Game.props" />
-  <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFramework Condition="'$(BuildingInsideVisualStudio)' == 'true'">net461</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' != 'true'">net461;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>