Skip to content

Commit 3bf7ef5

Browse files
authored
Merge pull request #6259 from MicrosoftDocs/master637450345789438647
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 3db3a3b + 4997778 commit 3bf7ef5

13 files changed

+30
-30
lines changed

docs/get-started/csharp/tutorial-aspnet-core-ef-step-02.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ Replace the `<div>` content in *Index.cshtml* with this markup:
8888

8989
Run the application again. You should see that the page now displays the current time, but it's always midnight! That's not right.
9090

91-
![Visual Studio 2019 ASP.NET Core Project in Browser](media/vs-2019/vs2019-app-in-browser.png)
91+
![Screenshot of the application Home page in a browser window. The content of the page reads: "It's 12:00 AM right now on the server!".](media/vs-2019/vs2019-app-in-browser.png)
9292

9393
## Debug the application
9494

9595
Add a breakpoint to the `OnGet` method where we're assigning a value to `Time` and this time start debugging the application.
9696

9797
Execution stops on the line, and you can see that `DateTime.Today` includes the date but the time is always midnight because it doesn't include time data.
9898

99-
![Visual Studio 2019 ASP.NET Core Project in Browser](media/vs-2019/vs2019-breakpoint.png)
99+
![Screenshot showing the code for Index.cshtml.cs in Visual Studio. A breakpoint is set on the line, 'Time = DateTime.Today.ToShortTimeString();'.](media/vs-2019/vs2019-breakpoint.png)
100100

101101
Change it to use `DateTime.Now` and continue executing. The new code for `OnGet` should be:
102102

@@ -112,7 +112,7 @@ You should now see the actual server time in the browser when you navigate to th
112112
> [!NOTE]
113113
> Your output might differ from the image, since the output format of ToShortDateTimeString depends on the current culture setting. See <xref:System.DateTime.ToShortTimeString>.
114114
115-
![Visual Studio 2019 ASP.NET Core Project in Browser](media/vs-2019/vs2019-app-fixed-in-browser.png)
115+
![Screenshot of the application Home page in a browser window. The content of the page reads: "It's 1:46 AM right now on the server!".](media/vs-2019/vs2019-app-fixed-in-browser.png)
116116

117117
## Next steps
118118

docs/get-started/csharp/tutorial-aspnet-core.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,15 @@ This solution follows the **Razor Page** design pattern. It's different than the
148148

149149
1. View the **About.cshtml** file in the code editor.
150150

151-
![View the About.cshtml file in the Visual Studio code editor](media/csharp-aspnet-razor-aboutcshtml-mycoreapp-code.png)
151+
![Screenshot showing the first ten lines of the About.cshtml file in the Visual Studio code editor.](media/csharp-aspnet-razor-aboutcshtml-mycoreapp-code.png)
152152

153153
1. Choose the **About.cshtml.cs** file.
154154

155155
![Choose the About.cshtml.cs file in the Visual Studio code editor](media/csharp-aspnet-razor-solution-explorer-aboutcshtmlcs.png)
156156

157157
1. View the **About.cshtml.cs** file in the code editor.
158158

159-
![View the About.cshtml file in the Visual Studio code editor](media/csharp-aspnet-razor-aboutcshtmlcs-mycoreapp-code.png)
159+
![Screenshot showing the first 18 lines of the About.cshtml.cs file in the Visual Studio code editor. ](media/csharp-aspnet-razor-aboutcshtmlcs-mycoreapp-code.png)
160160

161161
1. The project contains a **wwwroot** folder that is the root for your website. Expand the folder to view its contents.
162162

docs/get-started/csharp/tutorial-console.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ Let's walk through a few common user input errors, locate them in the debugger i
276276

277277
When you try to divide a number by zero, the console app might freeze and then show you what's wrong in the code editor.
278278

279-
![The Visual Studio code editor shows the divide-by-zero error](./media/csharp-console-calculator-dividebyzero-error.png)
279+
![Screenshot of the Visual Studio code editor showing a line highlighted in yellow and an Exception Unhandled error for 'Attempted to divide by zero'.](./media/csharp-console-calculator-dividebyzero-error.png)
280280

281281
> [!NOTE]
282282
> Sometimes, the app doesn't freeze and the debugger won't show a divide-by-zero error. Instead, the app might return an unexpected nonnumeric result, such as an infinity symbol. The following code fix still applies.
@@ -305,7 +305,7 @@ Let's change the code to handle this error.
305305

306306
Now, when you divide any number by zero, the app will ask for another number. Even better: It won't stop asking until you provide a number other than zero.
307307

308-
![Fixed the divide-by-zero error](./media/csharp-console-calculator-dividebyzero.png)
308+
![Screenshot of the Visual Studio code editor showing the code for the switch statement with the check for entry of a non-zero divisor added.](./media/csharp-console-calculator-dividebyzero.png)
309309

310310
### Fix the "format" error
311311

docs/get-started/includes/ide-overview.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ Let's dive in and create a simple program.
192192

193193
Visual Studio builds the app, and a console window opens with the message **Hello World!**. You now have a running app!
194194

195-
![Console window](../media/overview-console-window.png)
195+
![Screenshot of the cmd.exe console window showing the output 'Hello Word!' and 'Press any key to continue'.](../media/overview-console-window.png)
196196

197197
1. To close the console window, press any key on your keyboard.
198198

@@ -261,7 +261,7 @@ Let's dive in and create a simple program.
261261

262262
Visual Studio builds the app, and a console window opens with the message **Hello World!**. You now have a running app!
263263

264-
![Console window](../media/vs-2019/overview-console-window.png)
264+
![Screenshot of the Microsoft Visual Studio Debug Console window showing the output 'Hello Word!' and 'Press any key to close this window'.](../media/vs-2019/overview-console-window.png)
265265

266266
1. To close the console window, press any key on your keyboard.
267267

@@ -286,7 +286,7 @@ Let's dive in and create a simple program.
286286

287287
1. Enter your name in the console window and press **Enter**.
288288

289-
![Console window](../media/vs-2019/overview-console-input.png)
289+
![Screenshot of the Microsoft Visual Studio Debug Console window showing the prompt for a name, the input, and the output 'Hello Georgette!'.](../media/vs-2019/overview-console-input.png)
290290

291291
1. Press any key to close the console window and stop the running program.
292292

@@ -360,15 +360,15 @@ First, let's rename the `name` variable:
360360

361361
10. Run the program again by pressing **Ctrl**+**F5**. The output looks something like this:
362362

363-
![Console window with program output](../media/overview-console-final.png)
363+
!Screenshot of the cmd.exe console window showing the prompt for a name, the input, and the output 'Hello Georgette! Day of year: 151'.](../media/overview-console-final.png)
364364

365365
::: moniker-end
366366

367367
::: moniker range=">=vs-2019"
368368

369369
10. Run the program again by pressing **Ctrl**+**F5**. The output looks something like this:
370370

371-
![Console window with program output](../media/vs-2019/overview-console-final.png)
371+
![Screenshot of the Microsoft Visual Studio Debug Console window showing the prompt for a name, the input, and the output 'Hello Georgette! Day of year: 43'.](../media/vs-2019/overview-console-final.png)
372372

373373
::: moniker-end
374374

docs/ide/find-and-fix-code-errors.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ For more information about using breakpoints, read [Using breakpoints](../debugg
140140

141141
When your running code hits a breakpoint and pauses, the line of code marked in yellow (the current statement) has not executed yet. At this point, you may want to execute the current statement and then inspect the changed values. You can use several *step* commands to execute code in the debugger. If the marked code is a method call, you can step into it by pressing **F11**. You can also *step over* the line of code by pressing **F10**. For additional commands and details on how to step through code, read [Navigate code with the debugger](../debugger/navigating-through-code-with-the-debugger.md).
142142

143-
![Visual Studio run-time value inspection](../ide/media/vs_ide_gs_debug_hit_breakpoint.png)
143+
![Screenshot of the Visual Studio code window. A red dot in the left gutter indicates a breakpoint at the line of code marked in yellow.](../ide/media/vs_ide_gs_debug_hit_breakpoint.png)
144144

145145
In the preceding illustration, you can advance the debugger one statement by pressing either **F10** or **F11** (since there is no method call here, both commands have the same result).
146146

147147
While the debugger is paused, you can inspect your variables and call stacks to determine what is going on. Are the values in the ranges you expect to see? Are calls being made in the right order?
148148

149-
![Visual Studio run-time value inspection](../ide/media/vs_ide_gs_debug_inspect_value.png)
149+
![Screenshot of the Visual Studio code window. At the line of code marked in yellow, a variable is selected and a dropdown shows its current value and references.](../ide/media/vs_ide_gs_debug_inspect_value.png)
150150

151151
Hover over a variable to see its current value and references. If you see a value you didn't expect, you probably have a bug in the preceding or calling code. For more in-depth debugging information, [learn more](../debugger/debugger-feature-tour.md) about using the debugger.
152152

docs/ide/quickstart-aspnet-core.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Soon after, Visual Studio opens your project file.
118118

119119
1. In the **Solution Explorer**, expand the **Pages** folder, and then choose **About.cshtml**.
120120

121-
![Choose the About.cshtml file from the Solution Explorer](../ide/media/csharp-aspnet-about-page-html-file.png)
121+
![Screenshot of Visual Studio Solution Explorer showing the files in the HelloWorld project. The Pages folder is expanded and About.cshtml is selected.](../ide/media/csharp-aspnet-about-page-html-file.png)
122122

123123
This file corresponds to a page that's named **About** in the web app, which runs in a web browser.
124124

@@ -134,7 +134,7 @@ Soon after, Visual Studio opens your project file.
134134

135135
1. In the **Solution Explorer**, expand **About.cshtml**, and then choose **About.cshtml.cs**. (This file also corresponds with the **About** page in a web browser.)
136136

137-
![Choose the About.cshtml file from the Solution Explorer](../ide/media/csharp-aspnet-about-page-code-file.png)
137+
![Screenshot of Visual Studio Solution Explorer showing the files in the HelloWorld project. About.cshtml is expanded and About.cshtml.cs is selected.](../ide/media/csharp-aspnet-about-page-code-file.png)
138138

139139
In the editor, you'll see C# code that includes text for the "application description" area of the **About** page.
140140

docs/ide/reference/introduce-local-variable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ This code generation applies to:
4141
- Press **Ctrl**+**.** to trigger the **Quick Actions and Refactorings** menu.
4242
- **Mouse**
4343
- Right-click and select the **Quick Actions and Refactorings** menu.
44-
- Click the ![screwdriver](media/screwdriver.png) icon that appears in the left margin if the text cursor is already on the line with the highlighted expression.
44+
- Click the ![Screenshot of the screwdriver icon that appears in the left margin of the Quick Actions and Refactorings menu.](media/screwdriver.png) icon that appears in the left margin if the text cursor is already on the line with the highlighted expression.
4545

4646
![Introduce local preview](media/local-preview-cs.png)
4747

docs/test/how-to-configure-unit-tests-to-target-an-earlier-version-of-the-dotnet-framework.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The following limitations apply when you re-target your test projects to use ear
5656

5757
4. Use the **Target framework (all configurations)** drop-down list to change the target framework to **.NET Framework 3.5** or a later version as shown in callout B in the following illustration. You should not specify a client version.
5858

59-
![Target framework drop&#45;down list](../test/media/howtoconfigureunitest35frameworkstepb.png)
59+
![Screenshot of the Advanced Compiler Settings dialog. The Target framework drop-down list is highlighted and the value is set to '.NET Frameowrk 3.5'.](../test/media/howtoconfigureunitest35frameworkstepb.png)
6060

6161
## Retargeting for C# unit test projects
6262

@@ -68,7 +68,7 @@ The following limitations apply when you re-target your test projects to use ear
6868

6969
3. On the **Application** tab, choose **Target framework**. From the drop-down list, choose **.NET Framework 3.5** or a later version, as shown in the following illustration. You should not specify a client version.
7070

71-
![Target framework drop&#45;down list](../test/media/howtoconfigureunittest35frameworkcsharp.png)
71+
![Illustration of the Application tab in the Solution Explorer Properties pane that highlights the location of the Target framework drop-down list.](../test/media/howtoconfigureunittest35frameworkcsharp.png)
7272

7373
## Retargeting for C++/CLI unit test projects
7474

docs/test/run-unit-tests-with-test-explorer.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ You can run all the tests in the solution, all the tests in a group, or a set of
6464

6565
- Select the individual tests that you want to run, open the right-click menu for a selected test and then choose **Run Selected Tests**.
6666

67-
- If individual tests have no dependencies that prevent them from being run in any order, turn on parallel test execution with the ![UTE&#95;parallelicon&#45;small](../test/media/ute_parallelicon-small.png) toggle button on the toolbar. This can noticeably reduce the time taken to run all the tests.
67+
- If individual tests have no dependencies that prevent them from being run in any order, turn on parallel test execution with the ![Screenshot of the Parallel test execution toggle button on the Visual Studio Test Explorer toolbar. When this button is selected, tests will run in parallel.](../test/media/ute_parallelicon-small.png) toggle button on the toolbar. This can noticeably reduce the time taken to run all the tests.
6868

6969
The **pass/fail bar** at the top of the **Test Explorer** window is animated as the tests run. At the conclusion of the test run, the **pass/fail bar** turns green if all tests passed or turns red if any test failed.
7070
::: moniker-end
@@ -144,7 +144,7 @@ Test Explorer lets you group your tests into a hierarchy. The default hierarchy
144144

145145
You can define your own levels of the hierarchy and group by **State** and then **Class** for example by selecting Group By options in your preferred order.
146146

147-
![Group by State and then Class](../test/media/vs-2019/test-explorer-groupby-state-16-2.png)
147+
![Screenshot of the Visual Studio Test Explorer showing a test hierarchy in one pane and the Group By menu in the other with the Class and State options checked.](../test/media/vs-2019/test-explorer-groupby-state-16-2.png)
148148
::: moniker-end
149149

150150
### Test Explorer groups
@@ -201,7 +201,7 @@ You can create and save a list of tests that you want to run or view as a group.
201201

202202
**To open a playlist**, choose **Test** > **Playlist** from the Visual Studio menu, and either choose from the list of recently used playlists, or choose **Open Playlist** to specify the name and location of the playlist.
203203

204-
If individual tests have no dependencies that prevent them from being run in any order, turn on parallel test execution with the ![UTE&#95;parallelicon&#45;small](../test/media/ute_parallelicon-small.png) toggle button on the toolbar. This can noticeably reduce the time taken to run all the tests.
204+
If individual tests have no dependencies that prevent them from being run in any order, turn on parallel test execution with the ![Screenshot of the Parallel test execution toggle button on the Visual Studio Test Explorer toolbar.](../test/media/ute_parallelicon-small.png) toggle button on the toolbar. This can noticeably reduce the time taken to run all the tests.
205205
::: moniker-end
206206
::: moniker range=">=vs-2019"
207207
You can create and save a list of tests that you want to run or view as a group. When you select a playlist, the tests in the list are displayed in a new Test Explorer tab. You can add a test to more than one playlist.
@@ -258,7 +258,7 @@ Use the following format for xUnit. Make sure there is a space between your `Tes
258258

259259
The [groups](#test-explorer-groups) are also available as columns in Test Explorer, along with Trait, Stack Trace, Error Message, and Fully Qualified Name. Most columns are not visible by default, and you can customize which columns you see and the order in which they appear.
260260

261-
![Group by State and then Class](../test/media/vs-2019/test-explorer-columns-16-2.png)
261+
![Screenshot of the Visual Studio Test Explorer showing a menu with Columns selected and a sub-menu with Duration, Traits, and Error Message selected.](../test/media/vs-2019/test-explorer-columns-16-2.png)
262262

263263
### Filter, sort, and rearrange test columns
264264

docs/test/unit-test-basics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ You can choose **Run All** to run all your tests, or choose **Run** to choose a
258258

259259
::: moniker range="vs-2017"
260260

261-
If individual tests have no dependencies that prevent them from being run in any order, turn on parallel test execution with the ![UTE&#95;parallelicon&#45;small](../test/media/ute_parallelicon-small.png) toggle button on the toolbar. This can noticeably reduce the time taken to run all the tests.
261+
If individual tests have no dependencies that prevent them from being run in any order, turn on parallel test execution with the ![Screenshot of the Parallel test execution toggle button on the Visual Studio Test Explorer toolbar.](../test/media/ute_parallelicon-small.png) toggle button on the toolbar. This can noticeably reduce the time taken to run all the tests.
262262

263263
::: moniker-end
264264

docs/test/use-ui-automation-to-test-your-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ If the control you want to select loses focus and disappears when you select the
211211

212212
Sometimes, when you add controls and verify their properties, you might have to use the keyboard. For example, when you try to record a Coded UI test that uses a right-click menu control, the list of menu items in the control will lose focus and disappear when you try to select the **Add Assertions** tool from the **Coded UI Test Builder**. This is demonstrated in the following illustration, where the right-click menu in Internet Explorer loses focus and disappears if you try to select it with the **Add Assertions** tool.
213213

214-
![CodedUITest&#95;SelectControlKeyboard](../test/media/codeduitest_selectcontrolkeyboard.png)
214+
![Screenshot showing the Add Assertions tool in the Coded UI Test builder overlapping the right-click menu from Internet Explorer.](../test/media/codeduitest_selectcontrolkeyboard.png)
215215

216216
To use the keyboard to select a UI control, hover over the control with the mouse. Then hold down the **Ctrl** key and the **I** key at the same time. Release the keys. The control is recorded by the **Coded UI Test Builder**.
217217

@@ -223,7 +223,7 @@ Under some circumstances, a particular control that's being used in a Coded UI t
223223

224224
When you perform your Coded UI test, hover over the control. Then press and hold **Ctrl**, while you press and hold the **Shift** and **R** keys on your keyboard. Release the keys. A mouse hover event is recorded by the **Coded UI Test Builder**.
225225

226-
![CodedUI&#95;Hover](../test/media/codedui_hover.png)
226+
![Screenshot of the Coded UI Test builder command bar with the Pause icon selected. A tool tip window shows the location of a mouse hover event.](../test/media/codedui_hover.png)
227227

228228
After you generate the test method, code similar to the following example will be added to the *UIMap.Designer.cs* file:
229229

docs/xaml-tools/xaml-code-editor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ For more information about change tracking&mdash;to include the wavy lines (also
130130

131131
When you're editing your code in the XAML code editor, there are several features that you can access by using the right-click context menu. Most of these features are available universally in the Visual Studio IDE, while some are specific to using a code editor along with a Design window.
132132

133-
![The XAML code editor's right-click context menu in Visual Studio](media/xaml-code-editor-right-click-menu.png "Screenshot of the XAML code editor's right-click context menu in Visual Studio 2019")
133+
![Screenshot of the XAML code editor's right-click context menu in Visual Studio 2019.](media/xaml-code-editor-right-click-menu.png)
134134

135135
Here's what each feature does and how it's useful:
136136

@@ -157,7 +157,7 @@ The scroll bar can do more than scroll through your code. You can also use it to
157157

158158
In the scroll bar of the code editor, there's a **Split** button at the top right. When you choose it, you can open another code editor pane. This is useful because they operate independently of each other, so you can use them to work on code in different locations.
159159

160-
![The XAML code editor, middle pane only, in Visual Studio](media/code-editor-split-window-button.png "Screenshot of the XAML code editor, middle pane only, in Visual Studio 2019")
160+
![Screenshot showing the middle pane of the XAML code editor in Visual Studio 2019 with the Split button highlighted at the top right of the pane.](media/code-editor-split-window-button.png)
161161

162162
For more information about how to split an editor window, see the [Manage editor windows](../ide/how-to-manage-editor-windows.md) page.
163163

0 commit comments

Comments
 (0)