Skip to content

Commit 000f890

Browse files
Merge pull request #44414 from dotnet/main
Merge main into live
2 parents f9de492 + 042ad29 commit 000f890

File tree

98 files changed

+494
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+494
-282
lines changed

.openpublishing.redirection.standard.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,11 @@
318318
"redirect_url": "/previous-versions/dotnet/framework/data/xml/xslt/outputs-from-an-xsltransform",
319319
"redirect_document_id": false
320320
},
321+
{
322+
"source_path_from_root": "/docs/standard/data/sqlite/xamarin.md",
323+
"redirect_url": "/dotnet/standard/data/sqlite/",
324+
"redirect_document_id": false
325+
},
321326
{
322327
"source_path_from_root": "/docs/standard/data/xml/resolving-external-xslt-style-sheets-and-documents.md",
323328
"redirect_url": "/previous-versions/dotnet/framework/data/xml/xslt/resolving-external-xslt-style-sheets-and-documents",

docs/ai/quickstarts/quickstart-local-ai.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,21 @@ The Semantic Kernel SDK provides many services and features to connect to AI mod
101101
Tell me three facts about .NET.
102102
103103
AI response:
104-
1. **Cross-Platform Development:** One of the significant strengths of .NET,
104+
1. **Cross-Platform Development:** One of the significant strengths of .NET,
105105
particularly its newer iterations (.NET Core and .NET 5+), is cross-platform support.
106106
It allows developers to build applications that run on Windows, Linux, macOS,
107107
and various other operating systems seamlessly, enhancing flexibility and
108108
reducing barriers for a wider range of users.
109109
110-
2. **Rich Ecosystem and Library Support:** .NET has an incredibly rich ecosystem,
111-
comprising an extensive collection of libraries (such as those provided by the
112-
official NuGet Package Manager), tools, and services. This allows developers
113-
to work on web applications (.NET Framework for desktop apps and ASP.NET Core
114-
for modern web applications), mobile applications (.NET MAUI or Xamarin.Forms),
115-
IoT solutions, AI/ML projects, and much more with a vast array of pre-built
110+
2. **Rich Ecosystem and Library Support:** .NET has a rich ecosystem,
111+
comprising an extensive collection of libraries (such as those provided by the
112+
official NuGet Package Manager), tools, and services. This allows developers
113+
to work on web applications (.NET for desktop apps and ASP.NET Core
114+
for modern web applications), mobile applications (.NET MAUI),
115+
IoT solutions, AI/ML projects, and much more with a vast array of prebuilt
116116
components available at their disposal.
117-
118-
3. **Type Safety:** .NET operates under the Common Language Infrastructure (CLI)
117+
118+
3. **Type Safety:** .NET operates under the Common Language Infrastructure (CLI)
119119
model and employs managed code for executing applications. This approach inherently
120120
offers strong type safety checks which help in preventing many runtime errors that
121121
are common in languages like C/C++. It also enables features such as garbage collection,
@@ -133,11 +133,11 @@ The Semantic Kernel SDK provides many services and features to connect to AI mod
133133
AI Response:
134134
**Cross-platform Capabilities:** .NET allows building for various operating systems
135135
through platforms like .NET Core, promoting accessibility (Windows, Linux, macOS).
136-
136+
137137
**Extensive Ecosystem:** Offers a vast library selection via NuGet and tools for web
138-
(.NET Framework), mobile development (Maui/Xamarin.Forms), IoT, AI, providing rich
138+
(.NET Framework), mobile development (.NET MAUI), IoT, AI, providing rich
139139
capabilities to developers.
140-
140+
141141
**Type Safety & Reliability:** .NET's CLI model enforces strong typing and automatic
142142
garbage collection, mitigating runtime errors, thus enhancing application stability.
143143
```

docs/ai/quickstarts/snippets/build-chat-app/openai/ExtensionsOpenAI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24556.5" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.1" />
1414
</ItemGroup>
1515

1616
</Project>

docs/ai/quickstarts/snippets/prompt-completion/openai/ExtensionsOpenAI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.0.0-preview.9.24556.5" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.1" />
1414
</ItemGroup>
1515

1616
</Project>

docs/architecture/blazor-for-web-forms-developers/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ When .NET and ASP.NET Web Forms first shipped, the platform ecosystem looked muc
2727

2828
Most modern web frameworks are now also open-source, which has a number of benefits. Users aren't beheld to a single project owner to fix bugs and add features. Open-source projects provide improved transparency on development progress and upcoming changes. Open-source projects enjoy contributions from an entire community, and they foster a supportive open-source ecosystem. Despite the risks of open-source, many consumers and contributors have found suitable mitigations that enable them to enjoy the benefits of an open-source ecosystem in a safe and reasonable way. Examples of such mitigations include contributor license agreements, friendly licenses, pedigree scans, and supporting foundations.
2929

30-
The .NET community has embraced both cross-platform support and open-source. .NET Core is an open-source and cross-platform implementation of .NET that runs on a plethora of platforms, including Windows, macOS, and various Linux distributions. Xamarin provides Mono, an open-source version of .NET. Mono runs on Android, iOS, and a variety of other form factors, including watches and smart TVs. In 2020, Microsoft released [.NET 5](https://devblogs.microsoft.com/dotnet/announcing-net-5-0/) that reconciled .NET Core and Mono into "a single .NET runtime and framework that can be used everywhere and that has uniform runtime behaviors and developer experiences."
30+
The .NET community has embraced both cross-platform support and open-source. .NET Core is an open-source and cross-platform implementation of .NET that runs on a plethora of platforms, including Windows, macOS, and various Linux distributions. Mono is an open-source version of .NET that runs on Android, iOS, and a variety of other form factors, including watches and smart TVs. In 2020, Microsoft released [.NET 5](https://devblogs.microsoft.com/dotnet/announcing-net-5-0/) that reconciled .NET Core and Mono into "a single .NET runtime and framework that can be used everywhere and that has uniform runtime behaviors and developer experiences."
3131

3232
Will ASP.NET Web Forms benefit from the move to open-source and cross-platform support? The answer, unfortunately, is no, or at least not to the same extent as the rest of the platform. The .NET team [made it clear](https://devblogs.microsoft.com/dotnet/net-core-is-the-future-of-net/) that ASP.NET Web Forms won't be ported to .NET Core or .NET 8. Why is that?
3333

docs/architecture/cloud-native/map-eshoponcontainers-azure-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.date: 04/06/2022
88

99
[!INCLUDE [download-alert](includes/download-alert.md)]
1010

11-
Although not required, Azure is well-suited to supporting the eShopOnContainers because the project was built to be a cloud-native application. The application is built with .NET, so it can run on Linux or Windows containers depending on the Docker host. The application is made up of multiple autonomous microservices, each with its own data. The different microservices showcase different approaches, ranging from simple CRUD operations to more complex DDD and CQRS patterns. Microservices communicate with clients over HTTP and with one another via message-based communication. The application supports multiple platforms for clients as well, since it adopts HTTP as a standard communication protocol and includes ASP.NET Core and Xamarin mobile apps that run on Android, iOS, and Windows platforms.
11+
Although not required, Azure is well-suited to supporting the eShopOnContainers because the project was built to be a cloud-native application. The application is built with .NET, so it can run on Linux or Windows containers depending on the Docker host. The application is made up of multiple autonomous microservices, each with its own data. The different microservices showcase different approaches, ranging from simple CRUD operations to more complex DDD and CQRS patterns. Microservices communicate with clients over HTTP and with one another via message-based communication. The application supports multiple platforms for clients as well, since it adopts HTTP as a standard communication protocol and includes ASP.NET Core and Xamarin mobile apps that run on Android, iOS, and Windows platforms. (Xamarin is unsupported as of May 2024.)
1212

1313
The application's architecture is shown in Figure 2-5. On the left are the client apps, broken up into mobile, traditional Web, and Web Single Page Application (SPA) flavors. On the right are the server-side components that make up the system, each of which can be hosted in Docker containers and Kubernetes clusters. The traditional web app is powered by the ASP.NET Core MVC application shown in yellow. This app and the mobile and web SPA applications communicate with the individual microservices through one or more API gateways. The API gateways follow the "backends for front ends" (BFF) pattern, meaning that each gateway is designed to support a given front-end client. The individual microservices are listed to the right of the API gateways and include both business logic and some kind of persistence store. The different services make use of SQL Server databases, Redis cache instances, and MongoDB/CosmosDB stores. On the far right is the system's Event Bus, which is used for communication between the microservices.
1414

docs/architecture/maui/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ In addition, unit tests are provided for some of the classes in the eShop multi-
101101

102102
## Multi-Platform app solution
103103

104-
The eShop multi-platform app solution organizes the source code and other resources into a multiple projects. All of the core mobile components are contained in a singular project named eShopContainers. This is a feature introduced with .NET 6 that allows a project to target multiple outputs which helps eliminate the need for multiple platform projects that we would have used in Xamarin.Forms and earlier .NET versions. An additional project is included for unit testing.
104+
The eShop multi-platform app solution organizes the source code and other resources into a multiple projects. All of the core mobile components are contained in a singular project named eShopContainers. This is a feature introduced with .NET 6 that allows a project to target multiple outputs which helps eliminate the need for multiple platform projects that we would have used in earlier .NET versions. An additional project is included for unit testing.
105105

106106
While this project has all of its components stored in a singular project, it is worth considering separating it into multiple projects based on your needs. For example, if you have multiple implementations of service providers based off of a service with their own dependencies, it may make sense to break those service provider implementations out into their own separate project. Good candidates for project separation include shared models, service implementations, api client components, database or caching layers. Any place where you feel that the business could re-use a component in another project is a potential candidate for separation. These projects can then be packaged via [NuGet](/nuget/) for easy distribution and versioning.
107107

docs/architecture/microservices/architect-microservice-container-applications/microservice-based-composite-ui-shape-layout.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,33 @@ Figure 4-21 shows a version of this composite UI approach. This approach is simp
2727

2828
Each of those UI composition microservices would be similar to a small API Gateway. But in this case, each one is responsible for a small UI area.
2929

30-
A composite UI approach that's driven by microservices can be more challenging or less so, depending on what UI technologies you're using. For instance, you won't use the same techniques for building a traditional web application that you use for building an SPA or for native mobile app (as when developing Xamarin apps, which can be more challenging for this approach).
30+
A composite UI approach that's driven by microservices can be more challenging or less so, depending on what UI technologies you're using. For instance, you won't use the same techniques for building a traditional web application that you use for building an SPA or for native mobile app (which can be more challenging for this approach).
3131

32-
The [eShopOnContainers](https://aka.ms/MicroservicesArchitecture) sample application uses the monolithic UI approach for multiple reasons. First, it's an introduction to microservices and containers. A composite UI is more advanced but also requires further complexity when designing and developing the UI. Second, eShopOnContainers also provides a native mobile app based on Xamarin, which would make it more complex on the client C\# side.
32+
The [eShopOnContainers](https://aka.ms/MicroservicesArchitecture) sample application uses the monolithic UI approach for multiple reasons. First, it's an introduction to microservices and containers. A composite UI is more advanced but also requires further complexity when designing and developing the UI. Second, eShopOnContainers also provides a native mobile app based on Xamarin (unsupported as of May 2024), which would make it more complex on the client C\# side.
3333

3434
However, we encourage you to use the following references to learn more about composite UI based on microservices.
3535

3636
## Additional resources
3737

38-
- **Micro Frontends (Martin Fowler's blog)**
38+
- **Micro Frontends (Martin Fowler's blog)**
3939
<https://martinfowler.com/articles/micro-frontends.html>
40-
41-
- **Micro Frontends (Michael Geers site)**
40+
41+
- **Micro Frontends (Michael Geers site)**
4242
<https://micro-frontends.org/>
43-
44-
- **Composite UI using ASP.NET (Particular's Workshop)**
43+
44+
- **Composite UI using ASP.NET (Particular's Workshop)**
4545
<https://github.com/Particular/Workshop/tree/master/demos/asp-net-core>
4646

47-
- **Ruben Oostinga. The Monolithic Frontend in the Microservices Architecture**
47+
- **Ruben Oostinga. The Monolithic Frontend in the Microservices Architecture**
4848
<https://xebia.com/blog/the-monolithic-frontend-in-the-microservices-architecture/>
4949

50-
- **Mauro Servienti. The secret of better UI composition**
50+
- **Mauro Servienti. The secret of better UI composition**
5151
<https://particular.net/blog/secret-of-better-ui-composition>
5252

53-
- **Viktor Farcic. Including Front-End Web Components Into Microservices**
53+
- **Viktor Farcic. Including Front-End Web Components Into Microservices**
5454
<https://technologyconversations.com/2015/08/09/including-front-end-web-components-into-microservices/>
5555

56-
- **Managing Frontend in the Microservices Architecture**
56+
- **Managing Frontend in the Microservices Architecture**
5757
<https://allegro.tech/2016/03/Managing-Frontend-in-the-microservices-architecture.html>
5858

5959
>[!div class="step-by-step"]

docs/architecture/microservices/microservice-ddd-cqrs-patterns/client-side-validation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Even when using client-side validation, you should always validate your commands
1717

1818
Therefore, in client-side code you typically validate the ViewModels. You could also validate the client output DTOs or commands before you send them to the services.
1919

20-
The implementation of client-side validation depends on what kind of client application you are building. It will be different if you are validating data in a web MVC web application with most of the code in .NET, a SPA web application with that validation being coded in JavaScript or TypeScript, or a mobile app coded with Xamarin and C#.
20+
The implementation of client-side validation depends on what kind of client application you are building. It will be different if you're validating data in an MVC web application with most of the code in .NET versus a SPA web application with the validation code in JavaScript or TypeScript.
2121

2222
## Additional resources
2323

docs/azure/includes/dotnet-all.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@
477477
| App Service - API Apps Service | NuGet [0.9.64](https://www.nuget.org/packages/Microsoft.Azure.AppService.ApiApps.Service/0.9.64) | | |
478478
| Code Analyzers for Durable Functions | NuGet [0.5.0](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.DurableTask.Analyzers/0.5.0) | | GitHub [0.5.0](https://github.com/Azure/azure-functions-durable-extension/tree/Analyzer-v0.3.0/src/WebJobs.Extensions.DurableTask.Analyzers) |
479479
| Cosmos DB - BulkExecutor | NuGet [2.5.1-preview](https://www.nuget.org/packages/Microsoft.Azure.CosmosDB.BulkExecutor/2.5.1-preview) | | GitHub [2.5.1-preview](https://github.com/Azure/azure-cosmosdb-bulkexecutor-dotnet-getting-started) |
480-
| Cosmos DB - Direct | NuGet [3.37.6](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Direct/3.37.6) | | GitHub [3.37.6](https://github.com/Azure/azure-cosmos-dotnet-v3) |
480+
| Cosmos DB - Direct | NuGet [3.37.7](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Direct/3.37.7) | | GitHub [3.37.7](https://github.com/Azure/azure-cosmos-dotnet-v3) |
481481
| Cosmos DB - Encryption | NuGet [2.0.3](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption/2.0.3)<br>NuGet [2.1.0-preview4](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption/2.1.0-preview4) | | GitHub [2.0.3](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/releases/encryption/1.0.0-preview4/Microsoft.Azure.Cosmos.Encryption) |
482482
| Cosmos DB - Encryption | NuGet [1.0.0-preview07](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption.Custom/1.0.0-preview07) | | |
483483
| Extensions - Caching Cosmos | NuGet [1.7.0](https://www.nuget.org/packages/Microsoft.Extensions.Caching.Cosmos/1.7.0) | | GitHub [1.7.0](https://github.com/Azure/Microsoft.Extensions.Caching.Cosmos/tree/v1.0.0-preview4) |

0 commit comments

Comments
 (0)