Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/razor/package.json

@@ -0,0 +1,33 @@
+{
+	"name": "razor",
+	"displayName": "%displayName%",
+	"description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "0.10.x"
+  },
+  "scripts": {
+    "update-grammar": "node ../../build/npm/update-grammar.js demyte/language-cshtml grammars/cshtml.json ./syntaxes/cshtml.tmLanguage.json"
+  },
+	"contributes": {
+		"languages": [{
+			"id": "razor",
+			"extensions": [ ".cshtml"],
+			"aliases": [ "Razor", "razor" ],
+			"mimetypes": ["text/x-cshtml"],
+			"configuration": "./language-configuration.json"
+		}],
+		"grammars": [{
+      "language": "razor",
+			"scopeName": "text.html.cshtml",
+			"path": "./syntaxes/cshtml.tmLanguage.json",
+			"embeddedLanguages": {
+				"section.embedded.source.cshtml": "csharp",
+          "source.css": "css",
+          "source.js": "javascript"
+			}
+		}]
+  }
+}