Skip to content

Commit b9122d1

Browse files
authored
Merge pull request #20285 from dotnet/publish-7154
Merge master into live
2 parents 9c45035 + ba2c9ad commit b9122d1

File tree

23 files changed

+79
-115
lines changed

23 files changed

+79
-115
lines changed

docs/architecture/grpc-for-wcf-developers/protobuf-maps.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ message StockPrices {
1414
}
1515
```
1616

17-
In the generated code, `map` fields use the `Google.Protobuf.Collections.MapField<TKey, TValue>` class. This class implements the standard .NET collection interfaces, including <xref:System.Collections.Generic.IDictionary%602>.
17+
In the generated code, `map` fields are represented by read-only properties of the [`Google.Protobuf.Collections.MapField<TKey, TValue>`][map-field] type. This type implements the standard .NET collection interfaces, including <xref:System.Collections.Generic.IDictionary%602>.
1818

1919
Map fields can't be directly repeated in a message definition. But you can create a nested message that contains a map and use `repeated` on the message type, as in the following example:
2020

@@ -44,6 +44,8 @@ public Order CreateOrder(Dictionary<string, string> attributes)
4444

4545
For more information about Protobuf, see the official [Protobuf documentation](https://developers.google.com/protocol-buffers/docs/overview).
4646

47+
[map-field]: https://developers.google.cn/protocol-buffers/docs/reference/csharp/class/google/protobuf/collections/map-field-t-key-t-value-
48+
4749
>[!div class="step-by-step"]
4850
>[Previous](protobuf-enums.md)
4951
>[Next](wcf-services-to-grpc-comparison.md)

docs/architecture/grpc-for-wcf-developers/protobuf-repeated.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ message Person {
1515
}
1616
```
1717

18-
In the generated code, `repeated` fields are represented by the `Google.Protobuf.Collections.RepeatedField<T>` generic type rather than any of the built-in .NET collection types.
18+
In the generated code, `repeated` fields are represented by read-only properties of the [`Google.Protobuf.Collections.RepeatedField<T>`][repeated-field] type rather than any of the built-in .NET collection types. This type implements all the standard .NET collection interfaces, such as <xref:System.Collections.Generic.IList%601> and <xref:System.Collections.Generic.IEnumerable%601>. So you can use LINQ queries or convert it to an array or a list easily.
1919

20-
The `RepeatedField<T>` type includes the code required to serialize and deserialize the list to the binary wire format. It implements all the standard .NET collection interfaces, such as <xref:System.Collections.Generic.IList%601> and <xref:System.Collections.Generic.IEnumerable%601>. So you can use LINQ queries or convert it to an array or a list easily.
20+
The `RepeatedField<T>` type includes the code required to serialize and deserialize the list to the binary wire format.
21+
22+
[repeated-field]: https://developers.google.cn/protocol-buffers/docs/reference/csharp/class/google/protobuf/collections/repeated-field-t-
2123

2224
>[!div class="step-by-step"]
2325
>[Previous](protobuf-nested-types.md)

docs/core/compatibility/aspnetcore.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@ ms.author: scaddie
1010

1111
ASP.NET Core provides the web app development features used by .NET Core.
1212

13-
The following breaking changes are documented on this page:
13+
Select one of the following links for breaking changes in a specific version:
14+
15+
* [ASP.NET Core 5.0](#aspnet-core-50)
16+
* [ASP.NET Core 3.1](#aspnet-core-31)
17+
* [ASP.NET Core 3.0](#aspnet-core-30)
18+
19+
The following breaking changes in ASP.NET Core 3.0, 3.1, and 5.0 are documented on this page:
1420

1521
- [Obsolete Antiforgery, CORS, Diagnostics, MVC, and Routing APIs removed](#obsolete-antiforgery-cors-diagnostics-mvc-and-routing-apis-removed)
1622
- [Authentication: Google+ deprecation](#authentication-google-deprecated-and-replaced)

docs/core/tutorials/debugging-with-visual-studio-code.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This tutorial introduces the debugging tools available in Visual Studio Code for
99

1010
## Prerequisites
1111

12-
- This tutorial works with the console app that you create in [Create a .NET Core console application in Visual Studio Code](with-visual-studio-code.md).
12+
- This tutorial works with the console app that you create in [Create a .NET Core console application using Visual Studio Code](with-visual-studio-code.md).
1313

1414
## Use Debug build configuration
1515

@@ -21,7 +21,7 @@ By default, Visual Studio Code launch settings use the Debug build configuration
2121

2222
1. Start Visual Studio Code.
2323

24-
1. Open the folder of the project that you created in [Create a .NET Core console application in Visual Studio Code](with-visual-studio-code.md).
24+
1. Open the folder of the project that you created in [Create a .NET Core console application using Visual Studio Code](with-visual-studio-code.md).
2525

2626
## Set a breakpoint
2727

@@ -218,4 +218,4 @@ dotnet run --configuration Release
218218
In this tutorial, you used Visual Studio Code debugging tools. In the next tutorial, you publish a deployable version of the app.
219219

220220
> [!div class="nextstepaction"]
221-
> [Publish a .NET Core console application with Visual Studio Code](publishing-with-visual-studio-code.md)
221+
> [Publish a .NET Core console application using Visual Studio Code](publishing-with-visual-studio-code.md)

docs/core/tutorials/debugging-with-visual-studio-mac.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This tutorial introduces the debugging tools available in Visual Studio for Mac.
99

1010
## Prerequisites
1111

12-
- This tutorial works with the console app that you create in [Create a .NET Core console application in Visual Studio for Mac](with-visual-studio-mac.md).
12+
- This tutorial works with the console app that you create in [Create a .NET Core console application using Visual Studio for Mac](with-visual-studio-mac.md).
1313

1414
## Use Debug build configuration
1515

@@ -21,7 +21,7 @@ By default, Visual Studio uses the Debug build configuration, so you don't need
2121

2222
1. Start Visual Studio for Mac.
2323

24-
1. Open the project that you created in [Create a .NET Core console application in Visual Studio for Mac](with-visual-studio-mac.md).
24+
1. Open the project that you created in [Create a .NET Core console application using Visual Studio for Mac](with-visual-studio-mac.md).
2525

2626
The current build configuration is shown on the toolbar. The following toolbar image shows that Visual Studio is configured to compile the Debug version of the app:
2727

@@ -172,4 +172,4 @@ To build and test the Release version of the console application, do the followi
172172
In this tutorial, you used Visual Studio debugging tools. In the next tutorial, you publish a deployable version of the app.
173173

174174
> [!div class="nextstepaction"]
175-
> [Publish a .NET Core console application with Visual Studio for Mac](publishing-with-visual-studio-mac.md)
175+
> [Publish a .NET Core console application using Visual Studio for Mac](publishing-with-visual-studio-mac.md)

docs/core/tutorials/debugging-with-visual-studio.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This tutorial introduces the debugging tools available in Visual Studio.
1313

1414
## Prerequisites
1515

16-
- This tutorial works with the console app that you create in [Create a .NET Core console application in Visual Studio 2019](with-visual-studio.md).
16+
- This tutorial works with the console app that you create in [Create a .NET Core console application using Visual Studio](with-visual-studio.md).
1717

1818
## Use Debug build configuration
1919

@@ -25,7 +25,7 @@ In the Debug configuration, a program compiles with full symbolic debug informat
2525

2626
1. Start Visual Studio.
2727

28-
1. Open the project that you created in [Create a .NET Core console application in Visual Studio 2019](with-visual-studio.md).
28+
1. Open the project that you created in [Create a .NET Core console application using Visual Studio](with-visual-studio.md).
2929

3030
The current build configuration is shown on the toolbar. The following toolbar image shows that Visual Studio is configured to compile the Debug version of the app:
3131

@@ -182,4 +182,4 @@ When you press <kbd>F5</kbd> or choose **Build Solution** from the **Build** men
182182
In this tutorial, you used Visual Studio debugging tools. In the next tutorial, you publish a deployable version of the app.
183183

184184
> [!div class="nextstepaction"]
185-
> [Publish a .NET Core console application with Visual Studio](publishing-with-visual-studio.md)
185+
> [Publish a .NET Core console application using Visual Studio](publishing-with-visual-studio.md)

docs/core/tutorials/publishing-with-visual-studio-code.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ The .NET Core CLI is used to publish the app, so you can follow this tutorial wi
1111

1212
## Prerequisites
1313

14-
- This tutorial works with the console app that you create in [Create a .NET Core console application in Visual Studio Code](with-visual-studio-code.md).
14+
- This tutorial works with the console app that you create in [Create a .NET Core console application using Visual Studio Code](with-visual-studio-code.md).
1515

1616
## Publish the app
1717

1818
1. Start Visual Studio Code.
1919

20-
1. Open the *HelloWorld* project folder that you created in [Create a .NET Core console application in Visual Studio Code](with-visual-studio-code.md).
20+
1. Open the *HelloWorld* project folder that you created in [Create a .NET Core console application using Visual Studio Code](with-visual-studio-code.md).
2121

2222
1. Choose **View** > **Terminal** from the main menu.
2323

@@ -106,4 +106,4 @@ In the following steps, you'll look at the files created by the publish process.
106106
In this tutorial, you published a console app. In the next tutorial, you create a class library.
107107

108108
> [!div class="nextstepaction"]
109-
> [Create a .NET Standard library in Visual Studio Code](library-with-visual-studio-code.md)
109+
> [Create a .NET Standard library using Visual Studio Code](library-with-visual-studio-code.md)

docs/core/tutorials/publishing-with-visual-studio-mac.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ This tutorial shows how to publish a console app so that other users can run it.
99

1010
## Prerequisites
1111

12-
- This tutorial works with the console app that you create in [Create a .NET Core console application in Visual Studio for Mac](with-visual-studio-mac.md).
12+
- This tutorial works with the console app that you create in [Create a .NET Core console application using Visual Studio for Mac](with-visual-studio-mac.md).
1313

1414
## Publish the app
1515

1616
1. Start Visual Studio for Mac.
1717

18-
1. Open the HelloWorld project that you created in [Create a .NET Core console application in Visual Studio for Mac](with-visual-studio-mac.md).
18+
1. Open the HelloWorld project that you created in [Create a .NET Core console application using Visual Studio for Mac](with-visual-studio-mac.md).
1919

2020
1. Make sure that Visual Studio is building the Release version of your application. If necessary, change the build configuration setting on the toolbar from **Debug** to **Release**.
2121

@@ -82,4 +82,4 @@ As the preceding image shows, the published output includes the following files:
8282
In this tutorial, you published a console app. In the next tutorial, you create a class library.
8383

8484
> [!div class="nextstepaction"]
85-
> [Create a .NET Standard library in Visual Studio for mac](library-with-visual-studio-mac.md)
85+
> [Create a .NET Standard library using Visual Studio for Mac](library-with-visual-studio-mac.md)

docs/core/tutorials/publishing-with-visual-studio.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ This tutorial shows how to publish a console app so that other users can run it.
1313

1414
## Prerequisites
1515

16-
- This tutorial works with the console app that you create in [Create a .NET Core console application in Visual Studio 2019](with-visual-studio.md).
16+
- This tutorial works with the console app that you create in [Create a .NET Core console application using Visual Studio](with-visual-studio.md).
1717

1818
## Publish the app
1919

2020
1. Start Visual Studio.
2121

22-
1. Open the *HelloWorld* project that you created in [Create a .NET Core console application in Visual Studio](with-visual-studio.md).
22+
1. Open the *HelloWorld* project that you created in [Create a .NET Core console application using Visual Studio](with-visual-studio.md).
2323

2424
1. Make sure that Visual Studio is using the Release build configuration. If necessary, change the build configuration setting on the toolbar from **Debug** to **Release**.
2525

@@ -106,4 +106,4 @@ In the following steps, you'll look at the files created by the publish process.
106106
In this tutorial, you published a console app. In the next tutorial, you create a class library.
107107

108108
> [!div class="nextstepaction"]
109-
> [Create a .NET Standard library in Visual Studio](library-with-visual-studio.md)
109+
> [Create a .NET Standard library using Visual Studio](library-with-visual-studio.md)

docs/core/tutorials/with-visual-studio-mac.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ Enhance the application to prompt the user for their name and display it along w
9999
In this tutorial, you created a .NET Core console application. In the next tutorial, you debug the app.
100100

101101
> [!div class="nextstepaction"]
102-
> [Debug a .NET Core console application in Visual Studio](debugging-with-visual-studio-mac.md)
102+
> [Debug a .NET Core console application using Visual Studio for Mac](debugging-with-visual-studio-mac.md)

0 commit comments

Comments
 (0)