From 96901b649826e293ee99caf5029c50c99760fbe4 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Mon, 26 Mar 2018 10:52:54 +0900 Subject: [PATCH] Add msbuild/dotnet build + launch targets --- .vscode/launch.json | 131 ++++++++++-------- .vscode/tasks.json | 94 +++++++------ osu-framework | 2 +- osu-resources | 2 +- .../osu.Game.Rulesets.Catch.csproj | 2 +- .../osu.Game.Rulesets.Mania.csproj | 2 +- .../osu.Game.Rulesets.Osu.csproj | 2 +- .../osu.Game.Rulesets.Taiko.csproj | 2 +- osu.Game.Tests/osu.Game.Tests.csproj | 2 +- osu.Game/osu.Game.csproj | 2 +- 10 files changed, 135 insertions(+), 106 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 6c0a8929f7..8c8255db71 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,102 +1,119 @@ { "version": "0.2.0", - "configurations": [{ - "name": "osu! VisualTests (Debug, .NETFramework)", + "configurations": [ + { + "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)", - "request": "launch", + "name": "VisualTests (Debug, netcoreapp2.0)", "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)", - "runtimeExecutable": null, + "preLaunchTask": "Build (Debug, dotnet)", + "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" } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f67d7a8c4e..3378a83616 100644 --- a/.vscode/tasks.json +++ b/.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": [{ - "label": "Build (Debug)", - "type": "shell", - "command": "msbuild", - "args": [ - "/p:GenerateFullPaths=true", - "/p:DebugType=portable", - "/m", - "/v:m" - ], - "group": { - "kind": "build", - "isDefault": true - }, - "problemMatcher": "$msCompile" - }, + "tasks": [ { - "label": "Build (Release)", + "label": "Build (Debug, msbuild)", "type": "shell", "command": "msbuild", "args": [ - "/p:Configuration=Release", - "/p:DebugType=portable", + "/p:TargetFramework=net461", "/p:GenerateFullPaths=true", "/m", - "/v:m" + "/verbosity:m" ], "group": "build", "problemMatcher": "$msCompile" }, { - "label": "Clean (Debug)", - "type": "shell", - "command": "msbuild", - "args": [ - "/p:DebugType=portable", - "/p:GenerateFullPaths=true", - "/m", - "/t:Clean", - "/v:m" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "Clean (Release)", + "label": "Build (Release, msbuild)", "type": "shell", "command": "msbuild", "args": [ "/p:Configuration=Release", + "/p:TargetFramework=net461", "/p:GenerateFullPaths=true", - "/p:DebugType=portable", "/m", - "/t:Clean", - "/v:m" + "/verbosity:m" ], + "group": "build", "problemMatcher": "$msCompile" }, { - "label": "Clean All", - "dependsOn": [ - "Clean (Debug)", - "Clean (Release)" + "label": "Build (Debug, dotnet)", + "type": "shell", + "command": "dotnet", + "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": [] } ] } \ No newline at end of file diff --git a/osu-framework b/osu-framework index ae633287dc..1ba94a8f0b 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit ae633287dc44517f3f5fc66f1d0f5333f76cc261 +Subproject commit 1ba94a8f0b0f1c43488356bf4a5cd5892f01f7da diff --git a/osu-resources b/osu-resources index db406143da..dca651b26f 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit db406143da9e791efa04cdac4418c85a6831b739 +Subproject commit dca651b26fbdfa92fad9bc537497fd47ebcd4130 diff --git a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj index 335638f10b..4db4904fb7 100644 --- a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj +++ b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj @@ -2,7 +2,7 @@ - net461;netstandard2.0 + net461;netstandard2.0;netcoreapp2.0 Library AnyCPU true diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj index c44ae0416d..0b4dca31c0 100644 --- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj +++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj @@ -2,7 +2,7 @@ - net461;netstandard2.0 + net461;netstandard2.0;netcoreapp2.0 Library AnyCPU true diff --git a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj index 2b055fb047..d966a2f8ee 100644 --- a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj +++ b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj @@ -2,7 +2,7 @@ - net461;netstandard2.0 + net461;netstandard2.0;;netcoreapp2.0 Library AnyCPU true diff --git a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj index e9a4a4e79a..9fbfe7f604 100644 --- a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj +++ b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj @@ -2,7 +2,7 @@ - net461;netstandard2.0 + net461;netstandard2.0;netcoreapp2.0 Library AnyCPU true diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index 3a351a63a8..e92b2d6a0a 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -2,7 +2,7 @@ - net461;netstandard2.0 + net461;netstandard2.0;netcoreapp2.0 Library AnyCPU true diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 893456034d..bf5c26fbff 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -2,7 +2,7 @@ - net461;netstandard2.0 + net461;netstandard2.0;netcoreapp2.0 Library AnyCPU true