Merge branch 'master' into winui3

hawkerm · Apr 4, 2020 · 3a34d5d · 3a34d5d
2 parents 18291d1 + b390c53
commit 3a34d5d
Show file tree

Hide file tree

Showing 132 changed files with 5,788 additions and 1,812 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,10 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# TypeScript ignores
+*.js
+*.js.map
+
 # Monaco Dependency (Download from https://microsoft.github.io/monaco-editor/)
 MonacoEditorComponent/monaco-editor
 

diff --git a/MonacoEditorComponent/CodeEditor.Properties.cs b/MonacoEditorComponent/CodeEditor.Properties.cs