1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-29 02:03:22 +08:00

Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage

This commit is contained in:
EVAST9919 2017-05-08 04:18:15 +03:00
commit 376e4e1840
2 changed files with 65 additions and 52 deletions

40
.vscode/launch.json vendored
View File

@ -2,46 +2,60 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"name": "Launch VisualTests", "name": "VisualTests (debug)",
"windows": { "windows": {
"type": "clr" "type": "clr"
}, },
"type": "mono", "type": "mono",
"request": "launch", "request": "launch",
"program": "${workspaceRoot}/osu.Desktop.VisualTests/bin/Debug/osu!.exe", "program": "${workspaceRoot}/osu.Desktop.VisualTests/bin/Debug/osu!.exe",
"args": [],
"cwd": "${workspaceRoot}", "cwd": "${workspaceRoot}",
"preLaunchTask": "build", "preLaunchTask": "Build (Debug)",
"runtimeExecutable": null, "runtimeExecutable": null,
"env": {}, "env": {},
"console": "internalConsole" "console": "internalConsole"
}, },
{ {
"name": "Launch Desktop", "name": "VisualTests (release)",
"windows": {
"type": "clr"
},
"type": "mono",
"request": "launch",
"program": "${workspaceRoot}/osu.Desktop.VisualTests/bin/Release/osu!.exe",
"cwd": "${workspaceRoot}",
"preLaunchTask": "Build (Release)",
"runtimeExecutable": null,
"env": {},
"console": "internalConsole"
},
{
"name": "osu! (debug)",
"windows": { "windows": {
"type": "clr" "type": "clr"
}, },
"type": "mono", "type": "mono",
"request": "launch", "request": "launch",
"program": "${workspaceRoot}/osu.Desktop/bin/Debug/osu!.exe", "program": "${workspaceRoot}/osu.Desktop/bin/Debug/osu!.exe",
"args": [],
"cwd": "${workspaceRoot}", "cwd": "${workspaceRoot}",
"preLaunchTask": "build", "preLaunchTask": "Build (Debug)",
"runtimeExecutable": null, "runtimeExecutable": null,
"env": {}, "env": {},
"console": "internalConsole" "console": "internalConsole"
}, },
{ {
"name": "Attach", "name": "osu! (release)",
"windows": { "windows": {
"type": "clr", "type": "clr"
"request": "attach",
"processName": "osu!"
}, },
"type": "mono", "type": "mono",
"request": "attach", "request": "launch",
"address": "localhost", "program": "${workspaceRoot}/osu.Desktop/bin/Release/osu!.exe",
"port": 55555 "cwd": "${workspaceRoot}",
"preLaunchTask": "Build (Release)",
"runtimeExecutable": null,
"env": {},
"console": "internalConsole"
} }
] ]
} }

77
.vscode/tasks.json vendored
View File

@ -1,51 +1,50 @@
{ {
// See https://go.microsoft.com/fwlink/?LinkId=733558 // See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format // for the documentation about the tasks.json format
"version": "0.1.0", "version": "2.0.0",
"taskSelector": "/t:", "problemMatcher": "$msCompile",
"isShellCommand": true,
"command": "msbuild",
"suppressTaskName": true,
"showOutput": "silent",
"args": [
"/property:GenerateFullPaths=true",
"/property:DebugType=portable"
],
"windows": {
"args": [
"/property:GenerateFullPaths=true",
"/property:DebugType=portable",
"/m" //parallel compiling support. doesn't work well with mono atm
]
},
"tasks": [ "tasks": [
{ {
"taskName": "build", "taskName": "Build (Debug)",
"isShellCommand": true,
"showOutput": "silent",
"command": "msbuild",
"args": [
"/property:GenerateFullPaths=true",
"/property:DebugType=portable"
],
"windows": {
"args": [
"/property:GenerateFullPaths=true",
"/property:DebugType=portable",
"/m" //parallel compiling support. doesn't work well with mono atm
]
},
// Use the standard MS compiler pattern to detect errors, warnings and infos
"problemMatcher": "$msCompile",
"isBuildCommand": true "isBuildCommand": true
}, },
{ {
"taskName": "rebuild", "taskName": "Build (Release)",
"isShellCommand": true,
"showOutput": "silent",
"command": "msbuild",
"args": [ "args": [
// Ask msbuild to generate full paths for file names. "/property:Configuration=Release"
"/property:GenerateFullPaths=true", ]
"/property:DebugType=portable", },
"/target:Clean,Build" {
], "taskName": "Clean All",
"windows": { "dependsOn": ["Clean (Debug)", "Clean (Release)"]
"args": [ },
"/property:GenerateFullPaths=true", {
"/property:DebugType=portable", "taskName": "Clean (Debug)",
"/target:Clean,Build", "args": [
"/m" //parallel compiling support. doesn't work well with mono atm "/target:Clean"
] ]
}, },
// Use the standard MS compiler pattern to detect errors, warnings and infos {
"problemMatcher": "$msCompile", "taskName": "Clean (Release)",
"isBuildCommand": true "args": [
"/target:Clean",
"/property:Configuration=Release"
]
} }
] ]
} }