From 393c3019dab10e9b3b0f7e65a3366a11d1638efa Mon Sep 17 00:00:00 2001
From: Claire Novotny <claire@novotny.org>
Date: Mon, 21 Sep 2020 17:56:03 -0400
Subject: [PATCH] Use msbuild for sln due to uap

---
 Rx.NET/Source/global.json |  3 +++
 azure-pipelines.rx.yml    | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Rx.NET/Source/global.json b/Rx.NET/Source/global.json
index 7025f06d6a..afd9fc599e 100644
--- a/Rx.NET/Source/global.json
+++ b/Rx.NET/Source/global.json
@@ -1,4 +1,7 @@
 {
+"sdk": {
+    "version": "5.0.100-preview"
+  },
   "msbuild-sdks": {
     "MSBuild.Sdk.Extras": "2.1.2"
   }
diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml
index 7422fa7ce4..c9d05d67e1 100644
--- a/azure-pipelines.rx.yml
+++ b/azure-pipelines.rx.yml
@@ -50,13 +50,13 @@ stages:
     - script: nbgv cloud -a -p Rx.NET/Source
       displayName: Set Version
 
-    - task: DotNetCoreCLI@2
+    - task: MSBuild@1
       displayName: Build System.Reactive.sln
       inputs:
-        command: build
-        projects: Rx.NET/Source/System.Reactive.sln
-        arguments: -c $(BuildConfiguration) /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts
-        
+        solution: Rx.NET/Source/System.Reactive.sln
+        msbuildArguments: /restore /t:build /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts
+        configuration: $(BuildConfiguration)
+        maximumCpuCount: false
 
     - task: NuGetCommand@2
       displayName: Pack compatibility package