Add msbuild/dotnet build + launch targets

.vscode/launch.json

@@ -1,102 +1,119 @@
 {
     "version": "0.2.0",
-    "configurations": [{
+    "configurations": [
-            "name": "osu! VisualTests (Debug, .NETFramework)",
+        {
+            "name": "VisualTests (Debug, net461)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
             "request": "launch",
-            "type": "clr",
             "program": "${workspaceRoot}/osu.Desktop/bin/Debug/net461/osu!.exe",
             "args": [
                 "--tests"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug)",
+            "preLaunchTask": "Build (Debug, msbuild)",
             "runtimeExecutable": null,
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "osu! VisualTests (Debug, .NETCore)",
+            "name": "VisualTests (Release, net461)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
             "request": "launch",
-            "type": "coreclr",
-            "program": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.0/osu!.dll",
-            "args": [
-                "--tests"
-            ],
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug)",
-            "runtimeExecutable": null,
-            "env": {},
-            "console": "internalConsole"
-        },
-        {
-            "name": "osu! VisualTests (Release, .NETFramework)",
-            "request": "launch",
-            "type": "clr",
             "program": "${workspaceRoot}/osu.Desktop/bin/Release/net461/osu!.exe",
             "args": [
                 "--tests"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release)",
+            "preLaunchTask": "Build (Release, msbuild)",
             "runtimeExecutable": null,
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "osu! VisualTests (Release, .NETCore)",
+            "name": "osu! (Debug, net461)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
             "request": "launch",
-            "type": "coreclr",
-            "program": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.0/osu!.dll",
-            "args": [
-                "--tests"
-            ],
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release)",
-            "runtimeExecutable": null,
-            "env": {},
-            "console": "internalConsole"
-        },
-        {
-            "name": "osu! (Debug, .NETFramework)",
-            "request": "launch",
-            "type": "clr",
             "program": "${workspaceRoot}/osu.Desktop/bin/Debug/net461/osu!.exe",
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug)",
+            "preLaunchTask": "Build (Debug, msbuild)",
             "runtimeExecutable": null,
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "osu! (Debug, .NETCore)",
+            "name": "osu! (Release, net461)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
             "request": "launch",
-            "type": "coreclr",
-            "program": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.0/osu!.dll",
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug)",
-            "runtimeExecutable": null,
-            "env": {},
-            "console": "internalConsole"
-        },
-        {
-            "name": "osu! (Release, .NETFramework)",
-            "request": "launch",
-            "type": "clr",
             "program": "${workspaceRoot}/osu.Desktop/bin/Release/net461/osu!.exe",
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release)",
+            "preLaunchTask": "Build (Release, msbuild)",
             "runtimeExecutable": null,
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "osu! (Release, .NETCore)",
+            "name": "VisualTests (Debug, netcoreapp2.0)",
-            "request": "launch",
             "type": "coreclr",
-            "program": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.0/osu!.dll",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.0/osu!.dll",
+                "--tests"
+            ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release)",
+            "preLaunchTask": "Build (Debug, dotnet)",
-            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release, netcoreapp2.0)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.0/osu!.dll",
+                "--tests"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release, dotnet)",
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "osu! (Debug, netcoreapp2.0)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.0/osu!.dll",
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug, dotnet)",
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "osu! (Release, netcoreapp2.0)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.0/osu!.dll",
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release, dotnet)",
             "env": {},
             "console": "internalConsole"
         }

.vscode/tasks.json

@@ -2,70 +2,82 @@
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
     "version": "2.0.0",
-    "tasks": [{
+    "tasks": [
-            "label": "Build (Debug)",
-            "type": "shell",
-            "command": "msbuild",
-            "args": [
-                "/p:GenerateFullPaths=true",
-                "/p:DebugType=portable",
-                "/m",
-                "/v:m"
-            ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "problemMatcher": "$msCompile"
-        },
         {
-            "label": "Build (Release)",
+            "label": "Build (Debug, msbuild)",
             "type": "shell",
             "command": "msbuild",
             "args": [
-                "/p:Configuration=Release",
+                "/p:TargetFramework=net461",
-                "/p:DebugType=portable",
                 "/p:GenerateFullPaths=true",
                 "/m",
-                "/v:m"
+                "/verbosity:m"
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Clean (Debug)",
+            "label": "Build (Release, msbuild)",
-            "type": "shell",
-            "command": "msbuild",
-            "args": [
-                "/p:DebugType=portable",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/t:Clean",
-                "/v:m"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "Clean (Release)",
             "type": "shell",
             "command": "msbuild",
             "args": [
                 "/p:Configuration=Release",
+                "/p:TargetFramework=net461",
                 "/p:GenerateFullPaths=true",
-                "/p:DebugType=portable",
                 "/m",
-                "/t:Clean",
+                "/verbosity:m"
-                "/v:m"
             ],
+            "group": "build",
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Clean All",
+            "label": "Build (Debug, dotnet)",
-            "dependsOn": [
+            "type": "shell",
-                "Clean (Debug)",
+            "command": "dotnet",
-                "Clean (Release)"
+            "args": [
+                "build",
+                "--no-restore",
+                "/p:TargetFramework=netcoreapp2.0",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
             ],
+            "group": "build",
             "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release, dotnet)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "/p:TargetFramework=netcoreapp2.0",
+                "/p:Configuration=Release",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Restore (net461)",
+            "type": "shell",
+            "command": "nuget",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        },
+        {
+            "label": "Restore (netcoreapp2.0)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
         }
     ]
 }

osu-framework

@@ -1 +1 @@
-Subproject commit ae633287dc44517f3f5fc66f1d0f5333f76cc261
+Subproject commit 1ba94a8f0b0f1c43488356bf4a5cd5892f01f7da

osu-resources

@@ -1 +1 @@
-Subproject commit db406143da9e791efa04cdac4418c85a6831b739
+Subproject commit dca651b26fbdfa92fad9bc537497fd47ebcd4130

osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\osu.Game.props" />
   <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\osu.Game.props" />
   <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\osu.Game.props" />
   <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\osu.Game.props" />
   <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

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

@@ -2,7 +2,7 @@
   <Import Project="..\osu.Game.props" />
   <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

osu.Game/osu.Game.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\osu.Game.props" />
   <Import Project="..\OpenTK.props" />
   <PropertyGroup Label="Project">
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netcoreapp2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>