Skip to content

Commit 1c3599c

Browse files
committed
Merged main into live
2 parents cd840bb + 0b772fa commit 1c3599c

File tree

6 files changed

+20
-11
lines changed

6 files changed

+20
-11
lines changed

docs/debugger/view-data-in-tabular-visualizer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "View data with the Tabular visualizer "
33
description: View large collection objects with built-in tabular visualizers in the Visual Studio debugger and examine data by row and column for fields and properties.
4-
ms.date: "07/30/2024"
4+
ms.date: "01/13/2025"
55
ms.topic: "conceptual"
66
dev_langs:
77
- "CSharp"

docs/ide/how-to-save-and-open-files-with-encoding.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Save and open files with encoding
33
description: Learn how to save and open files with specific encoding in Visual Studio, and ensure files open correctly in subsequent use.
4-
ms.date: 08/15/2024
4+
ms.date: 01/13/2025
55
ms.topic: how-to
66
helpviewer_keywords:
77
- Unicode, bidirectional language support
@@ -47,6 +47,14 @@ Follow these steps to save your file with encoding:
4747
> [!NOTE]
4848
> To save the project file with encoding, first unload the project. The **Save File As** option isn't enabled until you unload the project.
4949
50+
::: moniker range=">= vs-2022"
51+
## Set the default encoding
52+
53+
Starting in Visual Studio 2022 version 17.13 Preview 1, you can set the default encoding for saving files.
54+
55+
To set the default, choose **Tools** > **Options** > **Environment**, **Documents**. Next, select **Save files with the following encoding**, and then select the encoding you want as the default.
56+
::: moniker-end
57+
5058
## Open encoded file with project
5159

5260
To open an encoded file located within a project, follow these steps:

docs/javascript/tutorial-asp-net-core-with-angular.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Make sure to install the following:
5151

5252
1. Select **Create**.
5353

54-
Solution Explorer shows the following::
54+
Solution Explorer shows the following:
5555

5656
:::image type="content" source="media/vs-2022/asp-net-core-with-angular-solution-explorer.png" alt-text="Screenshot showing Solution Explorer.":::
5757

@@ -78,7 +78,7 @@ Make sure to install the following:
7878

7979
This value prevents opening the web page with the source weather data.
8080

81-
>[!NOTE]
81+
> [!NOTE]
8282
> In Visual Studio, `launch.json` stores the startup settings associated with the **Start** button in the Debug toolbar. `launch.json` must be located under the `.vscode` folder.
8383
8484
1. Right-click the solution in Solution Explorer and select **Properties**. Verify that the Startup project settings are set to **Multiple projects**, and that the Action for both projects is set to **Start**.
@@ -90,7 +90,7 @@ Press **F5** or select the **Start** button at the top of the window to start th
9090
- The ASP.NET Core API project running
9191
- The Angular CLI running the ng start command
9292

93-
>[!NOTE]
93+
> [!NOTE]
9494
> Check console output for messages. For example there might be a message to update Node.js.
9595
9696
The Angular app appears and is populated via the API (the localhost port may vary from the screenshot).
@@ -103,7 +103,7 @@ If you don't see the app, see [Troubleshooting](#troubleshooting).
103103

104104
Starting in Visual Studio 2022 version 17.3, you can publish the integrated solution using the Visual Studio Publish tool.
105105

106-
>[!NOTE]
106+
> [!NOTE]
107107
> To use publish, create your JavaScript project using Visual Studio 2022 version 17.3 or later.
108108
109109
1. In Solution Explorer, right-click the **AngularWithASP.Server** project and select **Add** > **Project Reference**.
@@ -118,7 +118,7 @@ Starting in Visual Studio 2022 version 17.3, you can publish the integrated solu
118118

119119
1. In the `.csproj` file, make sure the project reference includes a `<ReferenceOutputAssembly>` element with the value set to `false`.
120120

121-
This reference should look like the following.
121+
This reference should look like the following:
122122

123123
```xml
124124
<ProjectReference Include="..\angularwithasp.client\angularwithasp.client.esproj">
@@ -192,7 +192,7 @@ If you create the project with [Docker support](../containers/overview.md#prereq
192192
env.ASPNETCORE_URLS ? env.ASPNETCORE_URLS.split(';')[0] : 'https://localhost:7209';
193193
```
194194

195-
change `https://localhost:7209` to the matching HTTPS port (in this example, `https://localhost:62958`).
195+
Change `https://localhost:7209` to the matching HTTPS port (in this example, `https://localhost:62958`).
196196

197197
1. Restart the app.
198198

docs/profiling/cpu-insights.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Diagnose high latency with CPU Insights
33
description: Use CPU Insights to diagnose and optimize your code's performance
4-
ms.date: 09/06/2024
4+
ms.date: 01/13/2025
55
ms.topic: how-to
66
author: mikejo5000
77
ms.author: mikejo

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,12 @@ The XML configuration should be placed directly into `<RunSettings>` node:
260260
Test run parameters provide a way to define variables and values that are available to the tests at run time. Access the parameters using the MSTest <xref:Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.Properties%2A?displayProperty=nameWithType> property (or the NUnit [TestContext](https://docs.nunit.org/articles/nunit/writing-tests/TestContext.html)):
261261

262262
```csharp
263-
private string _appUrl;
264263
public TestContext TestContext { get; set; }
265264

266265
[TestMethod] // [Test] for NUnit
267266
public void HomePageTest()
268267
{
269-
string _appUrl = TestContext.Properties["webAppUrl"];
268+
string appUrl = TestContext.Properties["webAppUrl"];
270269
}
271270
```
272271

docs/version-control/git-manage-repository.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ Select the new commit to confirm that it undoes the changes of the reverted comm
142142

143143
:::image type="content" source="media/vs-2022/git-repository-revert-confirmation.png" alt-text="Screenshot of confirming a revert operation." lightbox="media/vs-2022/git-repository-revert-confirmation.png":::
144144

145+
The **Revert** menu item might be grayed out (disabled) in certain circumstances, such as for merge commits or when a Git operation is running.
146+
145147
To learn more about reverting changes, see the [Git webpage for the revert command](https://git-scm.com/docs/git-revert).
146148

147149
## Reset a branch to a previous state

0 commit comments

Comments
 (0)