Skip to content

A Swiss Army knife for developers.

Updated contribution steps for MacOS

Etienne Baudoux1004c9beba9a
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..0730bcdf9
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,6 @@
+{
+ "recommendations": [
+ "ms-dotnettools.csharp",
+ "visualstudioexptteam.vscodeintellicode",
+ ]
+}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 17d559ca5..70a1b3f37 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,46 +1,38 @@
{
- // Use IntelliSense to find out which attributes exist for C# debugging
- // Use hover for the description of the existing attributes
- // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
- "version": "0.2.0",
- "configurations": [
- {
- // Use IntelliSense to find out which attributes exist for C# debugging
- // Use hover for the description of the existing attributes
- // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
- "name": "Debug (Chrome, WebAssembly)",
- "type": "pwa-chrome",
- "request": "launch",
- "url": "http://localhost:5000",
- "webRoot": "${workspaceFolder}/src/app/dev/platforms/web/DevToys.Wasm",
- "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+ // Use IntelliSense to find out which attributes exist for C# debugging
+ // Use hover for the description of the existing attributes
+ // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+ "version": "0.2.0",
+ "configurations": [
+ {
+ // Use IntelliSense to find out which attributes exist for C# debugging
+ // Use hover for the description of the existing attributes
+ // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+ "name": "Debug (Chrome, WebAssembly)",
+ "type": "pwa-chrome",
+ "request": "launch",
+ "url": "http://localhost:5000",
+ "webRoot": "${workspaceFolder}/src/app/dev/platforms/web/DevToys.Wasm",
+ "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+ "timeout": 30000,
+ "server": {
+ "runtimeExecutable": "dotnet",
+ "program": "run",
+ "outputCapture": "std",
"timeout": 30000,
- "server": {
- "runtimeExecutable": "dotnet",
- "program": "run",
- "outputCapture": "std",
- "timeout": 30000,
- "cwd": "${workspaceFolder}/src/app/dev/platforms/web/DevToys.Wasm"
- }
- },
- {
- // Use IntelliSense to find out which attributes exist for C# debugging
- // Use hover for the description of the existing attributes
- // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
- "name": "Debug (macOS)",
- "type": "coreclr",
- "request": "launch",
- "preLaunchTask": "build-macos",
- // If you have changed target frameworks, make sure to update the program path.
- "program": "${workspaceFolder}/bin/Debug/AnyCPU/DevToys.MacOS/net7.0-maccatalyst/maccatalyst-x64/DevToys.MacOS.app",
- "args": [],
- "env": {
- "DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
- },
- "cwd": "${workspaceFolder}/bin/Debug/AnyCPU/DevToys.MacOS/net7.0-maccatalyst/maccatalyst-x64/DevToys.MacOS.app",
- // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
- "console": "internalConsole",
- "stopAtEntry": false
+ "cwd": "${workspaceFolder}/src/app/dev/platforms/web/DevToys.Wasm"
}
- ]
- }
\ No newline at end of file
+ },
+ {
+ // Use IntelliSense to find out which attributes exist for C# debugging
+ // Use hover for the description of the existing attributes
+ // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+ "name": "Debug (macOS desktop app)",
+ "type": "coreclr",
+ "request": "attach",
+ "preLaunchTask": "run-macos",
+ "processName": "DevToys.MacOS",
+ "justMyCode": false,
+ }
+ ]
+}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index cf5672d00..a2ae2cd1e 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,41 +1,99 @@
{
- "version": "2.0.0",
- "tasks": [
- {
- "label": "build-wasm",
- "command": "dotnet",
- "type": "process",
- "args": [
- "build",
- "${workspaceFolder}/src/app/dev/platforms/web/DevToys.Wasm/DevToys.Wasm.csproj",
- "/property:GenerateFullPaths=true",
- "/consoleloggerparameters:NoSummary"
- ],
- "problemMatcher": "$msCompile"
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "label": "build-wasm",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "build",
+ "${workspaceFolder}/src/app/dev/platforms/web/DevToys.Wasm/DevToys.Wasm.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "build-macos",
+ "command": "dotnet",
+ "type": "shell",
+ "args": [
+ "build",
+ "${workspaceFolder}/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj",
+ "-t:${input:target}",
+ "-f:net7.0-maccatalyst",
+ "-c:${input:configuration}"
+ ],
+ "group": {
+ "kind": "build",
+ "isDefault": true
},
- {
- "label": "build-macos",
- "command": "dotnet",
- "type": "process",
- "args": [
- "build",
- "${workspaceFolder}/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj",
- "/property:GenerateFullPaths=true",
- "/consoleloggerparameters:NoSummary"
- ],
- "problemMatcher": "$msCompile"
+ "presentation": {
+ "reveal": "always"
},
- {
- "label": "build-cli",
- "command": "dotnet",
- "type": "process",
- "args": [
- "build",
- "${workspaceFolder}/src/app/dev/platforms/desktop/DevToys.CLI/DevToys.CLI.csproj",
- "/property:GenerateFullPaths=true",
- "/consoleloggerparameters:NoSummary"
- ],
- "problemMatcher": "$msCompile"
- }
- ]
- }
\ No newline at end of file
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "run-macos",
+ "command": "dotnet",
+ "type": "shell",
+ "args": [
+ "build",
+ "${workspaceFolder}/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj",
+ "-t:Run",
+ "-f:net7.0-maccatalyst",
+ "-c:${input:configuration}",
+ "--no-restore"
+ ],
+ "group": "build",
+ "presentation": {
+ "reveal": "always"
+ },
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "build-cli",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "build",
+ "${workspaceFolder}/src/app/dev/platforms/desktop/DevToys.CLI/DevToys.CLI.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "type": "typescript",
+ "tsconfig": "bin/Debug/AnyCPU/DevToys.MacOS/net7.0-maccatalyst/maccatalyst-arm64/devtoys.monacoeditor/ts-helpermethods/ts-helpermethods-Wasm/tsconfig.json",
+ "problemMatcher": [
+ "$tsc"
+ ],
+ "group": "build",
+ "label": "tsc: build - bin/Debug/AnyCPU/DevToys.MacOS/net7.0-maccatalyst/maccatalyst-arm64/devtoys.monacoeditor/ts-helpermethods/ts-helpermethods-Wasm/tsconfig.json"
+ }
+ ],
+ "inputs": [
+ {
+ "id": "target",
+ "type": "pickString",
+ "default": "Build",
+ "description": "Select MSBuild target",
+ "options": [
+ "Build",
+ "Rebuild",
+ "Clean"
+ ]
+ },
+ {
+ "id": "configuration",
+ "type": "pickString",
+ "default": "Debug",
+ "description": "Select MSBuild configuration",
+ "options": [
+ "Debug",
+ "Release"
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8e7fe3e52..daf7407af 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,28 +40,20 @@ You can contribute to DevToys app by:
### Prerequisites
1. Make sure your machine is running on macOS Ventura 13.1 or later.
+1. Install [**Xcode 14.2**](https://developer.apple.com/xcode/) or later. Run it at least once and allow it to install the built-in macOS and iOS tooling.
1. [**Visual Studio Code**](https://code.visualstudio.com/) or [**Visual Studio for Mac**](https://visualstudio.microsoft.com/vs/mac/) or [**JetBrains Rider**](https://www.jetbrains.com/rider/)
-1. **.NET SDK**
+1. **.NET SDK**. This is required to build the app itself.
* [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/7.0) (**version 7.0 (SDK 7.0.101)** or later)
> Use `dotnet --version` from the terminal to get the version installed.
-1. [Node.js](https://nodejs.org/).
+1. [Node.js](https://nodejs.org/). This is required to build Monaco Editor.
+2. If you're using an [Mac computer with Apple silicon processor](https://support.apple.com/en-us/HT211814), install [Rosetta 2](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) using the following command in a Terminal:
+ ```
+ softwareupdate --install-rosetta
+ ```
### Finalize your environment
1. Clone this repository.
1. Open a Terminal
-1. Install the Uno Platform tool by running the following command from the command prompt:
- ```
- dotnet tool install -g uno.check
- ```
-1. Run the tool from the command prompt with the following command:
- ```
- uno-check
- ```
- If the above command fails, use the following:
- ```
- ~/.dotnet/tools/uno-check
- ```
-1. Follow the instructions indicated by the tool.
1. Install Nuke.Build command line tooling with the following command from the command prompt:
```
dotnet tool install Nuke.GlobalTool --global
@@ -79,10 +71,8 @@ You can contribute to DevToys app by:
#### If you are using Visual Studio Code:
1. Open the repository in Visual Studio Code to edit the code.
-1. In a Terminal prompt, run the following command to build and run DevToys for Mac:
- ```
- sudo dotnet run --project src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj --framework net7.0-maccatalyst
- ```
+2. Install the `C#` extension.
+1. In `Run and Debug`, select `Debug (macOS dektop app)` and press Start.
# Internationalization and localization