Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update MS external links from docs subdomain to learn subdomain #797

Merged
merged 2 commits into from
Feb 21, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .paket/Paket.Restore.targets
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<MSBuild Projects="$(PaketToolsPath)paket.bootstrapper.proj" Targets="Restore" />
</Target>

<!-- Official workaround for https://docs.microsoft.com/en-us/visualstudio/msbuild/getfilehash-task?view=vs-2019 -->
<!-- Official workaround for https://learn.microsoft.com/en-us/visualstudio/msbuild/getfilehash-task?view=vs-2019 -->
<UsingTask TaskName="Microsoft.Build.Tasks.GetFileHash" AssemblyName="Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildSupportsHashing)' == 'true' And '$(DetectedMSBuildVersion)' &lt; '16.0.360' " />
<UsingTask TaskName="Microsoft.Build.Tasks.VerifyFileHash" AssemblyName="Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildSupportsHashing)' == 'true' And '$(DetectedMSBuildVersion)' &lt; '16.0.360' " />
<Target Name="PaketRestore" Condition="'$(PaketRestoreDisabled)' != 'True'" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" DependsOnTargets="SetPaketCommand;PaketBootstrapping">
Expand Down
2 changes: 1 addition & 1 deletion docs/apidocs.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Usually the same template can be used as for [other content](content.html).

## Classic XML Doc Comments

XML Doc Comments may use [the normal F# and C# XML doc standards](https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/xmldoc/).
XML Doc Comments may use [the normal F# and C# XML doc standards](https://learn.microsoft.com/en-us/dotnet/csharp/programming-guide/xmldoc/).

The tags that form the core of the XML doc specification are:

Expand Down
2 changes: 1 addition & 1 deletion docs/content/fsdocs-default.css
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ blockquote {


/*--------------------------------------------------------------------------
Formatting tables in fsdocs-content, using docs.microsoft.com tables
Formatting tables in fsdocs-content, using learn.microsoft.com tables
/*--------------------------------------------------------------------------*/

#fsdocs-content .table {
Expand Down
2 changes: 1 addition & 1 deletion src/FSharp.Formatting.ApiDocs/GenerateModel.fs
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ type internal CrossReferenceResolver(root, collectionName, qualify, extensions)

let docs = noParen.Replace("``", "").Replace("`", "-").ToLower()

let link = sprintf "https://docs.microsoft.com/dotnet/api/%s" docs
let link = sprintf "https://learn.microsoft.com/dotnet/api/%s" docs

{ IsInternal = false
ReferenceLink = link
Expand Down
6 changes: 3 additions & 3 deletions tests/FSharp.ApiDocs.Tests/ApiDocsTests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ let ``ApiDocs test that cref generation works`` (format: OutputFormat) =
|> shouldContainText "Assembly"

files.[(sprintf "creflib4-class4.%s" format.Extension)]
|> shouldContainText "https://docs.microsoft.com/dotnet/api/system.reflection.assembly"
|> shouldContainText "https://learn.microsoft.com/dotnet/api/system.reflection.assembly"

// F# tests (at least we not not crash for them, compiler doesn't resolve anything)
// reference class in same assembly
Expand All @@ -660,7 +660,7 @@ let ``ApiDocs test that cref generation works`` (format: OutputFormat) =

files.[(sprintf "creflib2-class4.%s" format.Extension)]
|> shouldContainText "Assembly"
//files.[(sprintf "creflib2-class4.%s" format.Extension)] |> shouldContainText "https://docs.microsoft.com/dotnet/api/system.reflection.assembly"
//files.[(sprintf "creflib2-class4.%s" format.Extension)] |> shouldContainText "https://learn.microsoft.com/dotnet/api/system.reflection.assembly"

// F# tests (fully quallified)
// reference class in same assembly
Expand Down Expand Up @@ -689,7 +689,7 @@ let ``ApiDocs test that cref generation works`` (format: OutputFormat) =
|> shouldContainText "Assembly"

files.[(sprintf "creflib2-class8.%s" format.Extension)]
|> shouldContainText "https://docs.microsoft.com/dotnet/api/system.reflection.assembly"
|> shouldContainText "https://learn.microsoft.com/dotnet/api/system.reflection.assembly"

[<Test>]
[<TestCaseSource("formats")>]
Expand Down