Skip to content

Commit af71e37

Browse files
Merge pull request #10286 from MicrosoftDocs/main638544423907610022sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents d037fd9 + 8f13b43 commit af71e37

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

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/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)