Merge pull request #8212 from dotnet/v3-9019f386b

🚢🚢🚢
dotnet · Oct 14, 2022 · 9e3c31b · 9e3c31b
2 parents 746a8e2 + 3526925
commit 9e3c31b
Show file tree

Hide file tree

Showing 37 changed files with 503 additions and 129 deletions.
diff --git a/docs/specs/config.yml b/docs/specs/config.yml
@@ -207,8 +207,8 @@ outputs:
   .publish.json: |
     {
       "files": [
-        { "redirect_url": "/absolute/path" },
-        { "url": "/docs/a" }
+        { "url": "/docs/a" },
+        { "redirect_url": "/absolute/path" }
       ]
     }
 ---
@@ -547,3 +547,28 @@ outputs:
     {"document_id":"c871e0da-be84-d8ce-ce09-6d935e69b172","document_version_independent_id":"2c52aff4-0602-cfcd-e12f-269c5629bdd8"}
   src/dir1/a.json: |
     {"document_id":"b998d1b1-aaed-698d-7b82-0bc93b0b7ba5","document_version_independent_id":"2db8730f-5266-6c4f-6a6b-7db32fcff3b3"}
+---
+# template branch must be main or master or default when validation is enabled
+inputs:
+  docfx.yml: |
+    validateTemplateBranch: true
+    template: https://docs.com/theme#test
+outputs:
+  .errors.log: |
+    {"message_severity":"error","code":"template-branch-invalid","message":"Invalid template branch: 'test'. Template branch must be 'main' or 'master' or default."}
+---
+# template branch must be main or master or default when validation is enabled
+inputs:
+  docfx.yml: |
+    validateTemplateBranch: true
+    template: https://docs.com/template#main
+outputs:
+  .errors.log:
+---
+# template branch must be main or master or default when validation is enabled
+inputs:
+  docfx.yml: |
+    validateTemplateBranch: true
+    template: https://docs.com/template
+outputs:
+  .errors.log:
diff --git a/docs/specs/escape.yml b/docs/specs/escape.yml
@@ -35,8 +35,8 @@ outputs:
         { "url": "/a b", "path": "a b.json" },
         { "url": "/a&amp;b", "path": "a&amp;b.json" },
         { "url": "/a&b", "path": "a&b.json" },
-        { "url": "/a++.png", "path": "a++.png" },
-        { "url": "/links", "path": "links.json" }
+        { "url": "/links", "path": "links.json" },
+        { "url": "/a++.png", "path": "a++.png" }
       ]
     }
   'a b.json': |

diff --git a/docs/specs/git.yml b/docs/specs/git.yml
@@ -459,8 +459,6 @@ repos:
           Osmond creates this
 inputs:
   docfx.yml: |
-    secrets:
-      githubToken: {DOCS_GITHUB_TOKEN}
     editRepositoryUrl: /~https://github.com/is/github-repo
 cache:
   github-users.json: |

diff --git a/docs/specs/legacy.yml b/docs/specs/legacy.yml
@@ -140,10 +140,6 @@ outputs:
   rawmetadata/index.json:
   .publish.json: |
     {"files": [
-      {
-        "url": "/rawmetadata/a",
-        "redirect_url": "/b"
-      }, 
       {
         "url": "/rawmetadata/c",
         "path": "rawmetadata/c.json",
@@ -168,15 +164,19 @@ outputs:
         "_path": "c.json",
         "_op_canonicalUrlPrefix": "https://docs.com/en-us/rawmetadata/"
       },
-      {
-        "url": "/rawmetadata/d.png"
-      },
       {
         "url": "/rawmetadata/",
         "document_id": "c115ee68-f136-8518-0a52-d614ddd68b18",
         "_path": "index.json",
           "contributors": undefined
       },
+      {
+        "url": "/rawmetadata/a",
+        "redirect_url": "/b"
+      },
+      {
+        "url": "/rawmetadata/d.png"
+      },
       {
         "url": "/rawmetadata/toc.json"
       }]

diff --git a/docs/specs/moniker.yml b/docs/specs/moniker.yml
@@ -184,10 +184,10 @@ outputs:
   .publish.json: |
     {
       "files":[
-        {"url":"/docs/c","moniker_group":"17b9fe681514513cbf7d5c90e32f107a"},
-        {"url":"/docs/c","moniker_group":"ecc061f43156f37be077db42abf8301a"},
         {"url":"/docs/a","moniker_group":"17b9fe681514513cbf7d5c90e32f107a"},
-        {"url":"/docs/b","moniker_group":"ecc061f43156f37be077db42abf8301a"}
+        {"url":"/docs/b","moniker_group":"ecc061f43156f37be077db42abf8301a"},
+        {"url":"/docs/c","moniker_group":"17b9fe681514513cbf7d5c90e32f107a"},
+        {"url":"/docs/c","moniker_group":"ecc061f43156f37be077db42abf8301a"}
       ],
       "moniker_groups":{
         "ecc061f43156f37be077db42abf8301a":["netcore-2.0"],
@@ -238,12 +238,12 @@ outputs:
   .publish.json: |
     {
       "files": [
-        { "url": "/docs/a-old", "redirect_url": "/docs/a", "moniker_group": "55a4a18f941221e4d8924d8ebc96dd6c" },
-        { "url": "/docs/a-old", "redirect_url": "/docs/a", "moniker_group": "9b52f68bce2b10c7aa018b696f8ca916" },
-        { "url": "/docs/b-old", "redirect_url": "/docs/b" },
         { "url": "/docs/a", "moniker_group": "55a4a18f941221e4d8924d8ebc96dd6c" },
         { "url": "/docs/a", "moniker_group": "9b52f68bce2b10c7aa018b696f8ca916" },
-        { "url": "/docs/b" }
+        { "url": "/docs/b" },
+        { "url": "/docs/a-old", "redirect_url": "/docs/a", "moniker_group": "55a4a18f941221e4d8924d8ebc96dd6c" },
+        { "url": "/docs/a-old", "redirect_url": "/docs/a", "moniker_group": "9b52f68bce2b10c7aa018b696f8ca916" },
+        { "url": "/docs/b-old", "redirect_url": "/docs/b" }
       ],
       "moniker_groups": {
         "55a4a18f941221e4d8924d8ebc96dd6c": ["netcore-1.1"],
@@ -289,9 +289,9 @@ outputs:
   .publish.json: |
     {
       "files": [
-        { "url": "/docs/a-old", "redirect_url": "/docs/a", "moniker_group": "78a0a559ed7f8a30d90c683a57012297" },
         { "url": "/docs/a", "moniker_group": "9b52f68bce2b10c7aa018b696f8ca916" },
-        { "url": "/docs/a", "moniker_group": "ecc061f43156f37be077db42abf8301a" }
+        { "url": "/docs/a", "moniker_group": "ecc061f43156f37be077db42abf8301a" },
+        { "url": "/docs/a-old", "redirect_url": "/docs/a", "moniker_group": "78a0a559ed7f8a30d90c683a57012297" }
       ],
       "moniker_groups": {
         "ecc061f43156f37be077db42abf8301a": ["netcore-2.0"],
@@ -337,9 +337,9 @@ outputs:
   .publish.json: |
     {
       "files": [
-        { "url": "/docs/a-old", "redirect_url": "/docs/a", "moniker_group": "55a4a18f941221e4d8924d8ebc96dd6c" },
-        { "url": "/docs/a-old", "redirect_url": "/docs/a", "moniker_group": "9b52f68bce2b10c7aa018b696f8ca916" },
         { "url": "/docs/a", "moniker_group": "17b9fe681514513cbf7d5c90e32f107a" },
+        { "url": "/docs/a-old", "redirect_url": "/docs/a", "moniker_group": "55a4a18f941221e4d8924d8ebc96dd6c" },
+        { "url": "/docs/a-old", "redirect_url": "/docs/a", "moniker_group": "9b52f68bce2b10c7aa018b696f8ca916" }
       ],
       "moniker_groups": {
         "9b52f68bce2b10c7aa018b696f8ca916": [ "netcore-1.0" ],
@@ -393,9 +393,9 @@ outputs:
     {
       "files": 
       [
-        {"url": "/docs/a-old", "moniker_group": "cb8e4dad4d4bcb3bdefdfe9f87ccffda", "config_moniker_range": ">= netcore-1.1 <= netcore-1.2", "redirect_url": "/docs/a"},
         {"url": "/docs/a", "path": "17b9fe681514513cbf7d5c90e32f107a/docs/a.json"},
         {"url": "/docs/a", "path": "98db214cbec40e19feee113edb10edb0/docs/a.json"},
+        {"url": "/docs/a-old", "moniker_group": "cb8e4dad4d4bcb3bdefdfe9f87ccffda", "config_moniker_range": ">= netcore-1.1 <= netcore-1.2", "redirect_url": "/docs/a"}
       ]
     }
   .errors.log: |
@@ -1300,8 +1300,8 @@ outputs:
     {
       "files": [
         { "url": "/docs/a", "path": "9b52f68bce2b10c7aa018b696f8ca916/docs/a.json", "moniker_group": "9b52f68bce2b10c7aa018b696f8ca916" },
-        { "url": "/docs/c.png", "path": "9b52f68bce2b10c7aa018b696f8ca916/docs/c.png", "moniker_group": "9b52f68bce2b10c7aa018b696f8ca916" },
         { "url": "/docs/a", "path": "ecc061f43156f37be077db42abf8301a/docs/a.json", "moniker_group": "ecc061f43156f37be077db42abf8301a" },
+        { "url": "/docs/c.png", "path": "9b52f68bce2b10c7aa018b696f8ca916/docs/c.png", "moniker_group": "9b52f68bce2b10c7aa018b696f8ca916" },
         { "url": "/docs/c.png", "path": "ecc061f43156f37be077db42abf8301a/docs/c.png", "moniker_group": "ecc061f43156f37be077db42abf8301a" },
       ],
       "moniker_groups": {

diff --git a/docs/specs/ops.yml b/docs/specs/ops.yml
@@ -192,18 +192,18 @@ outputs:
   .publish.json: |
     {
       "files": [
+        {
+            "url": "/basics/teams-integration",
+            "canonical_url": "https://docs.com/en-us/basics/teams-integration",
+            "document_id": "86d28ab4-cd6a-a5a2-df73-92b1a0f52914",
+            "document_version_independent_id": "86d28ab4-cd6a-a5a2-df73-92b1a0f52914",
+        },
         {
             "url": "/admin/integrate-with-microsoft-teams",
             "redirect_url": "/admin/basics/teams-integration",
             "document_id": "b1c6c9d3-40a8-a21d-98e8-a3cbf54eaeb4",
             "document_version_independent_id": "b1c6c9d3-40a8-a21d-98e8-a3cbf54eaeb4",
             "canonical_url": "https://docs.com/en-us/admin/integrate-with-microsoft-teams"
-        },
-        {
-            "url": "/basics/teams-integration",
-            "canonical_url": "https://docs.com/en-us/basics/teams-integration",
-            "document_id": "86d28ab4-cd6a-a5a2-df73-92b1a0f52914",
-            "document_version_independent_id": "86d28ab4-cd6a-a5a2-df73-92b1a0f52914",
         }
       ]
     }

diff --git a/docs/specs/output.yml b/docs/specs/output.yml
@@ -730,9 +730,9 @@ outputs:
   .publish.json: |
     {
       "files": [
-        {"url": "/a", "source_path": "a/original.xml", "has_error": true },
         {"url": "/b", "source_path": "a/b.original.xml"},
         {"url": "/c", "source_path": "a/original.xml"},
+        {"url": "/a", "source_path": "a/original.xml", "has_error": true }
       ]
     }
 ---
@@ -900,14 +900,14 @@ outputs:
    .publish.json: |
       {
         "files": [
-          {
-              "source_path": undefined,
-              "source_url": undefined,             
-          },
           {
               "source_path": "a.md",
               "source_url": "/~https://github.com/test/repo/blob/main/a.md"
           },
+          {
+              "source_path": undefined,
+              "source_url": undefined,             
+          },
           {
               "source_path": "image.png",
               "source_url": "/~https://github.com/test/repo/blob/main/image.png"

diff --git a/docs/specs/redirection.yml b/docs/specs/redirection.yml
@@ -91,8 +91,8 @@ inputs:
 outputs:
   .publish.json: |
     {"files":[
-      {"url":"/a", "document_id":"65b4ee15-e7e4-88ee-72ec-7be7d0bcd895", "canonical_url": "https://docs.com/en-us/a", "document_version_independent_id": "65b4ee15-e7e4-88ee-72ec-7be7d0bcd895"}, 
-      {"url":"/b", "document_id":"65b4ee15-e7e4-88ee-72ec-7be7d0bcd895"}
+      {"url":"/b", "document_id":"65b4ee15-e7e4-88ee-72ec-7be7d0bcd895"},
+      {"url":"/a", "document_id":"65b4ee15-e7e4-88ee-72ec-7be7d0bcd895", "canonical_url": "https://docs.com/en-us/a", "document_version_independent_id": "65b4ee15-e7e4-88ee-72ec-7be7d0bcd895"}
     ]}
   b.json: |
    {"document_id": "65b4ee15-e7e4-88ee-72ec-7be7d0bcd895", "document_version_independent_id": "65b4ee15-e7e4-88ee-72ec-7be7d0bcd895"}
@@ -113,9 +113,9 @@ outputs:
   .publish.json: |
     {
         "files": [
+            { "url": "/docs/path1" },
             { "url": "/a" },
-            { "url": "/b" },
-            { "url": "/docs/path1" }
+            { "url": "/b" }
         ]
     }
   docs/path1.json: |
@@ -191,16 +191,16 @@ outputs:
   develop/.publish.json: |
     {
       "files": [
-          {
-              "url": "/partner-center-sdk/agreement-metadata",              
-              "locale": "en-us",
-              "redirect_url": "/partner-center-sdk/agreement-metadata-resources"
-          },
           {
               "url": "/partner-center-sdk/agreement-metadata-resources",
               "path": "partner-center-sdk/agreement-metadata-resources.json",
               "source_path": "agreement-metadata-resources.md",
               "locale": "en-us"
+          },
+          {
+              "url": "/partner-center-sdk/agreement-metadata",              
+              "locale": "en-us",
+              "redirect_url": "/partner-center-sdk/agreement-metadata-resources"
           }
       ]
     }
@@ -825,9 +825,9 @@ outputs:
   a/.publish.json: |
     {
       "files": [
+        {"url": "/aa", "locale": "en-us"},
         {"url": "/a", "locale": "en-us", "redirect_url": "/aa"},
-        {"url": "/b", "locale": "en-us"},
-        {"url": "/aa", "locale": "en-us"}
+        {"url": "/b", "locale": "en-us"}
       ]
     }
   .errors.log: |
@@ -1030,6 +1030,16 @@ outputs:
           "product": "product",
           "base_path": "/",
           "files": [
+              {
+                  "url": "/folder/",
+                  "path": "folder/index.json",
+                  "source_path": "folder/index.md",
+                  "canonical_url": "https://docs.com/en-us/folder/",
+                  "document_id": "87407f22-7c8e-317e-430d-96980c2fd1a6",
+                  "document_version_independent_id": "87407f22-7c8e-317e-430d-96980c2fd1a6",
+                  "site_name": "Docs",
+                  "depot_name": "product.docset",
+              },
               {
                   "url": "/original",
                   "redirect_url": "/folder/a",
@@ -1071,16 +1081,6 @@ outputs:
                   "document_id": "3c570421-59fc-1dc7-d86a-43dbdf5d391b",
                   "document_version_independent_id": "3c570421-59fc-1dc7-d86a-43dbdf5d391b",
                   "canonical_url": "https://docs.com/en-us/original6"
-              },
-              {
-                  "url": "/folder/",
-                  "path": "folder/index.json",
-                  "source_path": "folder/index.md",
-                  "canonical_url": "https://docs.com/en-us/folder/",
-                  "document_id": "87407f22-7c8e-317e-430d-96980c2fd1a6",
-                  "document_version_independent_id": "87407f22-7c8e-317e-430d-96980c2fd1a6",
-                  "site_name": "Docs",
-                  "depot_name": "product.docset",
               }
           ]
       }
@@ -1120,7 +1120,18 @@ outputs:
         "name": "docset",
         "product": "product",
         "base_path": "/",
-        "files": [
+        "files": [           
+            {
+                "url": "/folder/",
+                "path": "folder/index.json",
+                "source_path": "folder/index.md",
+                "locale": "en-us",
+                "canonical_url": "https://docs.com/en-us/folder/",
+                "document_id": "87407f22-7c8e-317e-430d-96980c2fd1a6",
+                "document_version_independent_id": "87407f22-7c8e-317e-430d-96980c2fd1a6",
+                "site_name": "Docs",
+                "depot_name": "product.docset",
+            },
             {
                 "url": "/original",
                 "locale": "en-us",
@@ -1136,17 +1147,6 @@ outputs:
                 "document_id": "0e929cdb-46ae-915a-031f-4c6f8e8f6a1a",
                 "document_version_independent_id": "0e929cdb-46ae-915a-031f-4c6f8e8f6a1a",
                 "canonical_url": "https://docs.com/en-us/original2"
-            },           
-            {
-                "url": "/folder/",
-                "path": "folder/index.json",
-                "source_path": "folder/index.md",
-                "locale": "en-us",
-                "canonical_url": "https://docs.com/en-us/folder/",
-                "document_id": "87407f22-7c8e-317e-430d-96980c2fd1a6",
-                "document_version_independent_id": "87407f22-7c8e-317e-430d-96980c2fd1a6",
-                "site_name": "Docs",
-                "depot_name": "product.docset",
             }
         ]
     }

diff --git a/docs/specs/static.yml b/docs/specs/static.yml
@@ -129,8 +129,8 @@ outputs:
     {
       "files": [
         {"url": "/a/", "additional": "additional"},
-        {"url": "/b.png"},
-        {"url": "/"}
+        {"url": "/"},
+        {"url": "/b.png"}
       ]
     }
 ---
@@ -168,8 +168,8 @@ outputs:
   .publish.json: |
     {
       "files": [
-        { "url": "/a.html", "redirect_url": "/b.html" },
-        { "url": "/b.html"}
+        { "url": "/b.html"},
+        { "url": "/a.html", "redirect_url": "/b.html" }
       ]
     }
 ---

diff --git a/docs/specs/toc/service-page.yml b/docs/specs/toc/service-page.yml
@@ -793,11 +793,6 @@ outputs:
   a/.publish.json: |
     {
       "files": [
-        {
-          "url": "/api/bot/toc.json",
-          "path": "api/bot/toc.json",
-          "source_path": "api/bot/toc.yml"
-        },
         {
           "url": "/docs/",
           "path": "cfcd556ac4916a1bf6fe758453d01e39/docs/index.json",
@@ -806,6 +801,11 @@ outputs:
           "moniker_group": "cfcd556ac4916a1bf6fe758453d01e39",
           "_path": "docs/index.json",
           "monikers": ["v-0.1", "v-0.2"]
+        },
+        {
+          "url": "/api/bot/toc.json",
+          "path": "api/bot/toc.json",
+          "source_path": "api/bot/toc.yml"
         }
       ]
     }