Skip to content

Commit 1bbde2e

Browse files
Merge pull request #1 from MicrosoftDocs/master
Merge from master
2 parents cf96df0 + f3c8ee7 commit 1bbde2e

File tree

8,077 files changed

+206210
-214968
lines changed

Some content is hidden

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

8,077 files changed

+206210
-214968
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/.vs/
2+
/.vscode/
23
log/
34
obj/
45
_site/

.openpublishing.publish.config.json

Lines changed: 48 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,54 @@
11
{
22
"build_entry_point": "docs",
33
"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+
},
436
{
537
"docset_name": "docs",
638
"build_source_folder": "docs",
739
"build_output_subfolder": "vsdocsdocs",
840
"locale": "en-us",
941
"monikers": [],
42+
"xref_query_tags": [
43+
"/dotnet"
44+
],
1045
"open_to_public_contributors": true,
1146
"type_mapping": {
1247
"Conceptual": "Content",
1348
"ManagedReference": "Content",
1449
"RestApi": "Content",
1550
"LandingData": "Content",
51+
"ContextObject": "Toc",
1652
"APIConnector": "Content"
1753
},
1854
"template_folder": "_themes"
@@ -23,7 +59,8 @@
2359
"build_output_subfolder": "mac",
2460
"locale": "en-us",
2561
"monikers": [],
26-
"open_to_public_contributors": false,
62+
"moniker_ranges": [],
63+
"open_to_public_contributors": true,
2764
"type_mapping": {
2865
"Conceptual": "Content",
2966
"ManagedReference": "Content",
@@ -38,7 +75,7 @@
3875
"build_output_subfolder": "scripting-docs",
3976
"locale": "en-us",
4077
"monikers": [],
41-
"open_to_public_contributors": false,
78+
"open_to_public_contributors": true,
4279
"type_mapping": {
4380
"Conceptual": "Content",
4481
"ManagedReference": "Content",
@@ -66,7 +103,7 @@
66103
],
67104
"notification_subscribers": [],
68105
"branches_to_filter": [],
69-
"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",
70107
"git_repository_branch_open_to_public_contributors": "master",
71108
"skip_source_output_uploading": false,
72109
"need_preview_pull_request": true,
@@ -81,16 +118,8 @@
81118
{
82119
"path_to_root": "_themes.pdf",
83120
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
84-
"branch": "master"
85-
},
86-
{
87-
"path_to_root": "dotnet-xref",
88-
"url": "https://github.com/MicrosoftDocs/dotnet-xref",
89-
"branch": "live",
90-
"branch_mapping": {
91-
"live": "live",
92-
"master": "master"
93-
}
121+
"branch": "master",
122+
"branch_mapping": {}
94123
}
95124
],
96125
"branch_target_mapping": {
@@ -100,11 +129,11 @@
100129
]
101130
},
102131
"need_generate_pdf_url_template": true,
103-
"Targets": {
104-
"Pdf": {
105-
"template_folder": "_themes.pdf"
106-
}
107-
},
132+
"Targets": {
133+
"Pdf": {
134+
"template_folder": "_themes.pdf"
135+
}
136+
},
108137
"need_generate_pdf": false,
109138
"need_generate_intellisense": false
110-
}
139+
}

0 commit comments

Comments
 (0)