Skip to content

Commit 79c4d01

Browse files
ghogenghogen
committed
Merge branch 'master' of github.com:MicrosoftDocs/visualstudio-docs-pr into repo_sync_working_branch
2 parents 3007030 + 1d263f8 commit 79c4d01

File tree

4 files changed

+159
-155
lines changed

4 files changed

+159
-155
lines changed

‎.openpublishing.publish.config.json

Lines changed: 152 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -1,153 +1,153 @@
1-
{
2-
"build_entry_point": "docs",
3-
"docsets_to_publish": [
4-
{
5-
"docset_name": "Docker",
6-
"build_source_folder": "docker",
7-
"build_output_subfolder": "Docker",
8-
"locale": "en-us",
9-
"monikers": [],
10-
"moniker_ranges": [],
11-
"open_to_public_contributors": true,
12-
"type_mapping": {
13-
"Conceptual": "Content"
14-
},
15-
"build_entry_point": "docs",
16-
"template_folder": "_themes"
17-
},
18-
{
19-
"docset_name": "docs",
20-
"build_source_folder": "docs",
21-
"build_output_subfolder": "vsdocsdocs",
22-
"locale": "en-us",
23-
"monikers": [],
24-
"moniker_ranges": [
25-
"vs-2015",
26-
">= vs-2017"
27-
],
28-
"xref_query_tags": [
29-
"/dotnet",
30-
"/uwp/api"
31-
],
32-
"open_to_public_contributors": true,
33-
"type_mapping": {
34-
"Conceptual": "Content",
35-
"ManagedReference": "Content",
36-
"RestApi": "Content",
37-
"LandingData": "Content",
38-
"ContextObject": "Toc",
39-
"APIConnector": "Content"
40-
},
41-
"template_folder": "_themes"
42-
},
43-
{
44-
"docset_name": "gamedev",
45-
"build_source_folder": "visualstudio/gamedev",
46-
"build_output_subfolder": "gamedev",
47-
"locale": "en-us",
48-
"monikers": [],
49-
"moniker_ranges": [],
50-
"open_to_public_contributors": false,
51-
"type_mapping": {
52-
"Conceptual": "Content"
53-
},
54-
"build_entry_point": "docs",
55-
"template_folder": "_themes"
56-
},
57-
{
58-
"docset_name": "mac",
59-
"build_source_folder": "mac",
60-
"build_output_subfolder": "mac",
61-
"locale": "en-us",
62-
"monikers": [],
63-
"moniker_ranges": [
64-
"vsmac-2017",
65-
"vsmac-2019"
66-
],
67-
"open_to_public_contributors": true,
68-
"type_mapping": {
69-
"Conceptual": "Content",
70-
"ManagedReference": "Content",
71-
"RestApi": "Content",
72-
"ContextObject": "Toc"
73-
},
74-
"build_entry_point": "docs",
75-
"template_folder": "_themes"
76-
},
77-
{
78-
"docset_name": "scripting-docs",
79-
"build_source_folder": "scripting-docs",
80-
"build_output_subfolder": "scripting-docs",
81-
"locale": "en-us",
82-
"monikers": [],
83-
"open_to_public_contributors": true,
84-
"type_mapping": {
85-
"Conceptual": "Content",
86-
"ManagedReference": "Content",
87-
"RestApi": "Content"
88-
},
89-
"build_entry_point": "docs",
90-
"template_folder": "_themes"
91-
},
92-
{
93-
"docset_name": "subscriptions",
94-
"build_source_folder": "subscriptions",
95-
"build_output_subfolder": "subscriptions",
96-
"locale": "en-us",
97-
"monikers": [],
98-
"moniker_ranges": [],
99-
"open_to_public_contributors": false,
100-
"type_mapping": {
101-
"Conceptual": "Content",
102-
"ManagedReference": "Content",
103-
"RestApi": "Content"
104-
},
105-
"build_entry_point": "docs",
106-
"template_folder": "_themes"
107-
}
108-
],
109-
"notification_subscribers": [],
110-
"sync_notification_subscribers": [
111-
"[email protected]"
112-
],
113-
"branches_to_filter": [],
114-
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/visualstudio-docs",
115-
"git_repository_branch_open_to_public_contributors": "master",
116-
"skip_source_output_uploading": false,
117-
"need_preview_pull_request": true,
118-
"need_pr_comments": true,
119-
"contribution_branch_mappings": {},
120-
"dependent_repositories": [
121-
{
122-
"path_to_root": "_themes",
123-
"url": "https://github.com/Microsoft/templates.docs.msft",
124-
"branch": "master",
125-
"branch_mapping": {}
126-
},
127-
{
128-
"path_to_root": "_themes.pdf",
129-
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
130-
"branch": "master",
131-
"branch_mapping": {}
132-
}
133-
],
134-
"branch_target_mapping": {
135-
"live": [
136-
"Publish",
137-
"Pdf"
138-
]
139-
},
140-
"need_generate_pdf_url_template": true,
141-
"targets": {
142-
"Pdf": {
143-
"template_folder": "_themes.pdf"
144-
}
145-
},
146-
"docs_build_engine": {
147-
"name": "docfx_v3"
148-
},
149-
"need_generate_pdf": false,
150-
"need_generate_intellisense": false,
151-
"enable_branch_build_custom_validation": true,
152-
"enable_pull_request_custom_validation": true
1+
{
2+
"build_entry_point": "docs",
3+
"docsets_to_publish": [
4+
{
5+
"docset_name": "Docker",
6+
"build_source_folder": "docker",
7+
"build_output_subfolder": "Docker",
8+
"locale": "en-us",
9+
"monikers": [],
10+
"moniker_ranges": [],
11+
"open_to_public_contributors": true,
12+
"type_mapping": {
13+
"Conceptual": "Content"
14+
},
15+
"build_entry_point": "docs",
16+
"template_folder": "_themes"
17+
},
18+
{
19+
"docset_name": "docs",
20+
"build_source_folder": "docs",
21+
"build_output_subfolder": "vsdocsdocs",
22+
"locale": "en-us",
23+
"monikers": [],
24+
"moniker_ranges": [
25+
"vs-2015",
26+
">= vs-2017"
27+
],
28+
"xref_query_tags": [
29+
"/dotnet",
30+
"/uwp/api"
31+
],
32+
"open_to_public_contributors": true,
33+
"type_mapping": {
34+
"Conceptual": "Content",
35+
"ManagedReference": "Content",
36+
"RestApi": "Content",
37+
"LandingData": "Content",
38+
"ContextObject": "Toc",
39+
"APIConnector": "Content"
40+
},
41+
"template_folder": "_themes"
42+
},
43+
{
44+
"docset_name": "gamedev",
45+
"build_source_folder": "visualstudio/gamedev",
46+
"build_output_subfolder": "gamedev",
47+
"locale": "en-us",
48+
"monikers": [],
49+
"moniker_ranges": [],
50+
"open_to_public_contributors": false,
51+
"type_mapping": {
52+
"Conceptual": "Content"
53+
},
54+
"build_entry_point": "docs",
55+
"template_folder": "_themes"
56+
},
57+
{
58+
"docset_name": "mac",
59+
"build_source_folder": "mac",
60+
"build_output_subfolder": "mac",
61+
"locale": "en-us",
62+
"monikers": [],
63+
"moniker_ranges": [
64+
"vsmac-2017",
65+
"vsmac-2019"
66+
],
67+
"open_to_public_contributors": true,
68+
"type_mapping": {
69+
"Conceptual": "Content",
70+
"ManagedReference": "Content",
71+
"RestApi": "Content",
72+
"ContextObject": "Toc"
73+
},
74+
"build_entry_point": "docs",
75+
"template_folder": "_themes"
76+
},
77+
{
78+
"docset_name": "scripting-docs",
79+
"build_source_folder": "scripting-docs",
80+
"build_output_subfolder": "scripting-docs",
81+
"locale": "en-us",
82+
"monikers": [],
83+
"open_to_public_contributors": true,
84+
"type_mapping": {
85+
"Conceptual": "Content",
86+
"ManagedReference": "Content",
87+
"RestApi": "Content"
88+
},
89+
"build_entry_point": "docs",
90+
"template_folder": "_themes"
91+
},
92+
{
93+
"docset_name": "subscriptions",
94+
"build_source_folder": "subscriptions",
95+
"build_output_subfolder": "subscriptions",
96+
"locale": "en-us",
97+
"monikers": [],
98+
"moniker_ranges": [],
99+
"open_to_public_contributors": false,
100+
"type_mapping": {
101+
"Conceptual": "Content",
102+
"ManagedReference": "Content",
103+
"RestApi": "Content"
104+
},
105+
"build_entry_point": "docs",
106+
"template_folder": "_themes"
107+
}
108+
],
109+
"notification_subscribers": [],
110+
"sync_notification_subscribers": [
111+
"[email protected]"
112+
],
113+
"branches_to_filter": [],
114+
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/visualstudio-docs",
115+
"git_repository_branch_open_to_public_contributors": "master",
116+
"skip_source_output_uploading": false,
117+
"need_preview_pull_request": true,
118+
"need_pr_comments": true,
119+
"contribution_branch_mappings": {},
120+
"dependent_repositories": [
121+
{
122+
"path_to_root": "_themes",
123+
"url": "https://github.com/Microsoft/templates.docs.msft",
124+
"branch": "master",
125+
"branch_mapping": {}
126+
},
127+
{
128+
"path_to_root": "_themes.pdf",
129+
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
130+
"branch": "master",
131+
"branch_mapping": {}
132+
}
133+
],
134+
"branch_target_mapping": {
135+
"live": [
136+
"Publish",
137+
"Pdf"
138+
]
139+
},
140+
"need_generate_pdf_url_template": true,
141+
"targets": {
142+
"Pdf": {
143+
"template_folder": "_themes.pdf"
144+
}
145+
},
146+
"docs_build_engine": {
147+
"name": "docfx_v3"
148+
},
149+
"need_generate_pdf": false,
150+
"need_generate_intellisense": false,
151+
"enable_branch_build_custom_validation": true,
152+
"enable_pull_request_custom_validation": true
153153
}

‎docs/containers/local-process-kubernetes.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Local Process with Kubernetes can handle routing traffic and replicating environ
141141

142142
## Using logging and diagnostics
143143

144-
You can find the diagnostic logs in `Azure Dev Spaces` directory in your [development computer's *TEMP* directory][azds-tmp-dir].
144+
You can find the diagnostic logs in `Local Process with Kubernetes` directory in your development computer's *TEMP* directory.
145145

146146
## Remove the sample application from your cluster
147147

@@ -159,7 +159,6 @@ Learn how Local Process Kubernetes works.
159159
> [How Local Process with Kubernetes works](overview-local-process-kubernetes.md)
160160
161161
[azds-cli]: /azure/dev-spaces/how-to/install-dev-spaces#install-the-client-side-tools
162-
[azds-tmp-dir]: /azure/dev-spaces/troubleshooting#before-you-begin
163162
[azds-vs-code]: https://marketplace.visualstudio.com/items?itemName=azuredevspaces.azds
164163
[azure-cli]: /cli/azure/install-azure-cli?view=azure-cli-lates
165164
[azure-cloud-shell]: /azure/cloud-shell/w.md

‎docs/containers/overview-local-process-kubernetes.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ After you establish a connection to your cluster, you can run and debug code nat
4343

4444
In addition, Local Process with Kubernetes provides a way to replicate environment variables and mounted files available to pods in your cluster on your development computer through the `KubernetesLocalProcessConfig.yaml` file. You can also use this file to create new environment variables and volume mounts.
4545

46+
> [!NOTE]
47+
> For the duration of the connection to the cluster (plus an additional 15 minutes), Local Process with Kubernetes runs a process called *EndpointManager* with admin permissions on your local computer.
48+
4649
## Additional configuration with KubernetesLocalProcessConfig.yaml
4750

4851
The `KubernetesLocalProcessConfig.yaml` file allows you to replicate environment variables and mounted files available to your pods in your cluster. For more information on the additional configuration options, see [Configure Local Process with Kubernetes][using-config-yaml].
@@ -88,7 +91,7 @@ When you disconnect from your cluster, by default, Local Process with Kubernetes
8891
8992
## Diagnostics and logging
9093
91-
When using Local Process with Kubernetes to connect to your cluster, diagnostic logs from your cluster are logged to your development computer's [temporary directory][azds-tmp-dir].
94+
When using Local Process with Kubernetes to connect to your cluster, diagnostic logs from your cluster are logged to your development computer's *TEMP* directory in the *Local Process with Kubernetes* folder.
9295
9396
## Limitations
9497

‎docs/msbuild/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,8 @@
443443
href: common-msbuild-project-properties.md
444444
- name: Common MSBuild project items
445445
href: common-msbuild-project-items.md
446+
- name: Common MSBuild item metadata
447+
href: common-msbuild-item-metadata.md
446448
- name: MSBuild command-line reference
447449
href: msbuild-command-line-reference.md
448450
- name: MSBuild .targets files

0 commit comments

Comments
 (0)