Skip to content

Commit 25ec9b3

Browse files
authored
Merge pull request #1 from MicrosoftDocs/master
Merging in latest from master
2 parents 09660ae + 5bcbec1 commit 25ec9b3

File tree

15,070 files changed

+721205
-281951
lines changed

Some content is hidden

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

15,070 files changed

+721205
-281951
lines changed

.acrolinx-config.edn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{:allowed-branchname-matches ["master" "release-.*" "sandbox-.*"]
2+
:allowed-filename-matches ["docs" "mac" "scripting-docs"]}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/.vs/
2+
/.vscode/
13
log/
24
obj/
35
_site/

.localization-config

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

.openpublishing.publish.config.json

Lines changed: 93 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,135 @@
11
{
22
"build_entry_point": "docs",
3-
"need_generate_pdf": false,
4-
"need_generate_intellisense": false,
53
"docsets_to_publish": [
4+
{
5+
"docset_name": "b362ae64-b1c1-4f4d-a0af-76fe2cfdbd70",
6+
"build_source_folder": "b362ae64-b1c1-4f4d-a0af-76fe2cfdbd70",
7+
"build_output_subfolder": "b362ae64-b1c1-4f4d-a0af-76fe2cfdbd70",
8+
"locale": "en-us",
9+
"monikers": [],
10+
"moniker_ranges": [],
11+
"open_to_public_contributors": false,
12+
"type_mapping": {
13+
"Conceptual": "Content",
14+
"ManagedReference": "Content",
15+
"RestApi": "Content"
16+
},
17+
"build_entry_point": "docs",
18+
"template_folder": "_themes"
19+
},
20+
{
21+
"docset_name": "connected-environment",
22+
"build_source_folder": "connected-environment",
23+
"build_output_subfolder": "connected-environment",
24+
"locale": "en-us",
25+
"monikers": [],
26+
"moniker_ranges": [],
27+
"open_to_public_contributors": false,
28+
"type_mapping": {
29+
"Conceptual": "Content",
30+
"ManagedReference": "Content",
31+
"RestApi": "Content"
32+
},
33+
"build_entry_point": "docs",
34+
"template_folder": "_themes"
35+
},
636
{
737
"docset_name": "docs",
838
"build_source_folder": "docs",
939
"build_output_subfolder": "vsdocsdocs",
1040
"locale": "en-us",
11-
"version": 0,
41+
"monikers": [],
42+
"xref_query_tags": [
43+
"/dotnet"
44+
],
45+
"open_to_public_contributors": true,
46+
"type_mapping": {
47+
"Conceptual": "Content",
48+
"ManagedReference": "Content",
49+
"RestApi": "Content",
50+
"LandingData": "Content",
51+
"ContextObject": "Toc",
52+
"APIConnector": "Content"
53+
},
54+
"template_folder": "_themes"
55+
},
56+
{
57+
"docset_name": "mac",
58+
"build_source_folder": "mac",
59+
"build_output_subfolder": "mac",
60+
"locale": "en-us",
61+
"monikers": [],
62+
"moniker_ranges": [],
1263
"open_to_public_contributors": true,
1364
"type_mapping": {
1465
"Conceptual": "Content",
1566
"ManagedReference": "Content",
1667
"RestApi": "Content"
1768
},
18-
"template_folder": "_themes",
19-
"is_dynamic_rendering": false
69+
"build_entry_point": "docs",
70+
"template_folder": "_themes"
2071
},
2172
{
2273
"docset_name": "scripting-docs",
2374
"build_source_folder": "scripting-docs",
2475
"build_output_subfolder": "scripting-docs",
2576
"locale": "en-us",
26-
"version": 0,
77+
"monikers": [],
78+
"open_to_public_contributors": true,
79+
"type_mapping": {
80+
"Conceptual": "Content",
81+
"ManagedReference": "Content",
82+
"RestApi": "Content"
83+
},
84+
"build_entry_point": "docs",
85+
"template_folder": "_themes"
86+
},
87+
{
88+
"docset_name": "subscriptions",
89+
"build_source_folder": "subscriptions",
90+
"build_output_subfolder": "subscriptions",
91+
"locale": "en-us",
92+
"monikers": [],
93+
"moniker_ranges": [],
2794
"open_to_public_contributors": false,
2895
"type_mapping": {
2996
"Conceptual": "Content",
3097
"ManagedReference": "Content",
3198
"RestApi": "Content"
3299
},
33100
"build_entry_point": "docs",
34-
"template_folder": "_themes",
35-
"is_dynamic_rendering": false
101+
"template_folder": "_themes"
36102
}
37103
],
38104
"notification_subscribers": [],
39105
"branches_to_filter": [],
40-
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/visualstudio-docs",
106+
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/visualstudio-docs",
41107
"git_repository_branch_open_to_public_contributors": "master",
42108
"skip_source_output_uploading": false,
109+
"need_preview_pull_request": true,
110+
"contribution_branch_mappings": {},
43111
"dependent_repositories": [
44112
{
45113
"path_to_root": "_themes",
46114
"url": "https://github.com/Microsoft/templates.docs.msft",
47115
"branch": "master",
48116
"branch_mapping": {}
117+
},
118+
{
119+
"path_to_root": "_themes.pdf",
120+
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
121+
"branch": "master",
122+
"branch_mapping": {}
49123
}
50124
],
51-
"need_generate_pdf_url_template": false
125+
"branch_target_mapping": {
126+
"live": [
127+
"Publish",
128+
"Pdf"
129+
]
130+
},
131+
"need_generate_pdf_url_template": true,
132+
"targets": {},
133+
"need_generate_pdf": false,
134+
"need_generate_intellisense": false
52135
}

0 commit comments

Comments
 (0)