Skip to content

Commit cfdbc45

Browse files
Merge pull request #43037 from dotnet/main
Merge main into live
2 parents 62d71a5 + 57dff72 commit cfdbc45

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

docs/architecture/maui/unit-testing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 05/30/2024
1212

1313
Multi-platform apps experience problems similar to both desktop and web-based applications. Mobile users will differ by their devices, network connectivity, availability of services, and various other factors. Therefore, multi-platform apps should be tested as they would be used in the real world to improve their quality, reliability, and performance. Many types of testing should be performed on an app, including unit testing, integration testing, and user interface testing. Unit testing is the most common form and essential to building high-quality applications.
1414

15-
A unit test takes a small unit of the app, typically a method, isolates it from the remainder of the code, and verifies that it behaves as expected. Its goal is to check that each unit of functionality performs as expected, so errors don't propagate throughout the app. Detecting a bug where it occurs is more efficient that observing the effect of a bug indirectly at a secondary point of failure.
15+
A unit test takes a small unit of the app, typically a method, isolates it from the remainder of the code, and verifies that it behaves as expected. Its goal is to check that each unit of functionality performs as expected, so errors don't propagate throughout the app. Detecting a bug where it occurs is more efficient than observing the effect of a bug indirectly at a secondary point of failure.
1616

1717
Unit testing has the most significant effect on code quality when it's an integral part of the software development workflow. Unit tests can act as design documentation and functional specifications for an application. As soon as a method has been written, unit tests should be written that verify the method's behavior in response to standard, boundary, and incorrect input data cases and check any explicit or implicit assumptions made by the code. Alternatively, with test-driven development, unit tests are written before the code. For more information on test-driven development and how to implement it, see [Walkthrough: Test-driven development using Test Explorer.](/visualstudio/test/quick-start-test-driven-development-with-test-explorer)
1818

@@ -66,7 +66,7 @@ The eShop multi-platform app uses [MSTest](../../core/testing/unit-testing-with-
6666

6767
| Testing Type | Attribute | Description |
6868
|-----------------|--------------|--------------------------------------------------------------|
69-
| TestMethod | `TestMethod` | Defines the actual test method to run.. |
69+
| TestMethod | `TestMethod` | Defines the actual test method to run. |
7070
| DataSource | `DataSource` | Tests that are only true for a particular set of data. |
7171

7272
The unit tests included with the eShop multi-platform app are TestMethod, so each unit test method is decorated with the `TestMethod` attribute. In addition to MSTest there are several other testing frameworks available including [NUnit](../../core/testing/unit-testing-with-nunit.md) and [xUnit](../../core/testing/unit-testing-with-dotnet-test.md).

docs/core/compatibility/9.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ If you're migrating an app to .NET 9, the breaking changes listed here might aff
3636
| [Altered UnsafeAccessor support for non-open generics](core-libraries/9.0/unsafeaccessor-generics.md) | Behavioral change | Preview 6 |
3737
| [API obsoletions with custom diagnostic IDs](core-libraries/9.0/obsolete-apis-with-custom-diagnostics.md) | Source incompatible | (Multiple) |
3838
| [BigInteger maximum length](core-libraries/9.0/biginteger-limit.md) | Behavioral change | Preview 6 |
39-
| [BinaryReader.GetString() returns "/uFFFD" on malformed sequences](core-libraries/9.0/binaryreader.md) | Behavioral change | Preview 7 |
39+
| [BinaryReader.GetString() returns "\uFFFD" on malformed sequences](core-libraries/9.0/binaryreader.md) | Behavioral change | Preview 7 |
4040
| [Creating type of array of System.Void not allowed](core-libraries/9.0/type-instance.md) | Behavioral change | Preview 1 |
4141
| [Default `Equals()` and `GetHashCode()` throw for types marked with `InlineArrayAttribute`](core-libraries/9.0/inlinearrayattribute.md) | Behavioral change | Preview 6 |
4242
| [FromKeyedServicesAttribute no longer injects non-keyed parameter](core-libraries/9.0/non-keyed-params.md) | Behavioral change | RC 1 |

docs/core/install/macos.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ The following table is a list of currently supported .NET releases and the versi
3030

3131
| Operating System | .NET 8 (LTS) | .NET 6 (LTS) |
3232
|------------------------|--------------|--------------|
33-
| macOS 14.0 "Sonoma" | ✔️ 8.0 | ✔️ 6.0 |
34-
| macOS 13.0 "Ventura" | ✔️ 8.0 | ✔️ 6.0 |
35-
| macOS 12.0 "Monterey" | ✔️ 8.0 | ✔️ 6.0 |
36-
| macOS 11.0 "Big Sur" || ✔️ 6.0 |
37-
| macOS 10.15 "Catalina" || ✔️ 6.0 |
33+
| macOS 15 "Sequoia" | ✔️ 8.0 | ✔️ 6.0 |
34+
| macOS 14 "Sonoma" | ✔️ 8.0 | ✔️ 6.0 |
35+
| macOS 13 "Ventura" | ✔️ 8.0 | ✔️ 6.0 |
36+
| macOS 12 "Monterey" |||
37+
| macOS 11 "Big Sur" | ||
38+
| macOS 10.15 "Catalina" | ||
3839

3940
For a full list of .NET versions and their support life cycle, see [.NET Support Policy](https://dotnet.microsoft.com/platform/support/policy/dotnet-core).
4041

docs/core/install/windows.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: "Learn about which versions of .NET SDK and .NET Runtime are suppor
44
author: adegeo
55
ms.author: adegeo
66
ms.topic: install-set-up-deploy #Don't change
7-
ms.date: 05/15/2024
7+
ms.date: 10/10/2024
88
#customer intent: As a developer or user, I want to decide the best way to install .NET on Windows.
99
---
1010

@@ -16,30 +16,30 @@ ms.date: 05/15/2024
1616
> - [Install on macOS](macos.md)
1717
> - [Install on Linux](linux.md)
1818
19-
There are many different ways to install .NET on Windows. This article helps you understand the difference between the SDK and Runtime, which runtime you should install, and the method you should use to install .NET.
19+
This article teaches you about which versions of .NET are supported on Windows, how to install .NET, and what the difference is between the SDK and runtime.
2020

21-
.NET is made up of the runtime and the SDK. The runtime runs .NET apps, and the SDK is used to create apps.
21+
Unlike .NET Framework, .NET isn't tied to your version of Windows. You can only have a single version of .NET Framework installed on Windows. But .NET is standalone and can be installed anywhere on your computer. Some apps might include their own copy of .NET.
2222

23-
Unlike .NET Framework, .NET isn't installed and tied to your version of Windows. You can only have a single version of .NET Framework installed on Windows. .NET can be installed anywhere on your computer and some apps might include their own copy of .NET.
23+
By default, .NET is installed to the _Program Files\\dotnet_ directory on your computer, unless the installation method chooses a different directory.
2424

25-
By default, .NET is installed to the _Program Files\\dotnet_ directory on your computer, unless the install method chooses a different directory.
25+
.NET is made up of the runtime and the SDK. The runtime runs .NET apps, and the SDK is used to create apps.
2626

2727
## Choose the correct runtime
2828

29-
There are three different runtimes for Windows, which enable different types of apps to run. The SDK includes all three runtimes. If you install a specific runtime, it might include other runtimes. The following table describes which runtime is included with a particular .NET installer:
29+
There are three different runtimes for Windows, which enable different types of apps to run. The SDK includes all three runtimes, and an installer for a runtime might include an additional runtime. The following table describes which runtime is included with a particular .NET installer:
3030

31-
| | Includes .NET Runtime | Includes .NET Desktop Runtime | Includes ASP.NET Core Runtime |
31+
| Installer | Includes .NET Runtime | Includes .NET Desktop Runtime | Includes ASP.NET Core Runtime |
3232
| ------------------------ | ----------------------------- | ----------------------------- | ----------------------------- |
3333
| **.NET Runtime** | Yes | No | No |
3434
| **.NET Desktop Runtime** | Yes | Yes | No |
3535
| **ASP.NET Core Runtime** | No | No | Yes |
3636
| **.NET SDK** | Yes | Yes | Yes |
3737

38-
To ensure that you can run all .NET apps on Windows, install both the ASP.NET Core Runtime and the .NET Desktop Runtime. The ASP.NET Core Runtime runs any web apps, and the .NET Desktop Runtime runs any desktop app, such as a Windows Presentation Foundation (WPF) or Windows Forms (WinForms) app.
38+
To ensure that you can run all .NET apps on Windows, install both the ASP.NET Core Runtime and the .NET Desktop Runtime. The ASP.NET Core Runtime runs web-based apps, and the .NET Desktop Runtime runs desktop apps, such as a Windows Presentation Foundation (WPF) or Windows Forms app.
3939

4040
## Choose how to install .NET
4141

42-
There are different ways to install .NET, and some products, like Visual Studio, might manage their own version of .NET. If you install .NET through software that manages its own version of .NET, you should also install the .NET runtime separately so that you can run .NET apps.
42+
There are different ways to install .NET, and some products might manage their own version of .NET. If you install .NET through software that manages its own version of .NET, it might not be enabled system-wide. Make sure you understand the implications of installing .NET through other software.
4343

4444
If you're unsure which method you should choose after reviewing the lists in the following sections, you probably want to use the [.NET Installer](#net-installer).
4545

@@ -203,7 +203,7 @@ The [download page](https://dotnet.microsoft.com/download/dotnet) for .NET provi
203203
1. Find the SDK or Runtime box that contains the links for downloading .NET.
204204
1. Under the **Installers** column, find the **Windows** row and select the link for your CPU architecture. If you're unsure, select **x64** as it's the most common.
205205

206-
The browser automatically downloads the MSI package.
206+
The browser should automatically download the installer.
207207

208208
> [!TIP]
209209
> The following image shows the SDK, but you can also download the Runtime.
@@ -215,15 +215,17 @@ The [download page](https://dotnet.microsoft.com/download/dotnet) for .NET provi
215215

216216
The Windows Installer dialog is opened.
217217

218-
:::image type="content" source="media/windows/msi-installer.png" alt-text="A screenshot of the .NET MSI installer app window.":::
218+
:::image type="content" source="media/windows/msi-installer.png" alt-text="A screenshot of the .NET installer app window.":::
219219

220220
1. Select **Install** and follow the instructions to install .NET.
221221

222222
To learn how to use the .NET CLI, see [.NET CLI overview](../tools/index.md).
223223

224224
### Command-line options
225225

226-
If you want to install .NET silently, such as in a production environment or to support continuous integration, use the following Windows Installer options:
226+
Use the `/?` parameter to display a list of options.
227+
228+
If you want to install .NET silently, such as in a production environment or to support continuous integration, use the following options:
227229

228230
- `/install`\
229231
Installs .NET.
@@ -238,8 +240,6 @@ Suppresses any attempts to restart.
238240
dotnet-sdk-8.0.100-win-x64.exe /install /quiet /norestart
239241
```
240242

241-
For more information, see [Standard Installer Command-Line Options](/windows/win32/msi/standard-installer-command-line-options).
242-
243243
> [!TIP]
244244
> The installer returns an exit code of **0** for success and an exit code of **3010** to indicate that a restart is required. Any other value is most likely an error code.
245245
@@ -261,7 +261,7 @@ The .NET WinGet packages are:
261261
If you install the SDK, you don't need to install the corresponding runtime.
262262

263263
01. [Install WinGet](/windows/package-manager/winget/#install-winget).
264-
01. Open a terminal, such as PowerShell or `cmd.exe`.
264+
01. Open a terminal, such as PowerShell or Command Prompt.
265265
01. Run the `winget install` command and pass the name of the SDK package:
266266

267267
```cmd

0 commit comments

Comments
 (0)