Skip to content

Commit acfeafd

Browse files
Merge pull request #43154 from dotnet/main
Merge main into live
2 parents c98c07b + 25d9bfb commit acfeafd

File tree

10 files changed

+60
-11
lines changed

10 files changed

+60
-11
lines changed

.github/policies/request-review.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
eventResponderTasks:
11+
- description: Request review from diberry (non-write perms) for code analysis files.
12+
if:
13+
- payloadType: Pull_Request
14+
- isAction:
15+
action: Opened
16+
- filesMatchPattern:
17+
pattern: docs/fundamentals/code-analysis/*
18+
matchAny: true
19+
then:
20+
- requestReview:
21+
reviewer: diberry
22+
- mentionUsers:
23+
mentionees:
24+
- diberry
25+
replyTemplate: "Mentioning as a test: ${mentionees}"
26+
27+
- description: Request review from gewarren and dotnet/docs for ML files.
28+
if:
29+
- payloadType: Pull_Request
30+
- isAction:
31+
action: Opened
32+
- filesMatchPattern:
33+
pattern: docs/machine-learning/*
34+
matchAny: true
35+
then:
36+
- requestReview:
37+
reviewer: gewarren
38+
teamReviewer: dotnet/docs
39+
- mentionUsers:
40+
mentionees:
41+
- gewarren
42+
replyTemplate: "Mentioning as a test: ${mentionees}"

docs/core/whats-new/dotnet-9/runtime.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ In .NET 9, the JIT compiler *automatically* transforms the first indexing patter
175175

176176
#### Loop counter variable direction
177177

178-
The 64-bit compiler now recognizes when the direction of a loop's counter variable can be flipped without affecting the program's behavior, and then performs the transformation.
178+
The 64-bit compiler now recognizes when a loop's counter variable is used only to control the number of iterations, and transforms the loop to count down instead of up.
179179

180180
In the idiomatic `for (int i = ...)` pattern, the counter variable typically increases. Consider the following example:
181181

docs/csharp/language-reference/attributes/general.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ The `AttributeUsage` attribute determines how a custom attribute class can be us
8383
- Field
8484
- Event
8585
- Method
86-
- Param
86+
- Parameter
8787
- Property
8888
- Return
8989
- Type

docs/csharp/language-reference/compiler-options/advanced.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ When you specify [**DebugType**](code-generation.md#debugtype), the compiler cre
8686
## PathMap
8787

8888
> [!NOTE]
89-
Specifying **PathMap** will prevent breakpoints from working in local debug builds. Only set **PathMap** for production or [continuous integration builds](../../../core/project-sdk/msbuild-props.md#continuousintegrationbuild).
89+
>
90+
> Specifying **PathMap** prevents breakpoints from working in local debug builds. Only set **PathMap** for production or [continuous integration builds](../../../core/project-sdk/msbuild-props.md#continuousintegrationbuild).
9091
9192
The **PathMap** compiler option specifies how to map physical paths to source path names output by the compiler. This option maps each physical path on the machine where the compiler runs to a corresponding path that should be written in the output files. In the following example, `path1` is the full path to the source files in the current environment, and `sourcePath1` is the source path substituted for `path1` in any output files. To specify multiple mapped source paths, separate each with a comma.
9293

docs/csharp/language-reference/keywords/access-modifiers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Access modifiers are keywords used to specify the declared accessibility of a me
2727

2828
This section also introduces the following concepts:
2929

30-
- [Accessibility Levels](./accessibility-levels.md): Using the four access modifiers to declare six levels of accessibility.
30+
- [Accessibility Levels](./accessibility-levels.md): Using the access modifiers to declare levels of accessibility.
3131
- [Accessibility Domain](./accessibility-domain.md): Specifies where, in the program sections, a member can be referenced.
3232
- [Restrictions on Using Accessibility Levels](./restrictions-on-using-accessibility-levels.md): A summary of the restrictions on using declared accessibility levels.
3333

docs/framework/wcf/diagnostics/tracing/propagation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This topic describes activity propagation in the Windows Communication Foundatio
4949
</a:Action>
5050
<a:MessageID>urn:uuid:f0091eae-d339-4c7e-9408-ece34602f1ce
5151
</a:MessageID>
52-
<ActivityId CorrelationId="f94c6af1-7d5d-4295-b693-4670a8a0ce34"
52+
<ActivityId CorrelationId="aaaa0000-bb11-2222-33cc-444444dddddd"
5353
xmlns="http://schemas.microsoft.com/2004/09/ServiceModel/Diagnostics">
5454
17f59a29-b435-4a15-bf7b-642ffc40eac8
5555
</ActivityId>

docs/framework/wcf/diagnostics/tracing/using-service-trace-viewer-for-viewing-correlated-traces-and-troubleshooting.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ If you examine the "Sent a message over a channel" trace, you may see the follow
6666
<Level>8</Level>
6767
<TimeCreated SystemTime="2006-08-04T18:45:30.8491051Z" />
6868
<Source Name="System.ServiceModel" />
69-
<Correlation ActivityID="{27c6331d-8998-43aa-a382-03239013a6bd}"/>
69+
<Correlation ActivityID="{bbbb1111-cc22-3333-44dd-555555eeeeee}"/>
7070
<Execution ProcessName="client" ProcessID="1808" ThreadID="1" />
7171
<Channel />
7272
<Computer>TEST1</Computer>
@@ -87,7 +87,7 @@ If you examine the "Sent a message over a channel" trace, you may see the follow
8787
<MessageHeaders>
8888
<Action d4p1:mustUnderstand="1" xmlns:d4p1="http://www.w3.org/2003/05/soap-envelope" xmlns="http://www.w3.org/2005/08/addressing">http://Microsoft.ServiceModel.Samples/ICalculator/Multiply</Action>
8989
<MessageID xmlns="http://www.w3.org/2005/08/addressing">urn:uuid:7c6670d8-4c9c-496e-b6a0-2ceb6db35338</MessageID>
90-
<ActivityId CorrelationId="b02e2189-0816-4387-980c-dd8e306440f5" xmlns="http://schemas.microsoft.com/2004/09/ServiceModel/Diagnostics">27c6331d-8998-43aa-a382-03239013a6bd</ActivityId>
90+
<ActivityId CorrelationId="aaaa0000-bb11-2222-33cc-444444dddddd" xmlns="http://schemas.microsoft.com/2004/09/ServiceModel/Diagnostics">bbbb1111-cc22-3333-44dd-555555eeeeee</ActivityId>
9191
<ReplyTo xmlns="http://www.w3.org/2005/08/addressing">
9292
<Address>http://www.w3.org/2005/08/addressing/anonymous</Address>
9393
</ReplyTo>

docs/framework/wcf/feature-details/how-to-configure-a-port-with-an-ssl-certificate.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ When creating a self-hosted Windows Communication Foundation (WCF) service with
6363
2. In Windows Vista, use the Netsh.exe tool, as shown in the following example.
6464
6565
```console
66-
netsh http add sslcert ipport=0.0.0.0:8000 certhash=0000000000003ed9cd0c315bbb6dc1c08da5e6 appid={00112233-4455-6677-8899-AABBCCDDEEFF}
66+
netsh http add sslcert ipport=0.0.0.0:8000 certhash=0000000000003ed9cd0c315bbb6dc1c08da5e6 appid={00001111-aaaa-2222-bbbb-3333cccc4444}
6767
```
6868
6969
- The **certhash** parameter specifies the thumbprint of the certificate.
@@ -85,7 +85,7 @@ When creating a self-hosted Windows Communication Foundation (WCF) service with
8585
2. In Windows Vista, to support clients that authenticate with X.509 certificates at the transport layer, follow the preceding procedure, but with an additional parameter, as shown in the following example.
8686
8787
```console
88-
netsh http add sslcert ipport=0.0.0.0:8000 certhash=0000000000003ed9cd0c315bbb6dc1c08da5e6 appid={00112233-4455-6677-8899-AABBCCDDEEFF} clientcertnegotiation=enable
88+
netsh http add sslcert ipport=0.0.0.0:8000 certhash=0000000000003ed9cd0c315bbb6dc1c08da5e6 appid={00001111-aaaa-2222-bbbb-3333cccc4444} clientcertnegotiation=enable
8989
```
9090
9191
## Delete an SSL certificate from a port number

docs/fundamentals/code-analysis/quality-rules/ca5374.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Instantiating an <xref:System.Xml.Xsl.XslTransform?displayProperty=nameWithType>
3030

3131
## How to fix violations
3232

33-
Replace <xref:System.Xml.Xsl.XslTransform> with <xref:System.Xml.Xsl.XslCompiledTransform?displayProperty=nameWithType>. For more guidance, see [/dotnet/standard/data/xml/migrating-from-the-xsltransform-class].
33+
Replace <xref:System.Xml.Xsl.XslTransform> with <xref:System.Xml.Xsl.XslCompiledTransform?displayProperty=nameWithType>. For more guidance, see [Migrating from the XslTransform class](../../../standard/data/xml/migrating-from-the-xsltransform-class.md).
3434

3535
## When to suppress warnings
3636

docs/fundamentals/syslib-diagnostics/syslib0014.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,19 @@ The following APIs are marked as obsolete, starting in .NET 6. Using them in cod
1414
- <xref:System.Net.WebRequest.CreateHttp%2A?displayProperty=fullName>
1515
- <xref:System.Net.WebRequest.CreateDefault(System.Uri)?displayProperty=fullName>
1616
- <xref:System.Net.HttpWebRequest.%23ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)>
17-
- <xref:System.Net.ServicePointManager.FindServicePoint%2A?displayProperty=fullName>
17+
- <xref:System.Net.ServicePointManager>
1818
- <xref:System.Net.WebClient.%23ctor>
1919

20+
To reduce the number of analyzer warnings, the <xref:System.Net.ServicePoint> class is not marked as obsolete, but all ways of obtaining its instances are.
21+
22+
Settings on <xref:System.Net.ServicePointManager> and <xref:System.Net.ServicePoint> no longer affect <xref:System.Net.Security.SslStream> or <xref:System.Net.Http.HttpClient>.
23+
2024
## Workarounds
2125

2226
Use <xref:System.Net.Http.HttpClient> instead.
2327

28+
See the [HttpWebRequest to HttpClient migration guide](https://learn.microsoft.com/dotnet/fundamentals/networking/http/httpclient-migrate-from-httpwebrequest) for more info.
29+
2430
## Suppress a warning
2531

2632
If you must use the obsolete APIs, you can suppress the warning in code or in your project file.

0 commit comments

Comments
 (0)