ensure global.json is in Sandbox directory

PrismLibrary · May 30, 2019 · d4a7406 · d4a7406
1 parent 6eda879
commit d4a7406
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/Source/build/jobs/sandbox-android.yml b/Source/build/jobs/sandbox-android.yml
@@ -19,7 +19,7 @@ jobs:
 
   - template: ../steps/prepare-build.yml
     parameters:
-      solution: Sandbox/Xamarin/HelloWorld.sln
+      solution: Sandbox/Xamarin/HelloWorld/HelloWorld.sln
 
   - task: XamarinAndroid@1
     displayName: 'Build Xamarin.Android project HelloWorld.Android.csproj'

diff --git a/Source/build/jobs/sandbox-ios.yml b/Source/build/jobs/sandbox-ios.yml
@@ -27,7 +27,7 @@ jobs:
 
   - template: ../steps/prepare-build.yml
     parameters:
-      solution: Sandbox/Xamarin/HelloWorld.sln
+      solution: Sandbox/Xamarin/HelloWorld/HelloWorld.sln
 
   - task: XamariniOS@2
     displayName: 'Build Xamarin.iOS solution HelloWorld.iOS.csproj'

diff --git a/Source/build/jobs/sandbox-wpf.yml b/Source/build/jobs/sandbox-wpf.yml
@@ -9,6 +9,9 @@ jobs:
   workspace:
     clean: all
   steps:
+  - powershell: Copy-Item -Path .\Source\global.json -Destination .\Sandbox\Wpf\HelloWorld\
+    displayName: Copy global.json to Sandbox directory
+
   - template: ../steps/build.yml
     parameters:
       solution: Sandbox/Wpf/HelloWorld/HelloWorld.sln

diff --git a/Source/global.json b/Source/global.json
@@ -3,6 +3,6 @@
     "version": "3.0.100-preview"
   },
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "1.6.65"
+    "MSBuild.Sdk.Extras": "2.0.24"
   }
 }