Skip to content

Commit bca3d2f

Browse files
dotnet-policy-service[bot]dotnet-policy-service[bot]
authored
Merge pull request #43959 from dotnet/main
Merge main into live
2 parents 689eac7 + 170e64a commit bca3d2f

File tree

12 files changed

+265
-259
lines changed

12 files changed

+265
-259
lines changed

‎docs/azure/includes/dotnet-all.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,8 @@
575575
| Hyak Common - Tracing Etw | NuGet [1.0.2](https://www.nuget.org/packages/Hyak.Common.Tracing.Etw/1.0.2) | | |
576576
| Hyak Common - Tracing Log4Net | NuGet [1.0.2](https://www.nuget.org/packages/Hyak.Common.Tracing.Log4Net/1.0.2) | | |
577577
| Microsoft.Azure.SignalR.Emulator | NuGet [1.6.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Emulator/1.6.0)<br>NuGet [1.0.0-preview1-10809](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Emulator/1.0.0-preview1-10809) | | |
578-
| MSBuild | NuGet [0.31.0](https://www.nuget.org/packages/Microsoft.TypeSpec.MSBuild/0.31.0) | | |
579-
| ProviderHub Controller | NuGet [0.17.0](https://www.nuget.org/packages/Microsoft.TypeSpec.ProviderHub.Controller/0.17.0) | | |
580-
| ProviderHub Templates | NuGet [1.9.0](https://www.nuget.org/packages/Microsoft.TypeSpec.ProviderHub.Templates/1.9.0) | | |
578+
| MSBuild | NuGet [0.32.0](https://www.nuget.org/packages/Microsoft.TypeSpec.MSBuild/0.32.0) | | |
579+
| ProviderHub Controller | NuGet [0.18.0](https://www.nuget.org/packages/Microsoft.TypeSpec.ProviderHub.Controller/0.18.0) | | |
580+
| ProviderHub Templates | NuGet [1.10.0](https://www.nuget.org/packages/Microsoft.TypeSpec.ProviderHub.Templates/1.10.0) | | |
581581
| Template | NuGet [1.0.2-preview1](https://www.nuget.org/packages/Microsoft.Azure.Template/1.0.2-preview1) | | |
582582
| Test HttpRecorder | NuGet [1.13.3](https://www.nuget.org/packages/Microsoft.Azure.Test.HttpRecorder/1.13.3) | | GitHub [1.13.3](https://github.com/Azure/azure-sdk-for-net/tree/mgmt-legacy/sdk/mgmtcommon/TestFramework/Microsoft.Azure.Test.HttpRecorder) |

‎docs/csharp/language-reference/compiler-options/errors-warnings.md‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,19 @@ helpviewer_keywords:
1616
---
1717
# C# Compiler Options to report errors and warnings
1818

19-
The following options control how the compiler reports errors and warnings. The new MSBuild syntax is shown in **Bold**. The older *csc.exe* syntax is shown in `code style`.
20-
21-
- **WarningLevel** / `-warn`: Set warning level.
22-
- **AnalysisLevel**: Set optional warning level.
23-
- **TreatWarningsAsErrors** / `-warnaserror`: Treat all warnings as errors
24-
- **WarningsAsErrors** / `-warnaserror`: Treat one or more warnings as errors
25-
- **WarningsNotAsErrors** / `-warnnotaserror`: Treat one or more warnings not as errors
26-
- **NoWarn** / `-nowarn`: Set a list of disabled warnings.
27-
- **CodeAnalysisRuleSet** / `-ruleset`: Specify a ruleset file that disables specific diagnostics.
28-
- **ErrorLog** / `-errorlog`: Specify a file to log all compiler and analyzer diagnostics.
29-
- **ReportAnalyzer** / `-reportanalyzer`: Report additional analyzer information, such as execution time.
19+
The following options control how the compiler reports errors and warnings.
20+
21+
| MSBuild syntax | _csc.exe_ syntax | Description |
22+
| ----------------------- | ----------------- | ------------------------------------------------------------------------------------------------- |
23+
| `WarningLevel` | `-warn` | Set warning level. [More info.](#warninglevel) |
24+
| `AnalysisLevel` | / | Set optional warning level. [More info.](#analysis-level) |
25+
| `TreatWarningsAsErrors` | `-warnaserror` | Treat all warnings as errors. [More info.](#treatwarningsaserrors) |
26+
| `WarningsAsErrors` | `-warnaserror` | Treat one or more warnings as errors. [More info.](#warningsaserrors-and-warningsnotaserrors) |
27+
| `WarningsNotAsErrors` | `-warnnotaserror` | Treat one or more warnings not as errors. [More info.](#warningsaserrors-and-warningsnotaserrors) |
28+
| `NoWarn` | `-nowarn` | Set a list of disabled warnings. [More info.](#nowarn) |
29+
| `CodeAnalysisRuleSet` | `-ruleset` | Specify a ruleset file that disables specific diagnostics. [More info.](#codeanalysisruleset) |
30+
| `ErrorLog` | `-errorlog` | Specify a file to log all compiler and analyzer diagnostics. [More info.](#errorlog) |
31+
| `ReportAnalyzer` | `-reportanalyzer` | Report additional analyzer information, such as execution time. [More info.](#reportanalyzer) |
3032

3133
> [!NOTE]
3234
> Refer to [Compiler options](index.md#how-to-set-options) for more information on configuring these options for your project.

‎docs/framework/get-started/system-requirements.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ On 64-bit operating systems, .NET Framework supports both WOW64 (32-bit processi
5353

5454
| Operating system | Compatible editions | Preinstalled with the OS | Installable separately |
5555
|----------------------------------------------------|---------------------|--------------------------|------------------------|
56-
| Windows 11, 2023 Update<br/>(version 23H2) | 64-bit | .NET Framework 4.8.1 | -- |
57-
| Windows 11, 2022 Update<br/>(version 22H2) | 64-bit | .NET Framework 4.8.1 | -- |
56+
| Windows 11, Update<br/>(version 24H2) and newer | 64-bit | .NET Framework 4.8.1 | -- |
57+
| Windows 11, Update<br/>(version 23H2) | 64-bit | .NET Framework 4.8.1 | -- |
58+
| Windows 11, Update<br/>(version 22H2) | 64-bit | .NET Framework 4.8.1 | -- |
5859
| Windows 11 | 64-bit | .NET Framework 4.8 | .NET Framework 4.8.1 |
5960
| Windows 10 2022 Update<br/>(version 22H2) | 32-bit and 64-bit | .NET Framework 4.8 | .NET Framework 4.8.1 |
6061
| Windows 10 November 2021 Update<br/>(version 21H2) | 32-bit and 64-bit | .NET Framework 4.8 | .NET Framework 4.8.1 |
@@ -79,6 +80,7 @@ On 64-bit operating systems, .NET Framework supports both WOW64 (32-bit processi
7980

8081
| Operating system | Compatible editions | Preinstalled with the OS | Installable separately |
8182
|-------------------------------|---------------------|--------------------------|------------------------|
83+
| Windows Server 2025 and newer | 64-bit | .NET Framework 4.8.1 | -- |
8284
| Windows Server 2022 | 64-bit | .NET Framework 4.8 | .NET Framework 4.8.1 |
8385
| Windows Server 2019† | 64-bit | .NET Framework 4.7.2 | .NET Framework 4.8 |
8486
| Windows Server, version 1809† | 64-bit | .NET Framework 4.7.2 | .NET Framework 4.8 |

‎docs/framework/install/on-server-2025.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
title: Install .NET Framework on Windows Server 2025
3+
description: Learn how to install .NET Framework on Windows Server 2025.
4+
ms.date: 12/05/2024
5+
---
6+
7+
# Install .NET Framework on Windows Server 2025
8+
9+
.NET Framework 4.8.1 is included with Server 2025, and runs any .NET Framework 4.x app.
10+
11+
## .NET Framework 4.8.1
12+
13+
.NET 4.8.1 is supported on Windows Server 2025 and newer operating systems.
14+
15+
## .NET Framework 3.5
16+
17+
[!INCLUDE [server-35](includes/server-35.md)]
18+
19+
## See also
20+
21+
- [.NET Downloads](https://dotnet.microsoft.com/download)
22+
- [Troubleshoot blocked .NET Framework installations and uninstallations](troubleshoot-blocked-installations-and-uninstallations.md)
23+
- [Install .NET Framework for developers](guide-for-developers.md)
24+
- [Determine which .NET Framework versions are installed](../migration-guide/how-to-determine-which-versions-are-installed.md)

‎docs/framework/install/on-windows-11.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ ms.date: 10/06/2021
77

88
.NET Framework 4.8 is included with Windows 11, and runs any .NET Framework 4.x app.
99

10-
## .NET Framework 3.5
10+
## .NET Framework 4.8.1
11+
12+
.NET 4.8.1 is supported on Windows 11, version 22H2 and newer operating systems.
1113

12-
Follow the instructions to install [.NET Framework 3.5 on Windows 11](dotnet-35-windows.md).
14+
## .NET Framework 3.5
1315

14-
.NET Framework 3.5 supports apps built for .NET Framework 2.0 through 3.5.
16+
[!INCLUDE [server-35](includes/server-35.md)]
1517

1618
## See also
1719

‎docs/framework/migration-guide/how-to-determine-which-versions-are-installed.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ ForEach-Object {
266266
$parentName = $_.PSChildName
267267
Get-ChildItem -LiteralPath $_.PSPath |
268268
Where-Object {
269-
if ($_.Property -contains 'Version') { $name = Get-ItemPropertyValue -Path $_.PSPath -Name Version }
270-
if ($name -and ($_.Property -contains 'SP')) { $sp = Get-ItemPropertyValue -Path $_.PSPath -Name SP }
271-
if ($_.Property -contains 'Install') { $install = Get-ItemPropertyValue -Path $_.PSPath -Name Install }
269+
if ($_.Property -contains 'Version') { $name = $((Get-ItemProperty -Path "Registry::$_").Version) }
270+
if ($name -and ($_.Property -contains 'SP')) { $sp = $((Get-ItemProperty -Path "Registry::$_").SP) }
271+
if ($_.Property -contains 'Install') { $install = $((Get-ItemProperty -Path "Registry::$_").Install) }
272272
if (-not $install) {
273273
Write-Host -Object " $($parentName) $($name)"
274274
}

‎docs/framework/release-notes/2024/11-12-november-security-and-quality-rollup.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ The following table outlines the updates in this release.
5151
| Product version | Cumulative update |
5252
| --- | --- |
5353
| **Windows 11, version 24H2** | |
54-
| .NET Framework 3.5, 4.8.1 | [5045045934](https://support.microsoft.com/kb/5045934) |
54+
| .NET Framework 3.5, 4.8.1 | [5045934](https://support.microsoft.com/kb/5045934) |
55+
| **Microsoft server operating system, version 24H2** | |
56+
| .NET Framework 3.5, 4.8.1 | [5045934](https://support.microsoft.com/kb/5045934) |
5557
| **Microsoft server operating system, version 23H2** | |
5658
| .NET Framework 3.5, 4.8.1 | [5046270](https://support.microsoft.com/kb/5046270) |
5759
| **Windows 11, version 22H2 and Windows 11, version 23H2** | |

‎docs/framework/release-notes/2024/11-21-november-preview-cumulative-update.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
title: November 2024 cumulative update preview
3+
description: Learn about the improvements in the .NET Framework November 2024 cumulative update preview.
4+
ms.date: 11/21/2024
5+
---
6+
# November 2024 cumulative update preview
7+
8+
_Released Novemeber 21, 2024_
9+
10+
## Summary of what's new in this release
11+
12+
- [Security improvements](#security-improvements)
13+
- [Quality and reliability improvements](#quality-and-reliability-improvements)
14+
15+
### Security improvements
16+
17+
There are no new security improvements in this release. This update is cumulative and contains all previously released security improvements.
18+
19+
### Quality and reliability improvements
20+
21+
#### CLR
22+
23+
Addresses an issue where, in rare cases, an infinite loop could occur when a thread enters CLR for the first time. (*Applies to: .NET Framework 4.8, 4.8.1.*)
24+
25+
## Known issues in this release
26+
27+
This release contains no known issues.
28+
29+
## Summary tables
30+
31+
The following table outlines the updates in this release.
32+
33+
| Product version | Cumulative update preview |
34+
| --- | --- |
35+
| **Windows 11, version 24H2** | |
36+
| .NET Framework 3.5, 4.8.1 | [5048162](https://support.microsoft.com/kb/5048162) |
37+
| **Windows 11, version 22H2 and Windows 11, version 23H2** | |
38+
| .NET Framework 3.5, 4.8.1 | [5048163](https://support.microsoft.com/kb/5048163) |
39+
| **Windows 10, version 22H2** | **[5048292](https://support.microsoft.com/kb/5048292)** |
40+
| .NET Framework 3.5, 4.8 | [5048160](https://support.microsoft.com/kb/50481606) |
41+
| .NET Framework 3.5, 4.8.1 | [5048161](https://support.microsoft.com/kb/5048161) |
42+
43+
The operating system row lists a KB that's used for update offering purposes. When the operating system KB is offered, the applicability logic determines the specific .NET Framework update(s) that will be installed. Updates for individual .NET Framework versions will be installed based on the version of .NET Framework that is already present on the device. Because of this, the operating system KB is not expected to be listed as installed updates on the device. The expected update to be installed are the .NET Framework-specific version updates listed in the previous table.

‎docs/framework/toc.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,8 @@ items:
699699
href: release-notes/2024/10-22-october-preview-cumulative-update.md
700700
- name: November 2024 security and quality rollup
701701
href: release-notes/2024/11-12-november-security-and-quality-rollup.md
702+
- name: November 2024 cumulative update preview
703+
href: release-notes/2024/11-21-november-preview-cumulative-update.md
702704
- name: What's new
703705
href: whats-new/index.md
704706
- name: What's new in accessibility

0 commit comments

Comments
 (0)