Skip to content

Merge master into live #4606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Aug 4, 2020
Merged

Merge master into live #4606

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b40a505
Update config to enable docfx v3
Jul 30, 2020
80ac8b9
Update pts.cs
live1206 Jul 31, 2020
87dd422
Merge pull request #4596 from dotnet/docs-build-v3
BillWagner Aug 3, 2020
615aa93
Update SerializationException condition (#4599)
gewarren Aug 3, 2020
9c71ff4
Add NSE to Serialize and Deserialize (#4590)
gewarren Aug 3, 2020
1c9b375
the returned root for an Unix absolute path is "/" (#4587)
lukka Aug 3, 2020
41b056e
Fix typo in CS and VB code (#4575)
glihm Aug 3, 2020
5d7d1b9
Update Mutex.xml (#4553)
hecongy Aug 3, 2020
e61b32d
Fix max port number (#4357)
Tornhoof Aug 3, 2020
4e05b76
Simple fix for thread priority sample snippet (#4382)
kkokosa Aug 3, 2020
047317f
Automatically port 5.0 System.Text.Json documentation (#4284)
carlossanlop Aug 3, 2020
0ab1ab3
Replace MD5 and SHA1 (#4542)
tdykstra Aug 3, 2020
5b1fc0e
Merge branch 'master' into publish-26890
cxwtool Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update config to enable docfx v3
  • Loading branch information
VSC-Service-Account committed Jul 30, 2020
commit b40a505456b206c019a1351698339caba644fa2d
9 changes: 7 additions & 2 deletions .openpublishing.publish.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
"build_source_folder": ".",
"build_output_subfolder": ".",
"locale": "en-us",
"xref_query_tags": ["/uwp/api"],
"xref_query_tags": [
"/uwp/api"
],
"monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true,
Expand Down Expand Up @@ -90,5 +92,8 @@
"target_framework": "net45",
"version": "latest"
}
]
],
"docs_build_engine": {
"name": "docfx_v3"
}
}