diff --git a/docfx/Docfx.App.dll b/docfx/Docfx.App.dll index d1b3737..79853eb 100644 Binary files a/docfx/Docfx.App.dll and b/docfx/Docfx.App.dll differ diff --git a/docfx/Docfx.App.pdb b/docfx/Docfx.App.pdb index 375c0f2..a6c67e3 100644 Binary files a/docfx/Docfx.App.pdb and b/docfx/Docfx.App.pdb differ diff --git a/docfx/Docfx.Build.Common.dll b/docfx/Docfx.Build.Common.dll index 8f7a4e0..19c67e7 100644 Binary files a/docfx/Docfx.Build.Common.dll and b/docfx/Docfx.Build.Common.dll differ diff --git a/docfx/Docfx.Build.Common.pdb b/docfx/Docfx.Build.Common.pdb index ea783b6..db8fa6f 100644 Binary files a/docfx/Docfx.Build.Common.pdb and b/docfx/Docfx.Build.Common.pdb differ diff --git a/docfx/Docfx.Build.ManagedReference.dll b/docfx/Docfx.Build.ManagedReference.dll index 8261377..190990d 100644 Binary files a/docfx/Docfx.Build.ManagedReference.dll and b/docfx/Docfx.Build.ManagedReference.dll differ diff --git a/docfx/Docfx.Build.ManagedReference.pdb b/docfx/Docfx.Build.ManagedReference.pdb index e3c08cd..8f3f53d 100644 Binary files a/docfx/Docfx.Build.ManagedReference.pdb and b/docfx/Docfx.Build.ManagedReference.pdb differ diff --git a/docfx/Docfx.Build.OverwriteDocuments.dll b/docfx/Docfx.Build.OverwriteDocuments.dll index 3aa14ac..f104106 100644 Binary files a/docfx/Docfx.Build.OverwriteDocuments.dll and b/docfx/Docfx.Build.OverwriteDocuments.dll differ diff --git a/docfx/Docfx.Build.OverwriteDocuments.pdb b/docfx/Docfx.Build.OverwriteDocuments.pdb index 8ae4c56..e253c8f 100644 Binary files a/docfx/Docfx.Build.OverwriteDocuments.pdb and b/docfx/Docfx.Build.OverwriteDocuments.pdb differ diff --git a/docfx/Docfx.Build.RestApi.dll b/docfx/Docfx.Build.RestApi.dll index 7293943..0981405 100644 Binary files a/docfx/Docfx.Build.RestApi.dll and b/docfx/Docfx.Build.RestApi.dll differ diff --git a/docfx/Docfx.Build.RestApi.pdb b/docfx/Docfx.Build.RestApi.pdb index cdd54e0..f55b3ea 100644 Binary files a/docfx/Docfx.Build.RestApi.pdb and b/docfx/Docfx.Build.RestApi.pdb differ diff --git a/docfx/Docfx.Build.SchemaDriven.dll b/docfx/Docfx.Build.SchemaDriven.dll index 2dcf165..ad67d19 100644 Binary files a/docfx/Docfx.Build.SchemaDriven.dll and b/docfx/Docfx.Build.SchemaDriven.dll differ diff --git a/docfx/Docfx.Build.SchemaDriven.pdb b/docfx/Docfx.Build.SchemaDriven.pdb index e167f57..6885b87 100644 Binary files a/docfx/Docfx.Build.SchemaDriven.pdb and b/docfx/Docfx.Build.SchemaDriven.pdb differ diff --git a/docfx/Docfx.Build.UniversalReference.dll b/docfx/Docfx.Build.UniversalReference.dll index a18b290..f66ff41 100644 Binary files a/docfx/Docfx.Build.UniversalReference.dll and b/docfx/Docfx.Build.UniversalReference.dll differ diff --git a/docfx/Docfx.Build.UniversalReference.pdb b/docfx/Docfx.Build.UniversalReference.pdb index 34521a6..26c2d84 100644 Binary files a/docfx/Docfx.Build.UniversalReference.pdb and b/docfx/Docfx.Build.UniversalReference.pdb differ diff --git a/docfx/Docfx.Build.dll b/docfx/Docfx.Build.dll index b892b79..33a0f08 100644 Binary files a/docfx/Docfx.Build.dll and b/docfx/Docfx.Build.dll differ diff --git a/docfx/Docfx.Build.pdb b/docfx/Docfx.Build.pdb index f0029da..92bcc17 100644 Binary files a/docfx/Docfx.Build.pdb and b/docfx/Docfx.Build.pdb differ diff --git a/docfx/Docfx.Common.dll b/docfx/Docfx.Common.dll index 5c859f0..0d1e554 100644 Binary files a/docfx/Docfx.Common.dll and b/docfx/Docfx.Common.dll differ diff --git a/docfx/Docfx.Common.pdb b/docfx/Docfx.Common.pdb index 0f89653..870f60c 100644 Binary files a/docfx/Docfx.Common.pdb and b/docfx/Docfx.Common.pdb differ diff --git a/docfx/Docfx.DataContracts.Common.dll b/docfx/Docfx.DataContracts.Common.dll index d755a51..e6d7c4b 100644 Binary files a/docfx/Docfx.DataContracts.Common.dll and b/docfx/Docfx.DataContracts.Common.dll differ diff --git a/docfx/Docfx.DataContracts.Common.pdb b/docfx/Docfx.DataContracts.Common.pdb index 8e907b7..3547717 100644 Binary files a/docfx/Docfx.DataContracts.Common.pdb and b/docfx/Docfx.DataContracts.Common.pdb differ diff --git a/docfx/Docfx.DataContracts.RestApi.dll b/docfx/Docfx.DataContracts.RestApi.dll index e43f451..da1309a 100644 Binary files a/docfx/Docfx.DataContracts.RestApi.dll and b/docfx/Docfx.DataContracts.RestApi.dll differ diff --git a/docfx/Docfx.DataContracts.RestApi.pdb b/docfx/Docfx.DataContracts.RestApi.pdb index 2abd3c3..1a65921 100644 Binary files a/docfx/Docfx.DataContracts.RestApi.pdb and b/docfx/Docfx.DataContracts.RestApi.pdb differ diff --git a/docfx/Docfx.DataContracts.UniversalReference.dll b/docfx/Docfx.DataContracts.UniversalReference.dll index 3498154..9bc55cb 100644 Binary files a/docfx/Docfx.DataContracts.UniversalReference.dll and b/docfx/Docfx.DataContracts.UniversalReference.dll differ diff --git a/docfx/Docfx.DataContracts.UniversalReference.pdb b/docfx/Docfx.DataContracts.UniversalReference.pdb index 5a045ec..585184e 100644 Binary files a/docfx/Docfx.DataContracts.UniversalReference.pdb and b/docfx/Docfx.DataContracts.UniversalReference.pdb differ diff --git a/docfx/Docfx.Dotnet.dll b/docfx/Docfx.Dotnet.dll index e650bf1..f1f5847 100644 Binary files a/docfx/Docfx.Dotnet.dll and b/docfx/Docfx.Dotnet.dll differ diff --git a/docfx/Docfx.Dotnet.pdb b/docfx/Docfx.Dotnet.pdb index 46dcd5a..bcae695 100644 Binary files a/docfx/Docfx.Dotnet.pdb and b/docfx/Docfx.Dotnet.pdb differ diff --git a/docfx/Docfx.Glob.dll b/docfx/Docfx.Glob.dll index bacf020..861b357 100644 Binary files a/docfx/Docfx.Glob.dll and b/docfx/Docfx.Glob.dll differ diff --git a/docfx/Docfx.Glob.pdb b/docfx/Docfx.Glob.pdb index 2373e57..b964fdf 100644 Binary files a/docfx/Docfx.Glob.pdb and b/docfx/Docfx.Glob.pdb differ diff --git a/docfx/Docfx.MarkdigEngine.Extensions.dll b/docfx/Docfx.MarkdigEngine.Extensions.dll index f309800..73c4574 100644 Binary files a/docfx/Docfx.MarkdigEngine.Extensions.dll and b/docfx/Docfx.MarkdigEngine.Extensions.dll differ diff --git a/docfx/Docfx.MarkdigEngine.Extensions.pdb b/docfx/Docfx.MarkdigEngine.Extensions.pdb index ab7e1cd..fd7d8d9 100644 Binary files a/docfx/Docfx.MarkdigEngine.Extensions.pdb and b/docfx/Docfx.MarkdigEngine.Extensions.pdb differ diff --git a/docfx/Docfx.MarkdigEngine.dll b/docfx/Docfx.MarkdigEngine.dll index 093ef7e..027c2f7 100644 Binary files a/docfx/Docfx.MarkdigEngine.dll and b/docfx/Docfx.MarkdigEngine.dll differ diff --git a/docfx/Docfx.MarkdigEngine.pdb b/docfx/Docfx.MarkdigEngine.pdb index 83a9a99..bfe32ad 100644 Binary files a/docfx/Docfx.MarkdigEngine.pdb and b/docfx/Docfx.MarkdigEngine.pdb differ diff --git a/docfx/Docfx.Plugins.dll b/docfx/Docfx.Plugins.dll index a101cbc..53fe441 100644 Binary files a/docfx/Docfx.Plugins.dll and b/docfx/Docfx.Plugins.dll differ diff --git a/docfx/Docfx.Plugins.pdb b/docfx/Docfx.Plugins.pdb index fc10492..6aa4917 100644 Binary files a/docfx/Docfx.Plugins.pdb and b/docfx/Docfx.Plugins.pdb differ diff --git a/docfx/Docfx.YamlSerialization.dll b/docfx/Docfx.YamlSerialization.dll index f5c2e8f..04afae7 100644 Binary files a/docfx/Docfx.YamlSerialization.dll and b/docfx/Docfx.YamlSerialization.dll differ diff --git a/docfx/Docfx.YamlSerialization.pdb b/docfx/Docfx.YamlSerialization.pdb index f4d3497..8dcb2ea 100644 Binary files a/docfx/Docfx.YamlSerialization.pdb and b/docfx/Docfx.YamlSerialization.pdb differ diff --git a/docfx/README.md b/docfx/README.md index de30052..e9b88cf 100644 --- a/docfx/README.md +++ b/docfx/README.md @@ -25,6 +25,14 @@ The assembly is a component of the identity, not a namespace segment: `LinqToDB` in titles, breadcrumbs and links, and only the UID and the file name carry the assembly (`::` becomes `--` in file names, as `:` is not legal there). +Nothing displayed names the assembly, because `assemblyLabel` is left at its default of `none`. The +previous vendored build appended it to every namespace, so the table of contents read +`LinqToDB (linq2db.Tools)` and so did the page titles, on the 34 namespaces only one assembly declares as +well as the 6 more than one does. Setting `assemblyLabel` to `shared` would not change this site either: +it compares the namespaces of a single `metadata` entry, and every entry here documents one assembly, so +the collisions it would label are all across entries where they cannot be seen. `suffix` on the colliding +entries is the option if the assembly should ever be named. + This replaces the older `globalPrefix` hack, which produced a malformed `commentId`, unprefixed namespace and type hrefs, and ~1200 dead in-page anchors, and the `assemblyUidPrefixes` / `uidPrefixOverride` pair before it, which spelled the assembly as a leading namespace segment and so @@ -33,7 +41,7 @@ surfaced in page titles and the table of contents as a namespace that does not e ## How this build is produced Branch: [`fix/8966-uid-prefixes`](https://github.com/MaceWindu/docfx/pull/2) in -, currently `9907932d6` — the branch proposed for upstream, with +, currently `beda63b23` — the branch proposed for upstream, with nothing added on top. The previous build needed one extra commit bumping Roslyn to 5.6.0, because with Roslyn 5.0.0 and the @@ -55,7 +63,7 @@ dotnet build src/docfx/docfx.csproj -c Release -f net10.0 `docfx.exe --version` prints the source commit, so the vendored build can always be traced back: ``` -1.0.0+9907932d6be6ad503885fc5c3c166ae4ce952be9 +1.0.0+beda63b230d24f8a4b9a0e09fc4e690e36510fd2 ``` ## When can this go away diff --git a/docfx/docfx.dll b/docfx/docfx.dll index ccd8b28..2340c5e 100644 Binary files a/docfx/docfx.dll and b/docfx/docfx.dll differ diff --git a/docfx/docfx.exe b/docfx/docfx.exe index 324fb02..23ea0f1 100644 Binary files a/docfx/docfx.exe and b/docfx/docfx.exe differ diff --git a/docfx/docfx.pdb b/docfx/docfx.pdb index 256036f..50cce36 100644 Binary files a/docfx/docfx.pdb and b/docfx/docfx.pdb differ diff --git a/source/docfx.json b/source/docfx.json index 1a7502b..508c8f6 100644 --- a/source/docfx.json +++ b/source/docfx.json @@ -14,8 +14,9 @@ // here, not only the ones whose namespaces collide. // // The assembly is not part of the namespace, so pages, titles and links keep naming the namespaces as - // they are declared. `LinqToDB` reads as `LinqToDB` everywhere, and the assembly is what the table of - // contents groups by. + // they are declared: `LinqToDB` reads as `LinqToDB` everywhere, and only the UID and the file name + // carry the assembly. `assemblyLabel` is left unset, which is what keeps it that way; setting it to + // `suffix` would append the assembly to every namespace label and page title. // // LinqToDB.Identity is deliberately absent: its namespace does not collide and nothing else here // references it.