Skip to content

Commit 8f13b43

Browse files
committed
Merged main into live
2 parents a508568 + f6477f9 commit 8f13b43

9 files changed

+24
-29
lines changed

docs/containers/tutorial-multicontainer.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,6 @@ Add a project to the same solution and call it *MyWebAPI*. Select **API** as the
218218
The *docker-compose.yml* appears as follows:
219219

220220
```yaml
221-
version: '3.4'
222-
223221
services:
224222
webfrontend:
225223
image: ${DOCKER_REGISTRY-}webfrontend
@@ -242,8 +240,6 @@ Add a project to the same solution and call it *MyWebAPI*. Select **API** as the
242240
Visual Studio makes some changes to your Docker Compose YML file. Now both services are included.
243241

244242
```yaml
245-
version: '3.4'
246-
247243
services:
248244
webfrontend:
249245
image: ${DOCKER_REGISTRY-}webfrontend
@@ -344,8 +340,6 @@ Congratulations, you're running a Docker Compose application with a custom Docke
344340
The *docker-compose.yml* appears as follows:
345341

346342
```yaml
347-
version: '3.4'
348-
349343
services:
350344
webfrontend:
351345
image: ${DOCKER_REGISTRY-}webfrontend
@@ -368,8 +362,6 @@ Congratulations, you're running a Docker Compose application with a custom Docke
368362
Visual Studio makes some changes to your `docker-compose` YML file. Now both services are included.
369363

370364
```yaml
371-
version: '3.4'
372-
373365
services:
374366
webfrontend:
375367
image: ${DOCKER_REGISTRY-}webfrontend

docs/debugger/debugging-absolute-beginners.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ Next, you create an application that has a few bugs.
7777

7878
1. Open Visual Studio.
7979

80-
On the start window, choose **Create a new project**. Type **console** in the search box, select either **C#** or **Visual Basic** as the language, and then choose **Console App** for .NET. Choose **Next**. Type a project name like **ConsoleApp_FirstApp** and select **Next**.
80+
On the start window, choose **Create a new project**. Type **console** in the search box, select either **C#** or **Visual Basic** as the language, and then choose **Console App** for .NET. Choose **Next**. Type **ConsoleApp_FirstApp** as the project name and select **Next**.
81+
82+
If you use a different project name, you will need to modify the namespace value to match your project name when you copy the example code.
8183

8284
Choose either the recommended target framework or .NET 8, and then choose **Create**.
8385

docs/extensibility/internals/command-implementation.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,25 @@ The following sections explain how to register and implement commands.
2525
## Register commands with Visual Studio
2626
If your command is to appear on a menu, you must add the <xref:Microsoft.VisualStudio.Shell.ProvideMenuResourceAttribute> to your VSPackage, and use as a value either the name of the menu or its resource ID.
2727

28-
```
28+
```c#
2929
[ProvideMenuResource("Menus.ctmenu", 1)]
30-
...
31-
public sealed class MyPackage : Package
32-
{.. ..}
33-
30+
public sealed class MyPackage : Package
31+
{
32+
// ...
33+
}
3434
```
3535

3636
In addition, you must register the command with the <xref:Microsoft.VisualStudio.Shell.OleMenuCommandService>. You can get this service by using the <xref:Microsoft.VisualStudio.Shell.Package.GetService%2A> method if your VSPackage is derived from <xref:Microsoft.VisualStudio.Shell.Package>.
3737

38-
```
38+
```c#
3939
OleMenuCommandService mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
40-
if ( null != mcs )
40+
if (mcs is not null)
4141
{
4242
// Create the command for the menu item.
4343
CommandID menuCommandID = new CommandID(guidCommandGroup, myCommandID);
44-
MenuCommand menuItem = new MenuCommand(MenuItemCallback, menuCommandID );
45-
mcs.AddCommand( menuItem );
44+
MenuCommand menuItem = new MenuCommand(MenuItemCallback, menuCommandID);
45+
mcs.AddCommand(menuItem);
4646
}
47-
4847
```
4948

5049
## Implement commands

docs/extensibility/roslyn-version-support.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ As an example, to ensure that your custom analyzer works on all versions of Visu
1818

1919
| Roslyn package version | Minimum supported Visual Studio version |
2020
| - | - |
21-
| 4.8.0 | Visual Studio 2022 version 17.8 (Preview) |
21+
| 4.10.0 | Visual Studio 2022 version 17.10 |
22+
| 4.9.2 | Visual Studio 2022 version 17.9 |
23+
| 4.8.0 | Visual Studio 2022 version 17.8 |
2224
| 4.7.0 | Visual Studio 2022 version 17.7 |
2325
| 4.6.0 | Visual Studio 2022 version 17.6 |
2426
| 4.5.0 | Visual Studio 2022 version 17.5 |

docs/ide/how-to-sign-application-and-deployment-manifests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ manager: mijacobs
2121

2222
If you want to publish an application by using ClickOnce deployment, the application and deployment manifests must be signed with a public/private key pair and signed using Authenticode technology. You can sign the manifests by using a certificate from the Windows certificate store or a key file.
2323

24-
The information in this article applies only if you're using the .NET Framework 4.7.2 or earlier. If you're using .NET 5 or later, follow the steps in [Deploy a .NET Windows desktop application using ClickOnce](../deployment/quickstart-deploy-using-clickonce-folder.md).
24+
The information in this article applies only if you're using the .NET Framework 4.8.1 or earlier. If you're using .NET 5 or later, follow the steps in [Deploy a .NET Windows desktop application using ClickOnce](../deployment/quickstart-deploy-using-clickonce-folder.md).
2525

2626
For more information about ClickOnce deployment, see [ClickOnce security and deployment](../deployment/clickonce-security-and-deployment.md).
2727

docs/ide/reference/how-to-manage-word-wrap-in-the-editor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ You can set and clear the **Word wrap** option. When this option is set, the por
4343

4444
If you're familiar with word wrap in Notepad++, Sublime Text, or Visual Studio Code (VS Code), be aware of the following issues where Visual Studio behaves differently to other editors:
4545

46-
* [Triple-click doesn't select whole line](https://developercommunity.visualstudio.com/t/fix-known-issues-in-word-wrap/351760)
47-
* [Pressing End key twice doesn't move cursor to end of line](https://developercommunity.visualstudio.com/t/fix-known-issues-in-word-wrap/351760)
46+
* [Unexpected and sporadic indents](https://developercommunity.visualstudio.com/t/Unexpected-and-sporadic-indents-when-usi/10635809)
47+
* [Pressing Home key twice should move cursor to very beginning of line](https://developercommunity.visualstudio.com/t/Pressing-Home-key-twice-should-move-curs/10635835)
4848

4949
## Related content
5050

docs/javascript/debug-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ with this code:
176176
```javascript
177177
output: {
178178
filename: "./app-bundle.js", // Replace with the filename in your project
179-
devtoolModuleFilenameTemplate: '[resource-path]' // Removes the webpack:/// prefix
179+
devtoolModuleFilenameTemplate: '[absolute-resource-path]' // Removes the webpack:/// prefix
180180
},
181181
```
182182

docs/test/configure-unit-tests-by-using-a-dot-runsettings-file.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ The **RunConfiguration** element can include the following elements:
164164
|**TreatTestAdapterErrorsAsWarnings**|false|false, true|
165165
|**TestAdaptersPaths**||One or more paths to the directory where the TestAdapters are located|
166166
|**TestCaseFilter**|| A filter expression in the format \<property>\<operator>\<value>[\|\&amp;\<Expression>]. The boolean operator **\&** should be represented by the HTML entity **\&amp;**. Expressions can be enclosed in parentheses. For detailed syntax on expression structure, see [vstest/docs/filter.md](https://github.com/microsoft/vstest/blob/main/docs/filter.md). |
167-
|**TestSessionTimeout**||Allows users to terminate a test session when it exceeds a given timeout. Setting a timeout ensures that resources are well consumed and test sessions are constrained to a set time. The setting is available in **Visual Studio 2017 version 15.5** and later.|
167+
|**TestSessionTimeout**||Allows users to terminate a test session when it exceeds a given timeout, specified in milliseconds. Setting a timeout ensures that resources are well consumed and test sessions are constrained to a set time. The setting is available in **Visual Studio 2017 version 15.5** and later.|
168168
|**DotnetHostPath**||Specify a custom path to dotnet host that is used to run the testhost. It's useful when you're building your own dotnet, for example when building the dotnet/runtime repository. Specifying this option skips looking for testhost.exe, and forces the use of testhost.dll.|
169169
|**TreatNoTestsAsError**|false| true or false <br>Specify a Boolean value, which defines the exit code when no tests are discovered. If the value is `true` and no tests are discovered, a nonzero exit code is returned. Otherwise, zero is returned.|
170170

docs/test/remote-testing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,16 @@ For a Dockerfile, the environment can be specified in the *testEnvironments.json
7878
}
7979
```
8080

81-
The following example shows the *testenvironments.json* file for a local container image named `<mcr.microsoft.com/dotnet/core/sdk>`.
81+
The following example shows the *testenvironments.json* file for a local container image named `<mcr.microsoft.com/dotnet/sdk>`.
8282

8383
```json
8484
{
8585
"version": "1",
8686
"environments": [
8787
{
88-
"name": "linux dotnet-core-sdk-3.1",
88+
"name": "linux dotnet-sdk-5.0",
8989
"type": "docker",
90-
"dockerImage": "mcr.microsoft.com/dotnet/core/sdk"
90+
"dockerImage": "mcr.microsoft.com/dotnet/sdk"
9191
}
9292
]
9393
}
@@ -96,7 +96,7 @@ The following example shows the *testenvironments.json* file for a local contain
9696
The following example shows a Dockerfile for running tests targeting .NET 5.0. The second line makes sure the debugger can connect and run in your container.
9797

9898
```dockerfile
99-
FROM mcr.microsoft.com/dotnet/core/sdk:5.0
99+
FROM mcr.microsoft.com/dotnet/sdk:5.0
100100

101101
RUN wget https://aka.ms/getvsdbgsh && \
102102
sh getvsdbgsh -v latest -l /vsdbg

0 commit comments

Comments
 (0)