Skip to content

Commit f45ea35

Browse files
authored
Merge pull request #48921 from dotnet/main
[publish] One off publish to test TOC fixes
2 parents 889ca82 + ec63fe8 commit f45ea35

File tree

8 files changed

+10
-112
lines changed

8 files changed

+10
-112
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "docs/core/tools/dotnet-migrate.md",
5+
"redirect_url": "/previous-versions/dotnet/fundamentals/tools/dotnet-migrate",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "docs/core/install/localized-intellisense.md",
510
"redirect_url": "/previous-versions/dotnet/core/install/localized-intellisense",

docs/azure/includes/dotnet-all.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@
426426
| Unknown Display Name | NuGet [0.8.4](https://www.nuget.org/packages/Azure.Mcp.osx-x64/0.8.4) | | |
427427
| Unknown Display Name | NuGet [0.8.4](https://www.nuget.org/packages/Azure.Mcp.win-arm64/0.8.4) | | |
428428
| Unknown Display Name | NuGet [0.8.4](https://www.nuget.org/packages/Azure.Mcp.win-x64/0.8.4) | | |
429-
| Unknown Display Name | NuGet [0.1.3-preview.2](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Aot/0.1.3-preview.2) | | |
429+
| Unknown Display Name | NuGet [0.1.4-preview.2](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Aot/0.1.4-preview.2) | | |
430430
| Unknown Display Name | NuGet [0.2.802](https://www.nuget.org/packages/Microsoft.Azure.Mcp.AzTypes.Internal.Compact/0.2.802) | | |
431431
| Unknown Display Name | NuGet [1.1.2-preview](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.AzureCosmosDb.Mongo/1.1.2-preview) | | |
432432
| Unknown Display Name | NuGet [1.46.0](https://www.nuget.org/packages/Microsoft.CognitiveServices.Speech.Extension.MAS/1.46.0) | | |
@@ -465,7 +465,7 @@
465465
| Common | NuGet [2.2.1](https://www.nuget.org/packages/Microsoft.Azure.Common/2.2.1) | | |
466466
| Common - Dependencies | NuGet [1.0.0](https://www.nuget.org/packages/Microsoft.Azure.Common.Dependencies/1.0.0) | | |
467467
| Computer Vision | NuGet [7.0.1](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Vision.ComputerVision/7.0.1) | | GitHub [7.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Vision.ComputerVision_6.0.0-preview.1/sdk/cognitiveservices/Vision.ComputerVision) |
468-
| Cosmos DB | NuGet [3.47.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.47.0)<br>NuGet [3.54.0-preview.1](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.54.0-preview.1) | [docs](/dotnet/api/overview/azure/cosmosdb) | GitHub [3.47.0](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/3.12.0/Microsoft.Azure.Cosmos) |
468+
| Cosmos DB | NuGet [3.47.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.47.0)<br>NuGet [3.55.0-preview.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.55.0-preview.0) | [docs](/dotnet/api/overview/azure/cosmosdb) | GitHub [3.47.0](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/3.12.0/Microsoft.Azure.Cosmos) |
469469
| Custom Vision Prediction | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Vision.CustomVision.Prediction/2.0.0) | | GitHub [2.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Vision.CustomVision.Prediction_2.0.0/sdk/cognitiveservices/Vision.CustomVision.Prediction) |
470470
| Custom Vision Training | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Vision.CustomVision.Training/2.0.0)<br>NuGet [2.1.0-preview](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Vision.CustomVision.Training/2.1.0-preview) | | GitHub [2.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Vision.CustomVision.Training_2.0.0/sdk/cognitiveservices/Vision.CustomVision.Training) |
471471
| Data Lake Analytics | NuGet [1.4.211011](https://www.nuget.org/packages/Microsoft.Azure.DataLake.USQL.SDK/1.4.211011) | | |

docs/core/compatibility/sdk/10.0/dotnet-restore-project-json-unsupported.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ This change can affect [source compatibility](../../categories.md#source-compati
3030

3131
The `project.json` format was originally available only in .NET Core previews (through Preview 2 of .NET Core 1.0) and was completely replaced by PackageReference in 2017. The format has been marked as deprecated since 2017.
3232

33-
When the `project.json` format was replaced, users migrated these projects using the [`dotnet migrate`](../../../tools/dotnet-migrate.md) command, but that command was removed from the CLI in the .NET Core 3.0 SDK.
33+
When the `project.json` format was replaced, users migrated these projects using the [`dotnet migrate`](/previous-versions/dotnet/fundamentals/tools/dotnet-migrate) command, but that command was removed from the CLI in the .NET Core 3.0 SDK.
3434

3535
The removal of `project.json` support completes this transition and allows the .NET team to focus on delivering a better experience for PackageReference-based projects.
3636

3737
## Recommended action
3838

3939
Migrate your `project.json` projects to use PackageReference format instead.
4040

41-
If you have .NET Core based `project.json` projects, you can use older versions of the .NET SDK that still include the [`dotnet migrate` command](../../../tools/dotnet-migrate.md) to convert them to the modern project format.
41+
If you have .NET Core based `project.json` projects, you can use older versions of the .NET SDK that still include the [`dotnet migrate` command](/previous-versions/dotnet/fundamentals/tools/dotnet-migrate) to convert them to the modern project format.
4242

4343
For more information about migrating from `project.json`, see [Migrating from project.json to .csproj](/nuget/archive/project-json#migrate-projectjson-to-packagereference).
4444

docs/core/tools/dotnet-migrate.md

Lines changed: 0 additions & 103 deletions
This file was deleted.

docs/core/tools/dotnet.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ The following options are available only when `dotnet` runs an application by us
170170
| [dotnet clean](dotnet-clean.md) | Clean build outputs. |
171171
| [dotnet exec](#options-for-running-an-application) | Runs a .NET application. |
172172
| [dotnet help](dotnet-help.md) | Shows more detailed documentation online for the command. |
173-
| [dotnet migrate](dotnet-migrate.md) | Migrates a valid Preview 2 project to a .NET Core SDK 1.0 project. |
174173
| [dotnet msbuild](dotnet-msbuild.md) | Provides access to the MSBuild command line. |
175174
| [dotnet new](dotnet-new.md) | Initializes a C# or F# project for a given template. |
176175
| [dotnet pack](dotnet-pack.md) | Creates a NuGet package of your code. |

docs/core/tools/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ The following commands are installed by default:
6464
- [`test`](dotnet-test.md)
6565
- [`vstest`](dotnet-vstest.md)
6666
- [`pack`](dotnet-pack.md)
67-
- [`migrate`](dotnet-migrate.md)
6867
- [`clean`](dotnet-clean.md)
6968
- [`sln`](dotnet-sln.md)
7069
- [`help`](dotnet-help.md)

docs/csharp/misc/cs0132.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.assetid: e8ad1281-2912-4b6a-b2af-a319a23ddd16
1212

1313
'constructor' : a static constructor must be parameterless
1414

15-
A [static](../language-reference/keywords/static.md) constructor cannot be declared with one or more parameters. For more information, see [Constructors](../programming-guide/classes-and-structs/constructors.md).
15+
A [static](../language-reference/keywords/static.md) constructor cannot be declared with one or more parameters. For more information, see [Static Constructors](../programming-guide/classes-and-structs/static-constructors.md).
1616

1717
The following sample generates CS0132:
1818

docs/navigate/tools-diagnostics/toc.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@ items:
116116
href: ../../core/tools/dotnet-format.md
117117
- name: dotnet help
118118
href: ../../core/tools/dotnet-help.md
119-
- name: dotnet migrate
120-
href: ../../core/tools/dotnet-migrate.md
121119
- name: dotnet msbuild
122120
href: ../../core/tools/dotnet-msbuild.md
123121
- name: dotnet new

0 commit comments

Comments
 (0)