Merge pull request #36584 from dotnet/main

wadepickett · web-flow · commit b15e6cc28d8a · 2026-01-07T08:19:02.000-08:00
Merge to Live
diff --git a/aspnetcore/grpc/test-client.md b/aspnetcore/grpc/test-client.md
@@ -48,6 +48,7 @@ The preceding unit test:
 * Mocks `IGreetRepository` and `TesterClient` using [Moq](https://www.nuget.org/packages/Moq).
 * Starts the worker.
 * Verifies `SaveGreeting` is called with the greeting message returned by the mocked `TesterClient`.
+* Uses the [`CallHelpers` from the gRPC examples](https://github.com/grpc/grpc-dotnet/blob/2e283d98f5861e31f8956be0c68aff9a4e29cb0a/examples/Tester/Tests/Client/Helpers/CallHelpers.cs)
 
 ## Additional resources
 
diff --git a/aspnetcore/includes/net-core-prereqs-mac-3.0.md b/aspnetcore/includes/net-core-prereqs-mac-3.0.md
@@ -1,2 +1,2 @@
-* [Visual Studio for Mac version 8.0 or later](https://visualstudio.microsoft.com/vs/mac/)
+* [Visual Studio for Mac version 8.0 or later](/lifecycle/announcements/visual-studio-mac-end-of-servicing)
 * [!INCLUDE [](~/includes/3.0-SDK.md)]
diff --git a/aspnetcore/includes/net-core-prereqs-mac-3.1.md b/aspnetcore/includes/net-core-prereqs-mac-3.1.md
@@ -1,2 +1,2 @@
-* [Visual Studio for Mac version 8.4 or later](https://visualstudio.microsoft.com/vs/mac/)
+* [Visual Studio for Mac version 8.4 or later](/lifecycle/announcements/visual-studio-mac-end-of-servicing)
 * [!INCLUDE [.NET Core 3.1 SDK](~/includes/3.1-SDK.md)]
diff --git a/aspnetcore/includes/net-core-prereqs-mac-5.0.md b/aspnetcore/includes/net-core-prereqs-mac-5.0.md
@@ -1,2 +1,2 @@
-* [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/)
+* [Visual Studio for Mac](/lifecycle/announcements/visual-studio-mac-end-of-servicing)
 * [!INCLUDE [.NET 5 SDK](~/includes/5.0-SDK.md)]
diff --git a/aspnetcore/includes/net-prereqs-mac-6.0.md b/aspnetcore/includes/net-prereqs-mac-6.0.md
@@ -1,3 +1,3 @@
-* [Visual Studio 2022 for Mac (latest version)](https://visualstudio.microsoft.com/vs/mac/)
+* [Visual Studio 2022 for Mac (latest version)](/lifecycle/announcements/visual-studio-mac-end-of-servicing)
   
   [!INCLUDE[](~/includes/vs-mac-eol.md)]
diff --git a/aspnetcore/includes/net-prereqs-mac-7.0.md b/aspnetcore/includes/net-prereqs-mac-7.0.md
@@ -1,3 +1,3 @@
-* [Visual Studio 2022 for Mac (latest version)](https://visualstudio.microsoft.com/vs/mac/)
+* [Visual Studio 2022 for Mac (latest version)](/lifecycle/announcements/visual-studio-mac-end-of-servicing)
   
   [!INCLUDE[](~/includes/vs-mac-eol.md)]

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-* [Visual Studio for Mac version 8.0 or later](https://visualstudio.microsoft.com/vs/mac/)`
	`1`	`+* [Visual Studio for Mac version 8.0 or later](/lifecycle/announcements/visual-studio-mac-end-of-servicing)`
`2`	`2`	`* [!INCLUDE [](~/includes/3.0-SDK.md)]`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-* [Visual Studio for Mac version 8.4 or later](https://visualstudio.microsoft.com/vs/mac/)`
	`1`	`+* [Visual Studio for Mac version 8.4 or later](/lifecycle/announcements/visual-studio-mac-end-of-servicing)`
`2`	`2`	`* [!INCLUDE [.NET Core 3.1 SDK](~/includes/3.1-SDK.md)]`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-* [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/)`
	`1`	`+* [Visual Studio for Mac](/lifecycle/announcements/visual-studio-mac-end-of-servicing)`
`2`	`2`	`* [!INCLUDE [.NET 5 SDK](~/includes/5.0-SDK.md)]`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-* [Visual Studio 2022 for Mac (latest version)](https://visualstudio.microsoft.com/vs/mac/)`
	`1`	`+* [Visual Studio 2022 for Mac (latest version)](/lifecycle/announcements/visual-studio-mac-end-of-servicing)`
`2`	`2`
`3`	`3`	`[!INCLUDE[](~/includes/vs-mac-eol.md)]`