diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f2df0122..30b2342c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,19 +29,20 @@ jobs:
       git config --global user.name ci
       git config --global user.email me@ci.com
     displayName: Configure git commit author for testing
-  - script: |
-      dotnet tool install --tool-path . nbgv
-      .\nbgv cloud -p src -a
-    displayName: Set build number
 
   - task: DotNetCoreInstaller@0
-    displayName: Install .NET Core SDK 2.1.500
+    displayName: Install .NET Core SDK
     inputs:
       packageType: sdk
       version: 2.1.500
   - script: dotnet --info
     displayName: Show dotnet SDK info
 
+  - script: |
+      dotnet tool install --tool-path . nbgv
+      .\nbgv cloud -p src -a
+    displayName: Set build number
+
   - task: DotNetCoreCLI@2
     displayName: Restore NuGet packages
     inputs:
diff --git a/build.ps1 b/build.ps1
index 93863439..f49055e5 100644
--- a/build.ps1
+++ b/build.ps1
@@ -15,7 +15,7 @@ Param(
     [string]$MsBuildVerbosity = 'minimal'
 )
 
-$msbuildCommandLine = "msbuild `"$PSScriptRoot\src\Nerdbank.GitVersioning.sln`" /m /verbosity:$MsBuildVerbosity /nologo /p:Platform=`"Any CPU`" /t:build,pack"
+$msbuildCommandLine = "dotnet build `"$PSScriptRoot\src\Nerdbank.GitVersioning.sln`" /m /verbosity:$MsBuildVerbosity /nologo /p:Platform=`"Any CPU`" /t:build,pack"
 
 if (Test-Path "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll") {
     $msbuildCommandLine += " /logger:`"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll`""
@@ -30,12 +30,13 @@ try {
     if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\Nerdbank.GitVersioning.sln", "msbuild")) {
         Invoke-Expression $msbuildCommandLine
         if ($LASTEXITCODE -ne 0) {
-            throw "MSBuild failed"
+            throw "dotnet build failed"
         }
     }
 
     if ($PSCmdlet.ShouldProcess("$PSScriptRoot\src\nerdbank-gitversioning.npm", "gulp")) {
         cd "$PSScriptRoot\src\nerdbank-gitversioning.npm"
+        yarn install
         yarn run build
         if ($LASTEXITCODE -ne 0) {
             throw "Node build failed"
diff --git a/src/global.json b/global.json
similarity index 100%
rename from src/global.json
rename to global.json
diff --git a/src/nbgv/runtimeconfig.template.json b/src/nbgv/runtimeconfig.template.json
new file mode 100644
index 00000000..2c73f398
--- /dev/null
+++ b/src/nbgv/runtimeconfig.template.json
@@ -0,0 +1,3 @@
+{
+    "rollForwardOnNoCandidateFx": 2
+}
\ No newline at end of file