Merge branch 'master' into typedBindCallApply

# Conflicts: # src/compiler/diagnosticMessages.json
microsoft · ahejlsberg · Sep 25, 2018 · Sep 10, 2018 · Sep 10, 2018 · Sep 10, 2018
commit b67a261eba0acc27ddcb5c6176e3d3a00be7fdc4
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -3692,10 +3692,34 @@
         "category": "Error",
         "code": 6205
     },
-    "Enable strict 'bind', 'call', and 'apply' methods on functions.": {
+    "'package.json' has a 'typesVersions' field with version-specific path mappings.": {
         "category": "Message",
         "code": 6206
     },
+    "'package.json' does not have a 'typesVersions' entry that matches version '{0}'.": {
+        "category": "Message",
+        "code": 6207
+    },
+    "'package.json' has a 'typesVersions' entry '{0}' that matches compiler version '{1}', looking for a pattern to match module name '{2}'.": {
+        "category": "Message",
+        "code": 6208
+    },
+    "'package.json' has a 'typesVersions' entry '{0}' that is not a valid semver range.": {
+        "category": "Message",
+        "code": 6209
+    },
+    "An argument for '{0}' was not provided.": {
+        "category": "Message",
+        "code": 6210
+    },
+    "An argument matching this binding pattern was not provided.": {
+        "category": "Message",
+        "code": 6211
+    },
+    "Enable strict 'bind', 'call', and 'apply' methods on functions.": {
+        "category": "Message",
+        "code": 6212
+    },
 
     "Projects to reference": {
         "category": "Message",