From 83b76d9af61331d144cc5b8c8768dcc541244aff Mon Sep 17 00:00:00 2001 From: gugavaro Date: Mon, 28 Oct 2019 15:34:10 -0400 Subject: [PATCH 1/2] Add vscode files so we can build/debug/test from inside the vscode ide --- .vscode/extensions.json | 9 +++++ .vscode/launch.json | 22 ++++++++++++ .vscode/settings.json | 10 ++++++ .vscode/tasks.json | 67 +++++++++++++++++++++++++++++++++++++ Java.Interop.code-workspace | 8 +++++ 5 files changed, 116 insertions(+) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 .vscode/tasks.json create mode 100644 Java.Interop.code-workspace diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000..8e3e206f9 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,9 @@ +{ + "recommendations": [ + "ms-vscode.csharp", + "ms-vscode.cpptools", + "ms-vscode.mono-debug", + "wghats.vscode-nxunit-test-adapter", + "visualstudioexptteam.vscodeintellicode", + ] +} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..a7429b183 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,22 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Launch", + "type": "mono", + "request": "launch", + "program": "${workspaceRoot}/packages/NUnit.ConsoleRunner.3.9.0/tools/nunit3-console.exe ${workspaceRoot}/bin/TestDebug/generator-Tests.dll", + "cwd": "${workspaceRoot}bin/TestDebug/" + }, + { + "name": "Attach", + "type": "mono", + "request": "attach", + "address": "localhost", + "port": 55555 + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..98c263e55 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,10 @@ +{ + "nxunitExplorer.nunit": "packages/NUnit.ConsoleRunner.3.9.0/tools/nunit3-console.exe", + "nxunitExplorer.modules": [ + "bin/TestDebug/generator-Tests.dll", + "bin/TestDebug/Java.Interop.Tools.JavaCallableWrappers-Tests.dll", + "bin/TestDebug/LogcatParse-Tests.dll", + "bin/TestDebug/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll", + "bin/TestDebug/Xamarin.Android.Tools.Bytecode-Tests.dll", + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 000000000..666b4416a --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,67 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "Build Java.Interop Tasks", + "type": "shell", + "command": "msbuild Java.Interop.sln /restore /t:Build", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [ + "$msCompile" + ] + }, + { + "label": "Clean Java.Interop Tasks", + "type": "shell", + "command": "msbuild Java.Interop.sln /restore /t:Clean", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [ + "$msCompile" + ] + }, + { + "label": "Build Generator Tasks", + "type": "shell", + "command": "msbuild tools/generator/generator.sln /restore /t:Build", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [ + "$msCompile" + ] + }, + { + "label": "Clean Java.Interop Tasks", + "type": "shell", + "command": "msbuild tools/generator/generator.sln /restore /t:Clean", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [ + "$msCompile" + ] + }, + { + "label": "Run Generator Unit Tests", + "type": "shell", + "command": "msbuild tools/generator/generator.sln /restore /t:RunNunitTests", + "group": { + "kind": "test", + "isDefault": true + }, + "problemMatcher": [ + "$msCompile" + ] + } + ] +} \ No newline at end of file diff --git a/Java.Interop.code-workspace b/Java.Interop.code-workspace new file mode 100644 index 000000000..32e45d9f7 --- /dev/null +++ b/Java.Interop.code-workspace @@ -0,0 +1,8 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": {} + } \ No newline at end of file From becbb4c92055635ff19d504a59da7dc70345d511 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Tue, 29 Oct 2019 12:00:33 -0400 Subject: [PATCH 2/2] Rename some tasks. Java.Interop has very few "Tasks", in the MSBuild sense anyway. Remove "Tasks" from the task names for "Build/Clean Java.Interop". Fix the name of the `Clean Generator` task. (It was previously a "duplicated" `Clean Java.Interop Tasks` task.) --- .vscode/tasks.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 666b4416a..7825fd0f5 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ "version": "2.0.0", "tasks": [ { - "label": "Build Java.Interop Tasks", + "label": "Build Java.Interop", "type": "shell", "command": "msbuild Java.Interop.sln /restore /t:Build", "group": { @@ -16,7 +16,7 @@ ] }, { - "label": "Clean Java.Interop Tasks", + "label": "Clean Java.Interop", "type": "shell", "command": "msbuild Java.Interop.sln /restore /t:Clean", "group": { @@ -28,7 +28,7 @@ ] }, { - "label": "Build Generator Tasks", + "label": "Build Generator", "type": "shell", "command": "msbuild tools/generator/generator.sln /restore /t:Build", "group": { @@ -40,7 +40,7 @@ ] }, { - "label": "Clean Java.Interop Tasks", + "label": "Clean Generator", "type": "shell", "command": "msbuild tools/generator/generator.sln /restore /t:Clean", "group": { @@ -64,4 +64,4 @@ ] } ] -} \ No newline at end of file +}