diff --git a/.editorconfig b/.editorconfig
index c30483a749..672a9042ec 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,4 +18,7 @@ trim_trailing_whitespace = false
 # Web Files
 [*.{htm,html,js,ts,css,scss,less}]
 insert_final_newline = true
+indent_size = 2
+
+[*.yml]
 indent_size = 2
\ No newline at end of file
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
new file mode 100644
index 0000000000..23077d5cd9
--- /dev/null
+++ b/.vsts-ci.yml
@@ -0,0 +1,31 @@
+trigger:
+- master
+- release/*
+phases:
+- phase: Windows
+  queue:
+    name: Hosted VS2017
+    parallel: 2
+    matrix:
+      Debug:
+        BuildConfiguration: Debug
+      Release:
+        BuildConfiguration: Release
+  steps:
+  - checkout: self
+    clean: true
+  - script: .\build.cmd -ci /p:Configuration=$(BuildConfiguration)
+    displayName: Run build.cmd
+  - task: PublishTestResults@2
+    displayName: Publish test results
+    condition: always()
+    inputs:
+      testRunner: vstest
+      testResultsFiles: 'artifacts/logs/**/*.trx'
+  - task: PublishBuildArtifacts@1
+    displayName: Upload artifacts
+    condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+    inputs:
+      pathtoPublish: artifacts/
+      artifactName: artifacts-$(BuildConfiguration)
+      artifactType: Container