diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6b08a542f..66c290eec 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,7 +20,7 @@ resources:
       endpoint: nanoframework
 
 pool:
-  vmImage: 'windows-2019'
+  vmImage: 'windows-latest'
 
 variables:
   DOTNET_NOLOGO: true
@@ -1211,7 +1211,7 @@ steps:
     )
   displayName: Install nanoFramework MSBuild components
 
-- task: VSBuild@1
+- task: MSBuild@1
   displayName: Build CoreLibrary
   condition: >-
     and(
@@ -1223,7 +1223,7 @@ steps:
       )
     )
   inputs:
-    solution: 'CoreLibrary\nanoFramework.CoreLibrary.sln'
+    solution: 'CoreLibrary\nanoFramework.CoreLibrary\CoreLibrary.nfproj'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
     maximumCpuCount: true
@@ -1296,7 +1296,7 @@ steps:
     configuration: '$(buildConfiguration)'
     maximumCpuCount: true
 
-- task: VSBuild@1
+- task: MSBuild@1
   displayName: Build nanoFramework.WebServer
   condition: >-
     and(
@@ -1308,7 +1308,7 @@ steps:
       )
     )
   inputs:
-    solution: 'nanoFramework.WebServer\nanoFramework.WebServer.sln'
+    solution: 'nanoFramework.WebServer\nanoFramework.WebServer\nanoFramework.WebServer.nfproj'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
     maximumCpuCount: true