Skip to content

Commit 027dea2

Browse files
BillWagnerBillWagner
authored
Merge pull request #32120 from dotnet/main
2 parents e52ec36 + 5bf6501 commit 027dea2

File tree

140 files changed

+320
-268
lines changed

Some content is hidden

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

140 files changed

+320
-268
lines changed

‎.openpublishing.redirection.core.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,11 +1126,11 @@
11261126
},
11271127
{
11281128
"source_path_from_root": "/docs/fundamentals/networking/tcp/tcp-services.md",
1129-
"redirect_url": "/dotnet/fundamentals/networking/sockets/tcp"
1129+
"redirect_url": "/dotnet/fundamentals/networking/sockets/tcp-classes"
11301130
},
11311131
{
11321132
"source_path_from_root": "/docs/fundamentals/networking/tcp/tcp-overview.md",
1133-
"redirect_url": "/dotnet/fundamentals/networking/sockets/tcp"
1133+
"redirect_url": "/dotnet/fundamentals/networking/sockets/tcp-classes"
11341134
}
11351135
]
11361136
}

‎.openpublishing.redirection.framework.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2483,11 +2483,11 @@
24832483
},
24842484
{
24852485
"source_path_from_root": "/docs/framework/network-programming/tcp-udp.md",
2486-
"redirect_url": "/dotnet/fundamentals/networking/sockets/tcp"
2486+
"redirect_url": "/dotnet/fundamentals/networking/sockets/tcp-classes"
24872487
},
24882488
{
24892489
"source_path_from_root": "/docs/framework/network-programming/using-tcp-services.md",
2490-
"redirect_url": "/dotnet/fundamentals/networking/sockets/tcp"
2490+
"redirect_url": "/dotnet/fundamentals/networking/sockets/tcp-classes"
24912491
},
24922492
{
24932493
"source_path_from_root": "/docs/framework/network-programming/sockets.md",

‎docs/architecture/microservices/multi-container-microservice-net-applications/rabbitmq-event-bus-development-test-environment.md‎

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

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

10-
We should start by saying that if you create your custom event bus based on RabbitMQ running in a container, as the eShopOnContainers application does, it should be used only for your development and test environments. Don't use it for your production environment, unless you are building it as a part of a production-ready service bus. A simple custom event bus might be missing many production-ready critical features that a commercial service bus has.
10+
We should start by saying that if you create your custom event bus based on [RabbitMQ](https://www.rabbitmq.com/) running in a container, as the eShopOnContainers application does, it should be used only for your development and test environments. Don't use it for your production environment, unless you are building it as a part of a production-ready service bus as described in the [Additional resources section below](/dotnet/architecture/microservices/multi-container-microservice-net-applications/rabbitmq-event-bus-development-test-environment#additional-resources). A simple custom event bus might be missing many production-ready critical features that a commercial service bus has.
1111

1212
One of the event bus custom implementations in eShopOnContainers is basically a library using the RabbitMQ API. (There's another implementation based on Azure Service Bus.)
1313

@@ -112,13 +112,16 @@ For production scenarios check the additional resources below, specific for Rabb
112112

113113
A production-ready solution with support for RabbitMQ.
114114

115+
- **NServiceBus** - Fully-supported commercial service bus with advanced management and monitoring tooling for .NET \
116+
<https://particular.net/>
117+
115118
- **EasyNetQ** - Open Source .NET API client for RabbitMQ \
116119
<https://easynetq.com/>
117120

118-
- **MassTransit** \
121+
- **MassTransit** - Free, open-source distributed application framework for .NET \
119122
<https://masstransit-project.com/>
120123

121-
- **Rebus** - Open source .NET Service Bus
124+
- **Rebus** - Open source .NET Service Bus \
122125
<https://github.com/rebus-org/Rebus>
123126

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
| Azure.Identity.BrokeredAuthentication | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.Identity.BrokeredAuthentication/1.0.0-beta.3) | | GitHub [1.0.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Identity.BrokeredAuthentication_1.0.0-beta.3/sdk/identity/Azure.Identity.BrokeredAuthentication/) |
1515
| Cognitive Search | NuGet [11.4.0](https://www.nuget.org/packages/Azure.Search.Documents/11.4.0)<br>NuGet [11.5.0-beta.2](https://www.nuget.org/packages/Azure.Search.Documents/11.5.0-beta.2) | [docs](/dotnet/api/overview/azure/Search.Documents-readme) | GitHub [11.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Search.Documents_11.4.0/sdk/search/Azure.Search.Documents/)<br>GitHub [11.5.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Search.Documents_11.5.0-beta.2/sdk/search/Azure.Search.Documents/) |
1616
| Communication Chat | NuGet [1.1.1](https://www.nuget.org/packages/Azure.Communication.Chat/1.1.1) | [docs](/dotnet/api/overview/azure/Communication.Chat-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Chat_1.1.1/sdk/communication/Azure.Communication.Chat/) |
17-
| Communication Common | NuGet [1.2.0](https://www.nuget.org/packages/Azure.Communication.Common/1.2.0) | [docs](/dotnet/api/overview/azure/Communication.Common-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Common_1.2.0/sdk/communication/Azure.Communication.Common/) |
17+
| Communication Common | NuGet [1.2.1](https://www.nuget.org/packages/Azure.Communication.Common/1.2.1) | [docs](/dotnet/api/overview/azure/Communication.Common-readme) | GitHub [1.2.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Common_1.2.1/sdk/communication/Azure.Communication.Common/) |
1818
| Communication Identity | NuGet [1.2.0](https://www.nuget.org/packages/Azure.Communication.Identity/1.2.0) | [docs](/dotnet/api/overview/azure/Communication.Identity-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Identity_1.2.0/sdk/communication/Azure.Communication.Identity/) |
1919
| Communication Network Traversal | NuGet [1.0.0](https://www.nuget.org/packages/Azure.Communication.NetworkTraversal/1.0.0)<br>NuGet [1.1.0-beta.1](https://www.nuget.org/packages/Azure.Communication.NetworkTraversal/1.1.0-beta.1) | [docs](/dotnet/api/overview/azure/Communication.NetworkTraversal-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.NetworkTraversal_1.0.0/sdk/communication/Azure.Communication.NetworkTraversal/)<br>GitHub [1.1.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.NetworkTraversal_1.1.0-beta.1/sdk/communication/Azure.Communication.NetworkTraversal/) |
2020
| Communication Phone Numbers | NuGet [1.0.1](https://www.nuget.org/packages/Azure.Communication.PhoneNumbers/1.0.1)<br>NuGet [1.1.0-beta.2](https://www.nuget.org/packages/Azure.Communication.PhoneNumbers/1.1.0-beta.2) | [docs](/dotnet/api/overview/azure/Communication.PhoneNumbers-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.PhoneNumbers_1.0.1/sdk/communication/Azure.Communication.PhoneNumbers/)<br>GitHub [1.1.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.PhoneNumbers_1.1.0-beta.2/sdk/communication/Azure.Communication.PhoneNumbers/) |
@@ -333,7 +333,7 @@
333333
| Azure Video Analyzer Edge | NuGet [1.0.0-beta.6](https://www.nuget.org/packages/Azure.Media.VideoAnalyzer.Edge/1.0.0-beta.6) | | GitHub [1.0.0-beta.6](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Media.VideoAnalyzer.Edge_1.0.0-beta.6/sdk/videoanalyzer/Azure.Media.VideoAnalyzer.Edge/) |
334334
| Azure.Analytics.Purview.Administration | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.Analytics.Purview.Administration/1.0.0-beta.1) | | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Analytics.Purview.Administration_1.0.0-beta.1/sdk/purview/Azure.Analytics.Purview.Administration/) |
335335
| Azure.Identity.BrokeredAuthentication | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.Identity.BrokeredAuthentication/1.0.0-beta.3) | | GitHub [1.0.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Identity.BrokeredAuthentication_1.0.0-beta.3/sdk/identity/Azure.Identity.BrokeredAuthentication/) |
336-
| Batch | NuGet [15.3.0](https://www.nuget.org/packages/Microsoft.Azure.Batch/15.3.0) | | GitHub [15.3.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Batch_15.3.0/sdk/batch/Microsoft.Azure.Batch/) |
336+
| Batch | NuGet [15.4.0](https://www.nuget.org/packages/Microsoft.Azure.Batch/15.4.0) | | GitHub [15.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Batch_15.4.0/sdk/batch/Microsoft.Azure.Batch/) |
337337
| Batch - Apps Cryptography | NuGet [1.1.1.4](https://www.nuget.org/packages/Microsoft.Azure.Batch.Apps.Cryptography/1.1.1.4) | | |
338338
| Batch - Conventions Files | NuGet [4.0.0](https://www.nuget.org/packages/Microsoft.Azure.Batch.Conventions.Files/4.0.0) | | GitHub [4.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Batch.Conventions.Files_4.0.0/sdk/batch/Microsoft.Azure.Batch.Conventions.Files/) |
339339
| Batch - File Staging | NuGet [9.0.0](https://www.nuget.org/packages/Microsoft.Azure.Batch.FileStaging/9.0.0) | | GitHub [9.0.0](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/batch/Microsoft.Azure.Batch.FileStaging) |
@@ -359,7 +359,7 @@
359359
| Common - Authentication | NuGet [1.7.0-preview](https://www.nuget.org/packages/Microsoft.Azure.Common.Authentication/1.7.0-preview) | | |
360360
| Common - Dependencies | NuGet [1.0.0](https://www.nuget.org/packages/Microsoft.Azure.Common.Dependencies/1.0.0) | | |
361361
| Communication Chat | NuGet [1.1.1](https://www.nuget.org/packages/Azure.Communication.Chat/1.1.1) | [docs](/dotnet/api/overview/azure/Communication.Chat-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Chat_1.1.1/sdk/communication/Azure.Communication.Chat/) |
362-
| Communication Common | NuGet [1.2.0](https://www.nuget.org/packages/Azure.Communication.Common/1.2.0) | [docs](/dotnet/api/overview/azure/Communication.Common-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Common_1.2.0/sdk/communication/Azure.Communication.Common/) |
362+
| Communication Common | NuGet [1.2.1](https://www.nuget.org/packages/Azure.Communication.Common/1.2.1) | [docs](/dotnet/api/overview/azure/Communication.Common-readme) | GitHub [1.2.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Common_1.2.1/sdk/communication/Azure.Communication.Common/) |
363363
| Communication Identity | NuGet [1.2.0](https://www.nuget.org/packages/Azure.Communication.Identity/1.2.0) | [docs](/dotnet/api/overview/azure/Communication.Identity-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Identity_1.2.0/sdk/communication/Azure.Communication.Identity/) |
364364
| Communication Network Traversal | NuGet [1.0.0](https://www.nuget.org/packages/Azure.Communication.NetworkTraversal/1.0.0)<br>NuGet [1.1.0-beta.1](https://www.nuget.org/packages/Azure.Communication.NetworkTraversal/1.1.0-beta.1) | [docs](/dotnet/api/overview/azure/Communication.NetworkTraversal-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.NetworkTraversal_1.0.0/sdk/communication/Azure.Communication.NetworkTraversal/)<br>GitHub [1.1.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.NetworkTraversal_1.1.0-beta.1/sdk/communication/Azure.Communication.NetworkTraversal/) |
365365
| Communication Phone Numbers | NuGet [1.0.1](https://www.nuget.org/packages/Azure.Communication.PhoneNumbers/1.0.1)<br>NuGet [1.1.0-beta.2](https://www.nuget.org/packages/Azure.Communication.PhoneNumbers/1.1.0-beta.2) | [docs](/dotnet/api/overview/azure/Communication.PhoneNumbers-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.PhoneNumbers_1.0.1/sdk/communication/Azure.Communication.PhoneNumbers/)<br>GitHub [1.1.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.PhoneNumbers_1.1.0-beta.2/sdk/communication/Azure.Communication.PhoneNumbers/) |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
| Azure.Identity.BrokeredAuthentication | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.Identity.BrokeredAuthentication/1.0.0-beta.3) | | GitHub [1.0.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Identity.BrokeredAuthentication_1.0.0-beta.3/sdk/identity/Azure.Identity.BrokeredAuthentication/) |
1515
| Cognitive Search | NuGet [11.4.0](https://www.nuget.org/packages/Azure.Search.Documents/11.4.0)<br>NuGet [11.5.0-beta.2](https://www.nuget.org/packages/Azure.Search.Documents/11.5.0-beta.2) | [docs](/dotnet/api/overview/azure/Search.Documents-readme) | GitHub [11.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Search.Documents_11.4.0/sdk/search/Azure.Search.Documents/)<br>GitHub [11.5.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Search.Documents_11.5.0-beta.2/sdk/search/Azure.Search.Documents/) |
1616
| Communication Chat | NuGet [1.1.1](https://www.nuget.org/packages/Azure.Communication.Chat/1.1.1) | [docs](/dotnet/api/overview/azure/Communication.Chat-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Chat_1.1.1/sdk/communication/Azure.Communication.Chat/) |
17-
| Communication Common | NuGet [1.2.0](https://www.nuget.org/packages/Azure.Communication.Common/1.2.0) | [docs](/dotnet/api/overview/azure/Communication.Common-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Common_1.2.0/sdk/communication/Azure.Communication.Common/) |
17+
| Communication Common | NuGet [1.2.1](https://www.nuget.org/packages/Azure.Communication.Common/1.2.1) | [docs](/dotnet/api/overview/azure/Communication.Common-readme) | GitHub [1.2.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Common_1.2.1/sdk/communication/Azure.Communication.Common/) |
1818
| Communication Identity | NuGet [1.2.0](https://www.nuget.org/packages/Azure.Communication.Identity/1.2.0) | [docs](/dotnet/api/overview/azure/Communication.Identity-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.Identity_1.2.0/sdk/communication/Azure.Communication.Identity/) |
1919
| Communication Network Traversal | NuGet [1.0.0](https://www.nuget.org/packages/Azure.Communication.NetworkTraversal/1.0.0)<br>NuGet [1.1.0-beta.1](https://www.nuget.org/packages/Azure.Communication.NetworkTraversal/1.1.0-beta.1) | [docs](/dotnet/api/overview/azure/Communication.NetworkTraversal-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.NetworkTraversal_1.0.0/sdk/communication/Azure.Communication.NetworkTraversal/)<br>GitHub [1.1.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.NetworkTraversal_1.1.0-beta.1/sdk/communication/Azure.Communication.NetworkTraversal/) |
2020
| Communication Phone Numbers | NuGet [1.0.1](https://www.nuget.org/packages/Azure.Communication.PhoneNumbers/1.0.1)<br>NuGet [1.1.0-beta.2](https://www.nuget.org/packages/Azure.Communication.PhoneNumbers/1.1.0-beta.2) | [docs](/dotnet/api/overview/azure/Communication.PhoneNumbers-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.PhoneNumbers_1.0.1/sdk/communication/Azure.Communication.PhoneNumbers/)<br>GitHub [1.1.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Communication.PhoneNumbers_1.1.0-beta.2/sdk/communication/Azure.Communication.PhoneNumbers/) |

‎docs/core/deploying/snippets/deploy-with-vs/csharp/deploy.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
</Project>

‎docs/core/deploying/snippets/deploy-with-vs/vb/deploy.vbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<RootNamespace>deploy</RootNamespace>
6-
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<TargetFramework>net6.0</TargetFramework>
77
</PropertyGroup>
88

99
</Project>

‎docs/core/deploying/snippets/deploy-with-vs/xml/invariant.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎docs/core/tutorials/snippets/library-with-visual-studio/vb/ShowCase/ShowCase.vbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<RootNamespace>ShowCase</RootNamespace>
6-
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<TargetFramework>net6.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>

‎docs/core/tutorials/snippets/library-with-visual-studio/vb/StringLibraryTest/StringLibraryTest.vbproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
<PropertyGroup>
44
<RootNamespace>StringLibraryTest</RootNamespace>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
6-
5+
<TargetFramework>net6.0</TargetFramework>
76
<IsPackable>false</IsPackable>
87
</PropertyGroup>
98

0 commit comments

Comments
 (0)