diff --git a/.editorconfig b/.editorconfig
index 4b75cbf..d331795 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -177,6 +177,10 @@ indent_size = 2
 [*.{xml,stylecop,resx,ruleset}]
 indent_size = 2
 
+# Yml files
+[*.yml]
+indent_size = 2
+
 # Xml config files
 [*.{props,targets,config,nuspec}]
 indent_size = 2
@@ -184,5 +188,6 @@ indent_size = 2
 # Shell scripts
 [*.sh]
 end_of_line = lf
+
 [*.{cmd, bat}]
 end_of_line = crlf
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 16c4517..eb04d41 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,51 +1,60 @@
 trigger:
-- master
+  - master
+  - preview
 
 variables:
   buildConfiguration: 'Release'
 
 stages:
-- stage: Windows
-  displayName: Build and Test
-  jobs:
-  - job: Build
+  - stage: Windows
     displayName: Build and Test
-    pool:
-      vmImage: 'windows-latest'
-
-    steps:
-      - task : UseDotNet@2
-        displayName: Add .NET 3.1.x SDK
-        inputs:
-          packageType: 'sdk'
-          version: '3.1.x'
-
-      - task : UseDotNet@2
-        displayName: Add .NET 5.0.x SDK
-        inputs:
-          packageType: 'sdk'
-          version: '5.0.x'
-
-      - task : UseDotNet@2
-        displayName: Add .NET 6.0.x SDK
-        inputs:
-          packageType: 'sdk'
-          version: '6.0.100-preview.7.21379.14'
-
-      - task: DotNetCoreCLI@2
-        displayName: Restore projects
-        inputs:
-          command: 'restore'
-          feedsToUse: 'select'
-
-      - task: DotNetCoreCLI@2
-        displayName: Build projects
-        inputs:
-          command: 'build'
-          arguments: '-c $(buildConfiguration) --no-restore'
-
-      - task: DotNetCoreCLI@2
-        displayName: Test projects
-        inputs:
-          command: 'test'
-          arguments: '-c $(buildConfiguration) --no-build --no-restore --verbosity normal'
+    jobs:
+      - job: Build
+        displayName: Build and Test
+        pool:
+          vmImage: 'windows-latest'
+        
+        steps:
+          - task: UseDotNet@2
+            displayName: Setup 3.1.x .NET SDK
+            inputs:
+              packageType: 'sdk'
+              version: '3.1.x'
+
+          - task: UseDotNet@2
+            displayName: Setup 5.0.x .NET SDKs
+            inputs:
+              packageType: 'sdk'
+              version: '5.0.x'
+
+          - task: UseDotNet@2
+            displayName: Setup 6.0.x .NET SDKs
+            inputs:
+              packageType: 'sdk'
+              version: '6.0.x'
+
+          - task: UseDotNet@2
+            displayName: Setup 7.0.x .NET SDKs
+            inputs:
+              packageType: 'sdk'
+              version: '7.0.x'
+              includePreviewVersions: true
+
+
+          - task: DotNetCoreCLI@2
+            displayName: Restore projects
+            inputs:
+              command: 'restore'
+              feedsToUse: 'select'
+
+          - task: DotNetCoreCLI@2
+            displayName: Build projects
+            inputs:
+              command: 'build'
+              arguments: '-c $(buildConfiguration) --no-restore'
+
+          - task: DotNetCoreCLI@2
+            displayName: Test projects
+            inputs:
+              command: 'test'
+              arguments: '-c $(buildConfiguration) --no-build --no-restore --verbosity normal'