Merge pull request #1 from dotnet/master

Merge upstream master

Author: nishanil

.acrolinx-config.edn

@@ -0,0 +1,2 @@
+{:allowed-branchname-matches ["^master$" "^release..*"]
+ :allowed-filename-matches ["^..*"]}

.ghal.rules.json

@@ -9,18 +9,23 @@
       "(?i)dotnet-framework$": ":books: Area - .NET Framework Guide",
       "(?i)dotnet-fsharp$": ":books: Area - F# Guide",
       "(?i)dotnet-ml$": ":books: Area - ML.NET Guide",
+      "(?i)dotnet-spark": ":books: Area - .NET for Apache Spark Guide",
       "(?i)dotnet$": ":books: Area - .NET Guide",
-      "(?i)dotnet-ml-api$": ":books: Area - API Reference,:file_folder: Repo - ml-api-docs"
+      "(?i)dotnet-ml-api$": ":books: Area - API Reference,:file_folder: Repo - ml-api-docs",
+      "(?i)dotnet-roslyn-api$": ":books: Area - Roslyn API Reference,:file_folder: Repo - roslyn-api-docs",
     },
     "contentsource": {
       "(?i).*master\/docs\/core\/tools.*": ":card_file_box: Technology - CLI",
       "(?i).*master\/docs\/core\/docker.*": ":card_file_box: Technology - Docker",
+      "(?i).*master\/docs\/framework\/configure-apps\/file-schema\/network.*": ":card_file_box: Technology - NCL",
+      "(?i).*master\/docs\/framework\/configure-apps\/file-schema\/wcf.*": ":card_file_box: Technology - WCF",
       "(?i).*master\/docs\/framework\/data\/adonet.*": ":card_file_box: Technology - Data Access",
       "(?i).*master\/docs\/framework\/data\/wcf.*": ":card_file_box: Technology - WCF",
       "(?i).*master\/docs\/framework\/docker.*": ":card_file_box: Technology - Docker",
       "(?i).*master\/docs\/framework\/install.*": ":card_file_box: Technology - Installers",
       "(?i).*master\/docs\/framework\/migration-guide.*": ":card_file_box: Technology - AppCompat",
       "(?i).*master\/docs\/framework\/network-programming.*": ":card_file_box: Technology - NCL",
+      "(?i).*master\/docs\/framework\/windows-workflow-foundation.*": ":card_file_box: Technology - WF",
       "(?i).*master\/docs\/framework\/wpf.*": ":card_file_box: Technology - WPF",
       "(?i).*master\/docs\/framework\/wcf.*": ":card_file_box: Technology - WCF",
       "(?i).*master\/docs\/framework\/winforms.*": ":card_file_box: Technology - WinForms",

.github/CODEOWNERS

@@ -36,6 +36,9 @@
 # The ML.NET Guide:
 /docs/machine-learning/** @JRAlexander
 
+# The .NET for Apache Spark Guide:
+/docs/spark/** @mamccrea
+
 ############### .NET Core ########################
 # What's New
 /docs/core/whats-new/** @rpetrusha
@@ -52,14 +55,14 @@
 # What's New
 /docs/framework/whats-new/** @rpetrusha
 # ADO.NET
-/docs/framework/data/adonet/** @douglaslMS
+/docs/framework/data/adonet/** @stevestein
 # NCL
 /docs/framework/configure-apps/file-schema/network/** @karelz
 /docs/framework/network-programming/** @karelz
 # WCF
-/docs/framework/configure-apps/file-schema/wcf/** @Lxiamail
-/docs/framework/data/wcf/** @Lxiamail
-/docs/framework/wcf/** @Lxiamail
+/docs/framework/configure-apps/file-schema/wcf/** @HongGit
+/docs/framework/data/wcf/** @HongGit
+/docs/framework/wcf/** @HongGit
 
 ################## .NET STANDARD ##################
 # Analyzers:
@@ -72,3 +75,10 @@
 /docs/standard/base-types/formatting-types/** @rpetrusha
 # .NET threading
 /docs/standard/threading/** @rpetrusha
+
+################## .NET E-BOOKS ##################
+/docs/standard/containerized-lifecycle-architecture/** @nishanil
+/docs/standard/microservices-architecture/** @nishanil
+/docs/standard/modern-web-apps-azure-architecture/** @nishanil
+/docs/standard/modernize-with-azure-and-containers/** @nishanil
+/docs/standard/serverless-architecture/** @nishanil

.github/ISSUE_TEMPLATE/doc-breaking-change.md

@@ -0,0 +1,34 @@
+---
+name: .NET Core breaking change
+about: Report a breaking change in .NET Core
+
+---
+<!-- 
+This issue template is for use in opening issues that document breaking changes. 
+
+Text in brackets are placeholders; replace the text with the requested information and remove the brackets before submitting the issue. Also, remove this comment before submitting the issue.
+
+-->
+# [Brief description of the change]
+
+## Version introduced
+
+[Version in which the breaking change first occurred]
+
+## Old behavior
+
+
+## New behavior
+
+
+## Reason for change
+
+
+## Mitigations
+
+<!-- Do not modify anything below this line -->
+
+---
+#### Issue metadata
+
+* Issue type: breaking-change

.gitignore

@@ -26,7 +26,11 @@ _dependentPackages/
 !/xml/System.Net.Cache/
 
 # Visual Studio Code
-.vscode
+.vscode/
+!.vscode/extensions.json
+
+# Visual Studio 2019
+.vs
 
 # Windows thumbnail cache files
 Thumbs.db

.markdownlint.json

@@ -0,0 +1,49 @@
+{
+    "default": true,
+    "MD001": false,
+    "MD002": false,
+    "MD004": false,
+    "MD007": false,
+    "MD009": false,
+    "MD013": false,
+    "MD022": false,
+    "MD024": false,
+    "MD025": false,
+    "MD026": false,
+    "MD027": false,
+    "MD028": false,
+    "MD032": false,
+    "MD033": {
+        "allowed_elements": [
+            "a",
+            "blockquote",
+            "br",
+            "code",
+            "em",
+            "h4",
+            "kbd",
+            "li",
+            "ol",
+            "p",
+            "pre",
+            "strong",
+            "sup",
+            "table",
+            "tbody",
+            "td",
+            "th",
+            "thead",
+            "tr",
+            "u",
+            "ul"
+        ]
+    },
+    "MD034": false,
+    "MD036": false,
+    "MD040": false,
+    "MD041": false,
+    "MD045": false,
+    "MD046": {
+        "style": "fenced"
+    }
+}

.openpublishing.publish.config.json

@@ -26,30 +26,7 @@
       "build_output_subfolder": ".",
       "locale": "en-us",
       "xref_query_tags": ["/uwp/api"],
-      "monikers": [
-        "netframework-4.5.1",
-        "netframework-4.5.2",
-        "netframework-4.5",
-        "netframework-4.6",
-        "netframework-4.6.1",
-        "netframework-4.6.2",
-        "netframework-4.7",
-        "netframework-4.7.1",
-        "netcore-1.0",
-        "netcore-1.1",
-        "netcore-2.0",
-        "netstandard-1.0",
-        "netstandard-1.1",
-        "netstandard-1.2",
-        "netstandard-1.3",
-        "netstandard-1.4",
-        "netstandard-1.5",
-        "netstandard-1.6",
-        "netstandard-2.0",
-        "xamarinios-10.8",
-        "xamarinandroid-7.1",
-        "xamarinmac-3.0"
-      ],
+      "monikers": [],
       "filemap_share_depots": ["VS.dotnet-api-docs"],
       "open_to_public_contributors": true,
       "type_mapping": {
@@ -95,4 +72,4 @@
       }
     }
   ]
-}
+}