From 880ba046110eea5273ff630e7b626d02e42ed08f Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Tue, 31 Dec 2024 16:23:24 -0800 Subject: [PATCH 1/3] Fix other developer command prompt cases, and "developer" and "code" references. --- Extension/package.nls.json | 4 ++-- .../devcommandprompt/open-developer-command-prompt.md | 8 ++++---- .../installcompiler/install-compiler-windows.md | 6 +++--- .../installcompiler/install-compiler-windows10.md | 6 +++--- .../installcompiler/install-compiler-windows11.md | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Extension/package.nls.json b/Extension/package.nls.json index 11573c0e5..b91f2025f 100644 --- a/Extension/package.nls.json +++ b/Extension/package.nls.json @@ -998,8 +998,8 @@ "c_cpp.walkthrough.create.cpp.file.title": "Create a C++ file", "c_cpp.walkthrough.create.cpp.file.description": "[Open](command:toSide:workbench.action.files.openFile) or [create](command:toSide:workbench.action.files.newUntitledFile?%7B%22languageId%22%3A%22cpp%22%7D) a C++ file. Be sure to save it with the \".cpp\" extension, such as \"helloworld.cpp\". \n[Create a C++ File](command:toSide:workbench.action.files.newUntitledFile?%7B%22languageId%22%3A%22cpp%22%7D)", "c_cpp.walkthrough.create.cpp.file.altText": "Open a C++ file or a folder with a C++ project.", - "c_cpp.walkthrough.command.prompt.title": "Launch from the developer command prompt", - "c_cpp.walkthrough.command.prompt.description": "When using the Microsoft Visual Studio C++ compiler, the C++ extension requires you to launch VS Code from the developer command prompt. Follow the instructions on the right to relaunch.\n[Reload Window](command:workbench.action.reloadWindow)", + "c_cpp.walkthrough.command.prompt.title": "Launch from the Developer Command Prompt for VS", + "c_cpp.walkthrough.command.prompt.description": "When using the Microsoft Visual Studio C++ compiler, the C++ extension requires you to launch VS Code from the Developer Command Prompt for VS. Follow the instructions on the right to relaunch.\n[Reload Window](command:workbench.action.reloadWindow)", "c_cpp.walkthrough.run.debug.title": "Run and debug your C++ file", "c_cpp.walkthrough.run.debug.mac.description": "Open your C++ file and click on the play button in the top right corner of the editor, or press F5 when on the file. Select \"clang++ - Build and debug active file\" to run with the debugger.", "c_cpp.walkthrough.run.debug.linux.description": "Open your C++ file and click on the play button in the top right corner of the editor, or press F5 when on the file. Select \"g++ - Build and debug active file\" to run with the debugger.", diff --git a/Extension/walkthrough/devcommandprompt/open-developer-command-prompt.md b/Extension/walkthrough/devcommandprompt/open-developer-command-prompt.md index 38bc6fd20..8c79c8320 100644 --- a/Extension/walkthrough/devcommandprompt/open-developer-command-prompt.md +++ b/Extension/walkthrough/devcommandprompt/open-developer-command-prompt.md @@ -1,7 +1,7 @@ -

Relaunch using the developer command prompt

-

You are using a windows machine with the MSVC compiler, so you need to start VS Code from the developer command prompt for all environment variables to be set correctly. To relaunch using the developer command prompt:

+

Relaunch using the Developer Command Prompt for VS

+

You are using a windows machine with the MSVC compiler, so you need to start VS Code from the Developer Command Prompt for VS for all environment variables to be set correctly. To relaunch using the Developer Command Prompt for VS:

    -

  1. Open the Developer Command Prompt for VS by typing "developer" in the Windows Start menu. Select the Developer Command Prompt for VS, which will automatically navigate to your current open folder.

    +

  2. Open the Developer Command Prompt for VS by typing "developer" in the Windows Start menu. Select the Developer Command Prompt for VS, which will automatically navigate to your current open folder.

    3. -

  3. Type "code" into the command prompt and hit enter. This should relaunch VS Code and take you back to this walkthrough.

    +

  4. Type "code" into the command prompt and hit enter. This should relaunch VS Code and take you back to this walkthrough.

    5. diff --git a/Extension/walkthrough/installcompiler/install-compiler-windows.md b/Extension/walkthrough/installcompiler/install-compiler-windows.md index 7abf671dd..e255064f0 100644 --- a/Extension/walkthrough/installcompiler/install-compiler-windows.md +++ b/Extension/walkthrough/installcompiler/install-compiler-windows.md @@ -8,11 +8,11 @@

    Note: You can use the C++ toolset from Visual Studio Build Tools along with Visual Studio Code to compile, build, and verify any C++ codebase as long as you also have a valid Visual Studio license (either Community, Pro, or Enterprise) that you are actively using to develop that C++ codebase.

    -

  5. Open the Developer Command Prompt for VS by typing 'developer' in the Windows Start menu.

    +

  6. Open the Developer Command Prompt for VS by typing 'developer' in the Windows Start menu.

    7. -

  7. Check your MSVC installation by typing cl into the Developer Command Prompt for VS. You should see a copyright message with the version and basic usage description.

    +

  8. Check your MSVC installation by typing cl into the Developer Command Prompt for VS. You should see a copyright message with the version and basic usage description.

    -

    Note: To use MSVC from the command line or VS Code, you must run from a Developer Command Prompt for VS. An ordinary shell such as PowerShell, Bash, or the Windows command prompt does not have the necessary path environment variables set.

    +

    Note: To use MSVC from the command line or VS Code, you must run from a Developer Command Prompt for VS. An ordinary shell such as PowerShell, Bash, or the Windows command prompt does not have the necessary path environment variables set.

\ No newline at end of file diff --git a/Extension/walkthrough/installcompiler/install-compiler-windows10.md b/Extension/walkthrough/installcompiler/install-compiler-windows10.md index 999b9ed46..1bcae2d9a 100644 --- a/Extension/walkthrough/installcompiler/install-compiler-windows10.md +++ b/Extension/walkthrough/installcompiler/install-compiler-windows10.md @@ -11,11 +11,11 @@

Verifying the compiler installation

    -

  1. Open the Developer Command Prompt for VS by typing 'developer' in the Windows Start menu.

    +

  2. Open the Developer Command Prompt for VS by typing 'developer' in the Windows Start menu.

    3. -

  3. Check your MSVC installation by typing cl into the Developer Command Prompt for VS. You should see a copyright message with the version and basic usage description.

    +

  4. Check your MSVC installation by typing cl into the Developer Command Prompt for VS. You should see a copyright message with the version and basic usage description.

    -

    Note: To use MSVC from the command line or VS Code, you must run from a Developer Command Prompt for VS. An ordinary shell such as PowerShell, Bash, or the Windows command prompt does not have the necessary path environment variables set.

    +

    Note: To use MSVC from the command line or VS Code, you must run from a Developer Command Prompt for VS. An ordinary shell such as PowerShell, Bash, or the Windows command prompt does not have the necessary path environment variables set.

diff --git a/Extension/walkthrough/installcompiler/install-compiler-windows11.md b/Extension/walkthrough/installcompiler/install-compiler-windows11.md index 1d21f4596..d711b8d9e 100644 --- a/Extension/walkthrough/installcompiler/install-compiler-windows11.md +++ b/Extension/walkthrough/installcompiler/install-compiler-windows11.md @@ -11,11 +11,11 @@

Verifying the compiler installation

    -

  1. Open the Developer Command Prompt for VS by typing 'developer' in the Windows Start menu.

    +

  2. Open the Developer Command Prompt for VS by typing 'developer' in the Windows Start menu.

    3. -

  3. Check your MSVC installation by typing cl into the Developer Command Prompt for VS. You should see a copyright message with the version and basic usage description.

    +

  4. Check your MSVC installation by typing cl into the Developer Command Prompt for VS. You should see a copyright message with the version and basic usage description.

    -

    Note: To use MSVC from the command line or VS Code, you must run from a Developer Command Prompt for VS. An ordinary shell such as PowerShell, Bash, or the Windows command prompt does not have the necessary path environment variables set.

    +

    Note: To use MSVC from the command line or VS Code, you must run from a Developer Command Prompt for VS. An ordinary shell such as PowerShell, Bash, or the Windows command prompt does not have the necessary path environment variables set.

From b462b871a794835dd96cd8d1527fc36ff1897d71 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Tue, 31 Dec 2024 16:29:32 -0800 Subject: [PATCH 2/3] Add comment. --- Extension/package.nls.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Extension/package.nls.json b/Extension/package.nls.json index b91f2025f..67a3bcb3d 100644 --- a/Extension/package.nls.json +++ b/Extension/package.nls.json @@ -998,8 +998,18 @@ "c_cpp.walkthrough.create.cpp.file.title": "Create a C++ file", "c_cpp.walkthrough.create.cpp.file.description": "[Open](command:toSide:workbench.action.files.openFile) or [create](command:toSide:workbench.action.files.newUntitledFile?%7B%22languageId%22%3A%22cpp%22%7D) a C++ file. Be sure to save it with the \".cpp\" extension, such as \"helloworld.cpp\". \n[Create a C++ File](command:toSide:workbench.action.files.newUntitledFile?%7B%22languageId%22%3A%22cpp%22%7D)", "c_cpp.walkthrough.create.cpp.file.altText": "Open a C++ file or a folder with a C++ project.", - "c_cpp.walkthrough.command.prompt.title": "Launch from the Developer Command Prompt for VS", - "c_cpp.walkthrough.command.prompt.description": "When using the Microsoft Visual Studio C++ compiler, the C++ extension requires you to launch VS Code from the Developer Command Prompt for VS. Follow the instructions on the right to relaunch.\n[Reload Window](command:workbench.action.reloadWindow)", + "c_cpp.walkthrough.command.prompt.title": { + "message": "Launch from the Developer Command Prompt for VS", + "comment": [ + "Don't translate the product name \"Developer Command Prompt for VS\"." + ] + }, + "c_cpp.walkthrough.command.prompt.description": { + "message": "When using the Microsoft Visual Studio C++ compiler, the C++ extension requires you to launch VS Code from the Developer Command Prompt for VS. Follow the instructions on the right to relaunch.\n[Reload Window](command:workbench.action.reloadWindow)", + "comment": [ + "Don't translate the product name \"Developer Command Prompt for VS\"." + ] + }, "c_cpp.walkthrough.run.debug.title": "Run and debug your C++ file", "c_cpp.walkthrough.run.debug.mac.description": "Open your C++ file and click on the play button in the top right corner of the editor, or press F5 when on the file. Select \"clang++ - Build and debug active file\" to run with the debugger.", "c_cpp.walkthrough.run.debug.linux.description": "Open your C++ file and click on the play button in the top right corner of the editor, or press F5 when on the file. Select \"g++ - Build and debug active file\" to run with the debugger.", From 6ad4d0d4608ed6114f638a61eb189bde050d8aed Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Tue, 31 Dec 2024 16:31:20 -0800 Subject: [PATCH 3/3] Fix wrong markdown. --- .../walkthrough/installcompiler/install-compiler-windows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Extension/walkthrough/installcompiler/install-compiler-windows.md b/Extension/walkthrough/installcompiler/install-compiler-windows.md index e255064f0..81cdda541 100644 --- a/Extension/walkthrough/installcompiler/install-compiler-windows.md +++ b/Extension/walkthrough/installcompiler/install-compiler-windows.md @@ -8,7 +8,7 @@

Note: You can use the C++ toolset from Visual Studio Build Tools along with Visual Studio Code to compile, build, and verify any C++ codebase as long as you also have a valid Visual Studio license (either Community, Pro, or Enterprise) that you are actively using to develop that C++ codebase.

-

  • Open the Developer Command Prompt for VS by typing 'developer' in the Windows Start menu.

    +

  • Open the Developer Command Prompt for VS by typing 'developer' in the Windows Start menu.

  • Check your MSVC installation by typing cl into the Developer Command Prompt for VS. You should see a copyright message with the version and basic usage description.