Skip to content

Commit 66522d5

Browse files
Merge pull request #48212 from dotnet/main
Merge main into live
2 parents 33c0b1e + d0fbfd6 commit 66522d5

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed
-118 KB
Binary file not shown.

docs/ai/quickstarts/structured-output.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,12 @@ Complete the following steps to create a console app that connects to the `gpt-4
9393

9494
1. And instead of requesting just the analyzed enumeration value, you can request the text response along with the analyzed value.
9595

96-
Define a record type to contain the text response and analyzed sentiment:
96+
Define a [record type](../../csharp/language-reference/builtin-types/record.md) to contain the text response and analyzed sentiment:
9797

9898
:::code language="csharp" source="./snippets/structured-output/Program.cs" id="InputOutputRecord":::
9999

100+
(This record type is defined using [primary constructor](../../csharp/programming-guide/classes-and-structs/instance-constructors.md#primary-constructors) syntax. Primary constructors combine the type definition with the parameters necessary to instantiate any instance of the class. The C# compiler generates public properties for the primary constructor parameters.)
101+
100102
Send the request using the record type as the type argument to `GetResponseAsync<T>`:
101103

102104
:::code language="csharp" source="./snippets/structured-output/Program.cs" id="RecordRequest":::

docs/core/compatibility/aspnet-core/8.0/forwarded-headers-unknown-proxies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ If you wish to enable the previous behavior, which isn't recommended due to secu
5757

5858
You can also set the `ASPNETCORE_FORWARDEDHEADERS_ENABLED` environment variable to `true`, which clears the lists and enables `ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto`.
5959

60-
For applications that target .NET 9 or earlier, you can set the `Microsoft.AspNetCore.HttpOverrides.IgnoreUnknownProxiesWithoutFor` [AppContext](/dotnet/fundamentals/runtime-libraries/system-appcontext) switch to `"true"` or `1` to get back to the previous behavior. Alternatively, set the `MICROSOFT_ASPNETCORE_HTTPOVERRIDES_IGNORE_UNKNOWN_PROXIES_WITHOUT_FOR` environment variable.
60+
For applications that target .NET 9 or earlier, you can set the `Microsoft.AspNetCore.HttpOverrides.IgnoreUnknownProxiesWithoutFor` [AppContext](../../../../fundamentals/runtime-libraries/system-appcontext.md) switch to `"true"` or `1` to get back to the previous behavior. Alternatively, set the `MICROSOFT_ASPNETCORE_HTTPOVERRIDES_IGNORE_UNKNOWN_PROXIES_WITHOUT_FOR` environment variable.
6161

6262
> [!NOTE]
6363
> In cloud environments, the proxy IPs can change over the lifetime of the app, and `ASPNETCORE_FORWARDEDHEADERS_ENABLED` is sometimes used to make forwarded headers work.

docs/core/compatibility/sdk/8.0/custombuildeventargs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This change is a [behavioral change](../../categories.md#behavioral-change).
2929

3030
## Reason for change
3131

32-
<xref:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter> serialization is obsolete in .NET 8 and later versions. Any use of <xref:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter> is deamed unsecure and throws an exception at run time. Since MSBuild custom derived build events use <xref:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter>, your build would crash if you use these events in your build. The new build error provides a more graceful failure.
32+
<xref:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter> serialization is obsolete in .NET 8 and later versions. Any use of <xref:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter> is deemed insecure and throws an exception at run time. Since MSBuild custom derived build events use <xref:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter>, your build would crash if you used these events in your build. The new build error provides a more graceful failure.
3333

3434
## Recommended action
3535

docs/core/deploying/includes/cli-r-rid-optional.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

docs/core/testing/mstest-analyzers/mstest0045.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class TestClass1
5858
}
5959
```
6060

61-
Alternatively, you can configure cooperative cancellation globally in your [runsettings](/dotnet/core/testing/unit-testing-mstest-configure#mstest-element) or [testconfig.json](/dotnet/core/testing/unit-testing-mstest-configure#timeout-settings) file to apply this setting to all timeout attributes in your test project.
61+
Alternatively, you can configure cooperative cancellation globally in your [runsettings](../unit-testing-mstest-configure.md#mstest-element) or [testconfig.json](../unit-testing-mstest-configure.md#timeout-settings) file to apply this setting to all timeout attributes in your test project.
6262

6363
## When to suppress warnings
6464

docs/csharp/misc/cs1702.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ ms.assetid: 106b9994-c762-44b9-942e-5417cf3dbbab
1212

1313
Assuming assembly reference "Assembly Name #1" matches "Assembly Name #2", you may need to supply runtime policy
1414

15-
The two assembly references have differing build and/or revision numbers, so will not automatically unify. You may need to supply run-time policy to force unification by `using` directives in the application .config file.
15+
The two assembly references have differing build and/or revision numbers, so will not automatically unify. You may need to supply run-time policy to force unification by `using` directives in the application [.config file](../../framework/configure-apps/index.md#application-configuration-files).
16+
17+
## See also
18+
19+
- [Configuration File Schema](../../framework/configure-apps/file-schema/application-settings-schema.md)
-13.5 KB
Binary file not shown.

includes/net-46-native-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

includes/net-current-v451plus-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)