Skip to content

Commit 56410ec

Browse files
Merge pull request #10452 from MicrosoftDocs/main638652422875908830sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents a7b4a27 + 7b3f2be commit 56410ec

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

docs/debugger/using-the-debuggerdisplay-attribute.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.subservice: debug-diagnostics
1414
---
1515
# Tell the debugger what to show using the DebuggerDisplay Attribute (C#, Visual Basic, F#, C++/CLI)
1616

17-
The <xref:System.Diagnostics.DebuggerDisplayAttribute> controls how an object, property, or field is displayed in the debugger variable windows. This attribute can be applied to types (classes, structs, enums, delegates). If applied to a base type, the attribute also applies to a subclass.
17+
The <xref:System.Diagnostics.DebuggerDisplayAttribute> controls how an object, property, or field is displayed in the debugger variable windows. This attribute can be applied to types (classes, structs, enums, delegates), but is typically applied only to classes and structs. If applied to a base type, the attribute also applies to a subclass.
1818

1919
The `DebuggerDisplay` attribute has a single argument, which is a string to be displayed in the value column for instances of the type. This string can contain braces (`{` and `}`). Text within a pair of braces is evaluated as a field, property or method.
2020

docs/deployment/how-to-configure-the-clickonce-trust-prompt-behavior.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ You can configure the ClickOnce trust prompt to control whether end users are gi
2727
|Option|Registry setting value|Description|
2828
|------------|----------------------------|-----------------|
2929
|Enable the trust prompt.|`Enabled`|The ClickOnce trust prompt is displayed so that end users can grant trust to ClickOnce applications.|
30-
|Restrict the trust prompt.|`AuthenticodeRequired`|The ClickOnce trust prompt is only displayed if ClickOnce applications are signed with a certificate that identifies the publisher.|
31-
|Disable the trust prompt.|`Disabled`|The ClickOnce trust prompt is not displayed for any ClickOnce applications that are not signed with an explicitly trusted certificate.|
30+
|Restrict the trust prompt.|`AuthenticodeRequired`|The ClickOnce trust prompt is only displayed if ClickOnce applications are signed with a certificate that identifies the publisher. Otherwise, the ClickOnce application won't be installed.|
31+
|Disable the trust prompt.|`Disabled`|The ClickOnce trust prompt isn't displayed. Only ClickOnce applications that are signed with an explicitly trusted certificate will be installed.|
3232

3333
The following table shows the default behavior for each zone. The Applications column refers to Windows Forms applications, Windows Presentation Foundation applications, WPF browser applications, and console applications.
3434

@@ -57,9 +57,9 @@ You can configure the ClickOnce trust prompt to control whether end users are gi
5757

5858
**\HKEY_LOCAL_MACHINE\SOFTWARE\MICROSOFT\\.NETFramework\Security\TrustManager\PromptingLevel**
5959

60-
If the key does not exist, create it.
60+
If the key doesn't exist, create it.
6161

62-
3. Add the following subkeys as **String Value**, if they do not already exist, with the associated values shown in the following table.
62+
3. Add the following subkeys as **String Value**, if they don't already exist, with the associated values shown in the following table.
6363

6464
|String Value subkey|Value|
6565
|-------------------------|-----------|
@@ -119,9 +119,9 @@ You can configure the ClickOnce trust prompt to control whether end users are gi
119119

120120
**\HKEY_LOCAL_MACHINE\SOFTWARE\MICROSOFT\\.NETFramework\Security\TrustManager\PromptingLevel**
121121

122-
If the key does not exist, create it.
122+
If the key doesn't exist, create it.
123123

124-
3. Add the following subkeys as **String Value**, if they do not already exist, with the associated values shown in the following table.
124+
3. Add the following subkeys as **String Value**, if they don't already exist, with the associated values shown in the following table.
125125

126126
|String Value subkey|Value|
127127
|-------------------------|-----------|
@@ -165,7 +165,7 @@ You can configure the ClickOnce trust prompt to control whether end users are gi
165165
3. Build and run the application.
166166

167167
## Disable the ClickOnce trust prompt
168-
You can disable the trust prompt so that end users are not given the option to install solutions that are not already trusted in their security policy.
168+
You can disable the trust prompt so that end users aren't given the option to install solutions that aren't already trusted in their security policy.
169169

170170
#### To disable the ClickOnce trust prompt by using the registry editor
171171

@@ -179,9 +179,9 @@ You can configure the ClickOnce trust prompt to control whether end users are gi
179179

180180
**\HKEY_LOCAL_MACHINE\SOFTWARE\MICROSOFT\\.NETFramework\Security\TrustManager\PromptingLevel**
181181

182-
If the key does not exist, create it.
182+
If the key doesn't exist, create it.
183183

184-
3. Add the following subkeys as **String Value**, if they do not already exist, with the associated values shown in the following table.
184+
3. Add the following subkeys as **String Value**, if they don't already exist, with the associated values shown in the following table.
185185

186186
|String Value subkey|Value|
187187
|-------------------------|-----------|

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Tutorial 2: Extend your C# console app"
33
description: Extend a C# console application in Visual Studio, including debugging features, managing multiple projects, and referencing third-party packages.
44
ms.custom: vs-acquisition
5-
ms.date: 09/05/2024
5+
ms.date: 10/18/2024
66
ms.subservice: general-ide
77
ms.topic: tutorial
88
ms.devlang: csharp
@@ -232,14 +232,10 @@ In Visual Studio, you use the menu command **File** > **Add** > **New Project**
232232
using CalculatorLibrary;
233233
```
234234

235-
Adding the `using` directive should let you remove the `CalculatorLibrary` namespace from the call site, but now there's an ambiguity. Is `Calculator` the class in `CalculatorLibrary`, or is `Calculator` the namespace?
236-
237-
To resolve the ambiguity, rename the namespace from `Calculator` to `CalculatorProgram` in *Program.cs*.
235+
Adding the `using` directive should let you remove the `CalculatorLibrary` namespace from the call site.
238236

239-
```csharp
240-
// Program.cs
241-
namespace CalculatorProgram
242-
```
237+
If your `Program.cs` code is in the `Calculator` namespace, rename the namespace from `Calculator` to `CalculatorProgram` to remove ambiguity between class name and namespace name.
238+
243239
::: moniker-end
244240

245241
## Reference .NET libraries: Write to a log

0 commit comments

Comments
 (0)