diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6a9684e..dbdb7cc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,13 +21,18 @@ steps:
   inputs:
     restoreSolution: '$(solution)'
 
-- task: VSBuild@1
+- task: DotNetCoreCLI@2
   inputs:
-    solution: '$(solution)'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+    command: 'build'
+    projects: |
+      **/MLEM*.csproj
+      **/Demos.csproj
+      **/Demos.DesktopGL.csproj
 
-- task: VSTest@2
+- task: XamarinAndroid@1
   inputs:
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+    projectFile: '**/*Android.csproj'
+    target: 'Release'
+    jdkOption: 'JDKVersion'
+
+