Skip to content

Commit 5fecad0

Browse files
authored
Merge branch 'master' into patch-3
2 parents b32e42a + 226480a commit 5fecad0

File tree

2,428 files changed

+26412
-31111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,428 files changed

+26412
-31111
lines changed

.openpublishing.publish.config.json

Lines changed: 33 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,15 @@
1212
"Conceptual": "Content",
1313
"ManagedReference": "Content",
1414
"RestApi": "Content",
15-
"AzurePsModulePage": "Content"
15+
"PowershellModule": "Content",
16+
"PowershellCmdlet": "Content"
1617
},
1718
"build_entry_point": "docs",
1819
"template_folder": "_themes",
1920
"version": 0,
20-
"customized_template_paths": [
21-
"_dependentPackages/azurecli.plugins/azurecli"
22-
],
2321
"customized_tasks": {
2422
"docset_prebuild": [
25-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
23+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
2624
]
2725
},
2826
"monikerPath": [
@@ -41,17 +39,15 @@
4139
"Conceptual": "Content",
4240
"ManagedReference": "Content",
4341
"RestApi": "Content",
44-
"AzurePsModulePage": "Content"
42+
"PowershellModule": "Content",
43+
"PowershellCmdlet": "Content"
4544
},
4645
"build_entry_point": "docs",
4746
"template_folder": "_themes",
4847
"version": 0,
49-
"customized_template_paths": [
50-
"_dependentPackages/azurecli.plugins/azurecli"
51-
],
5248
"customized_tasks": {
5349
"docset_prebuild": [
54-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
50+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
5551
]
5652
},
5753
"monikerPath": [
@@ -70,17 +66,15 @@
7066
"Conceptual": "Content",
7167
"ManagedReference": "Content",
7268
"RestApi": "Content",
73-
"AzurePsModulePage": "Content"
69+
"PowershellModule": "Content",
70+
"PowershellCmdlet": "Content"
7471
},
7572
"build_entry_point": "docs",
7673
"template_folder": "_themes",
7774
"version": 0,
78-
"customized_template_paths": [
79-
"_dependentPackages/azurecli.plugins/azurecli"
80-
],
8175
"customized_tasks": {
8276
"docset_prebuild": [
83-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
77+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
8478
]
8579
},
8680
"monikerPath": [
@@ -99,17 +93,15 @@
9993
"Conceptual": "Content",
10094
"ManagedReference": "Content",
10195
"RestApi": "Content",
102-
"AzurePsModulePage": "Content"
96+
"PowershellModule": "Content",
97+
"PowershellCmdlet": "Content"
10398
},
10499
"build_entry_point": "docs",
105100
"template_folder": "_themes",
106101
"version": 0,
107-
"customized_template_paths": [
108-
"_dependentPackages/azurecli.plugins/azurecli"
109-
],
110102
"customized_tasks": {
111103
"docset_prebuild": [
112-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
104+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
113105
]
114106
},
115107
"monikerPath": [
@@ -128,17 +120,15 @@
128120
"Conceptual": "Content",
129121
"ManagedReference": "Content",
130122
"RestApi": "Content",
131-
"AzurePsModulePage": "Content"
123+
"PowershellModule": "Content",
124+
"PowershellCmdlet": "Content"
132125
},
133126
"build_entry_point": "docs",
134127
"template_folder": "_themes",
135128
"version": 0,
136-
"customized_template_paths": [
137-
"_dependentPackages/azurecli.plugins/azurecli"
138-
],
139129
"customized_tasks": {
140130
"docset_prebuild": [
141-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
131+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
142132
]
143133
},
144134
"monikerPath": [
@@ -157,17 +147,15 @@
157147
"Conceptual": "Content",
158148
"ManagedReference": "Content",
159149
"RestApi": "Content",
160-
"AzurePsModulePage": "Content"
150+
"PowershellModule": "Content",
151+
"PowershellCmdlet": "Content"
161152
},
162153
"build_entry_point": "docs",
163154
"template_folder": "_themes",
164155
"version": 0,
165-
"customized_template_paths": [
166-
"_dependentPackages/azurecli.plugins/azurecli"
167-
],
168156
"customized_tasks": {
169157
"docset_prebuild": [
170-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
158+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
171159
]
172160
},
173161
"monikerPath": [
@@ -186,17 +174,15 @@
186174
"Conceptual": "Content",
187175
"ManagedReference": "Content",
188176
"RestApi": "Content",
189-
"AzurePsModulePage": "Content"
177+
"PowershellModule": "Content",
178+
"PowershellCmdlet": "Content"
190179
},
191180
"build_entry_point": "docs",
192181
"template_folder": "_themes",
193182
"version": 0,
194-
"customized_template_paths": [
195-
"_dependentPackages/azurecli.plugins/azurecli"
196-
],
197183
"customized_tasks": {
198184
"docset_prebuild": [
199-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
185+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
200186
]
201187
},
202188
"monikerPath": [
@@ -215,17 +201,15 @@
215201
"Conceptual": "Content",
216202
"ManagedReference": "Content",
217203
"RestApi": "Content",
218-
"AzurePsModulePage": "Content"
204+
"PowershellModule": "Content",
205+
"PowershellCmdlet": "Content"
219206
},
220207
"build_entry_point": "docs",
221208
"template_folder": "_themes",
222209
"version": 0,
223-
"customized_template_paths": [
224-
"_dependentPackages/azurecli.plugins/azurecli"
225-
],
226210
"customized_tasks": {
227211
"docset_prebuild": [
228-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
212+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
229213
]
230214
},
231215
"monikerPath": [
@@ -263,17 +247,14 @@
263247
"need_generate_intellisense": false,
264248
"dependent_packages": [
265249
{
266-
"path_to_root": "_dependentPackages/azurecli.plugins",
267-
"id": "opbuild.templates.azurecli",
268-
"version": "latest",
269-
"nuget_feed": "https://www.myget.org/F/op/api/v2"
270-
},
271-
{
272-
"path_to_root": "_dependentPackages/CommonPlugins",
250+
"id": "Microsoft.DocAsCode.MAML2Yaml",
251+
"nuget_feed": "https://www.myget.org/F/op/api/v2",
252+
"path_to_root": "_dependentPackages/MAML2Yaml",
273253
"target_framework": "net45",
274-
"version": "latest",
275-
"id": "Microsoft.OpenPublishing.CommonPlugins",
276-
"nuget_feed": "https://www.myget.org/F/op/api/v2"
254+
"version": "latest"
277255
}
278-
]
279-
}
256+
],
257+
"docs_build_engine": {
258+
"name": "docfx_v3"
259+
}
260+
}

0 commit comments

Comments
 (0)