Skip to content

Commit 07bcc83

Browse files
Merge pull request #46053 from dotnet/main
Merge main into live
2 parents 95f34f4 + f80a1f4 commit 07bcc83

35 files changed

+232
-149
lines changed

docs/ai/microsoft-extensions-ai.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,8 @@ For more samples, see the [dotnet/ai-samples](https://aka.ms/meai-samples) GitHu
259259

260260
## See also
261261

262+
- [Request a response with structured output](./quickstarts/structured-output.md)
262263
- [Build an AI chat app with .NET](./quickstarts/build-chat-app.md)
263-
- [.NET dependency injection](../core/extensions/dependency-injection.md)
264-
- [Rate limit an HTTP handler in .NET](../core/extensions/http-ratelimiter.md)
264+
- [Dependency injection in .NET](../core/extensions/dependency-injection.md)
265265
- [Caching in .NET](../core/extensions/caching.md)
266+
- [Rate limit an HTTP handler in .NET](../core/extensions/http-ratelimiter.md)

docs/azure/includes/dotnet-all.md

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

docs/azure/includes/dotnet-new.md

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

docs/azure/sdk/snippets/unit-testing/UnitTestingSampleApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Azure.Core" Version="1.45.0" />
13+
<PackageReference Include="Azure.Core" Version="1.46.0" />
1414
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1616
<PackageReference Include="Moq" Version="[4.20.72]" /> <!-- Context: https://github.com/Azure/azure-sdk-for-net/issues/38111 -->

docs/csharp/index.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,17 +226,13 @@ additionalContent:
226226
- title: Mobile and Desktop
227227
links:
228228
- url: /dotnet/desktop/wpf/
229-
text: Windows Presentation Foundation (.NET 5+)
229+
text: Windows Presentation Foundation
230230
- url: /dotnet/desktop/winforms/
231-
text: Windows Forms (.NET 5+)
231+
text: Windows Forms
232232
- url: /dotnet/maui
233233
text: .NET Multi-platform App UI (.NET MAUI)
234234
- url: /azure/developer/mobile-apps
235235
text: Develop mobile apps with Azure
236-
- url: /dotnet/desktop/wpf/?view=netframeworkdesktop-4.8&preserve-view=true
237-
text: Windows Presentation Foundation (.NET Framework)
238-
- url: /dotnet/desktop/winforms/?view=netframeworkdesktop-4.8&preserve-view=true
239-
text: Windows Forms (.NET Framework)
240236
# Card
241237
- title: Microservices
242238
links:

docs/csharp/misc/cs0136.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,28 @@ namespace MyNamespace
3434
}
3535
}
3636
}
37-
```
37+
```
38+
39+
The compiler reports this error regardless of the textual order of the variable declarations, as shown in the following example:
40+
41+
```csharp
42+
// CS0136.cs
43+
namespace MyNamespace
44+
{
45+
public class MyClass
46+
{
47+
public static void Main()
48+
{
49+
if (true)
50+
{
51+
int i = 1; // CS0136, hides i outside this block
52+
}
53+
int i = 0;
54+
i++;
55+
}
56+
}
57+
}
58+
```
3859

3960
From the [C# Language Specification](~/_csharpstandard/standard/basic-concepts.md#73-declarations):
4061

docs/csharp/whats-new/csharp-14.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ Only the implementing declaration of a partial constructor can include a constru
136136

137137
The implementing declaration of a partial event must include `add` and `remove` accessors. The defining declaration declares a field-like event.
138138

139-
## Null conditional assignment
139+
## Null-conditional assignment
140140

141-
The null conditional member access operators, `?.` and ``?[]`, can now be used on the left hand side of an assignment or compound assignment.
141+
The null-conditional member access operators, `?.` and `?[]`, can now be used on the left hand side of an assignment or compound assignment.
142142

143143
Before C# 14, you needed to null-check a variable before assigning to a property:
144144

@@ -157,9 +157,9 @@ customer?.Order = GetCurrentOrder();
157157

158158
The right side of the `=` operator is evaluated only when the left side isn't null. If `customer` is null, the code doesn't call `GetCurrentOrder`.
159159

160-
In addition to assignment, you can use null conditional member access operators with compound assignment operators (`+=`, `-=`, and others). However, increment and decrement, `++` and `--`, aren't allowed.
160+
In addition to assignment, you can use null-conditional member access operators with compound assignment operators (`+=`, `-=`, and others). However, increment and decrement, `++` and `--`, aren't allowed.
161161

162-
You can learn more in the language reference article on the [conditional member access](../language-reference/operators/member-access-operators.md#null-conditional-operators--and-) and the feature specification for [null conditional assignment](~/_csharplang/proposals/null-conditional-assignment.md)
162+
You can learn more in the language reference article on the [conditional member access](../language-reference/operators/member-access-operators.md#null-conditional-operators--and-) and the feature specification for [null-conditional assignment](~/_csharplang/proposals/null-conditional-assignment.md).
163163

164164
## See also
165165

docs/framework/index.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,22 +96,22 @@ landingContent:
9696
links:
9797
- text: Desktop guide introduction
9898
url: /dotnet/desktop/
99-
- text: .NET Framework WPF
100-
url: /dotnet/desktop/wpf/?view=netframeworkdesktop-4.8
101-
- text: .NET Framework Windows Forms
102-
url: /dotnet/desktop/winforms/?view=netframeworkdesktop-4.8
99+
- text: WPF
100+
url: /dotnet/desktop/wpf/
101+
- text: Windows Forms
102+
url: /dotnet/desktop/winforms/
103103

104104
# Card
105105
- title: Create WPF apps
106106
linkLists:
107107
- linkListType: overview
108108
links:
109109
- text: Overview of WPF
110-
url: /dotnet/desktop/wpf/?view=netframeworkdesktop-4.8
110+
url: /dotnet/desktop/wpf/
111111
- linkListType: tutorial
112112
links:
113113
- text: Create your first WPF app in Visual Studio
114-
url: /dotnet/desktop/wpf/getting-started/walkthrough-my-first-wpf-desktop-application/?view=netframeworkdesktop-4.8
114+
url: /dotnet/desktop/wpf/getting-started/walkthrough-my-first-wpf-desktop-application/
115115

116116
# Card
117117
- title: Work with data using ADO.NET

docs/framework/toc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ items:
1616
- name: Overview
1717
href: install/index.md
1818
- name: Install on Windows and Windows Server
19-
href: install/on-windows-and-server.md
19+
href: install/on-windows-and-server.md
2020
- name: For developers
2121
href: install/guide-for-developers.md
2222
- name: Versions and dependencies
@@ -128,9 +128,9 @@ items:
128128
- name: Overview
129129
href: develop-client-apps.md
130130
- name: Windows Presentation Foundation
131-
href: /dotnet/desktop/wpf/?view=netframeworkdesktop-4.8&preserve-view=true
131+
href: /dotnet/desktop/wpf/
132132
- name: Windows Forms
133-
href: /dotnet/desktop/winforms/?view=netframeworkdesktop-4.8&preserve-view=true
133+
href: /dotnet/desktop/winforms/
134134
- name: Service-oriented apps with WCF
135135
href: wcf/
136136
- name: Windows Workflow Foundation

docs/index.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,9 @@ additionalContent:
274274
- url: /uwp
275275
text: Universal Windows apps
276276
- url: /dotnet/desktop/wpf/
277-
text: Windows Presentation Foundation (.NET 5+)
278-
- url: /dotnet/desktop/wpf/?view=netframeworkdesktop-4.8&preserve-view=true
279-
text: Windows Presentation Foundation (.NET Framework)
277+
text: Windows Presentation Foundation
280278
- url: /dotnet/desktop/winforms/
281-
text: Windows Forms (.NET 5+)
282-
- url: /dotnet/desktop/winforms/?view=netframeworkdesktop-4.8&preserve-view=true
283-
text: Windows Forms (.NET Framework)
279+
text: Windows Forms
284280
- url: /dotnet/maui
285281
text: .NET Multi-platform App UI (.NET MAUI)
286282
# Card

0 commit comments

Comments
 (0)