[Build] Update yaml builds (#6230)

* [Build] Update build yaml * [MacOS]Fix warning * [Build] Enable binlog * [Build] Run tests after build, update nuget version * [Build] Don't build PagesGallery and Embedding
xamarin · May 22, 2019 · 9918c8f · 9918c8f
1 parent 9bc0fc6
commit 9918c8f
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 111 deletions.
diff --git a/Version.targets b/Version.targets
@@ -49,6 +49,7 @@
     </ItemGroup>
 
     <Message Condition="$(CI)" Importance="high" Text="##vso[build.updatebuildnumber]$(PackageVersion)"/>
+    <Message Condition="$(CI)" Importance="high" Text="##vso[task.setvariable variable=packageversion;isOutput=true;]$(PackageVersion)"/>
   </Target>
 
   <Target Name="VersionInfoReport" DependsOnTargets="SetVersions" AfterTargets="GitInfoReport">

diff --git a/Xamarin.Forms.Platform.MacOS/PlatformRenderer.cs b/Xamarin.Forms.Platform.MacOS/PlatformRenderer.cs
@@ -10,7 +10,9 @@ internal class PlatformRenderer : NSViewController
 		internal PlatformRenderer(Platform platform)
 		{
 			Platform = platform;
+#pragma warning disable CS0618 // Type or member is obsolete
 			View = new NSView(NSApplication.SharedApplication.Windows[0].Frame);
+#pragma warning restore CS0618 // Type or member is obsolete
 			_platformNavigation = new PlatformNavigation(this);
 		}
 

diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln
@@ -785,7 +785,6 @@ Global
 		{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|x64.Build.0 = Debug|Any CPU
 		{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -809,7 +808,6 @@ Global
 		{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -827,13 +825,11 @@ Global
 		{447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|x86.ActiveCfg = Release|Any CPU
 		{447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|x86.Build.0 = Release|Any CPU
 		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|ARM.Build.0 = Debug|Any CPU
 		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|x64.Build.0 = Debug|Any CPU
 		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -851,7 +847,6 @@ Global
 		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|x86.ActiveCfg = Release|Any CPU
 		{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|x86.Build.0 = Release|Any CPU
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|ARM.Build.0 = Debug|Any CPU
@@ -860,7 +855,6 @@ Global
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhone.Deploy.0 = Debug|Any CPU
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|x64.Build.0 = Debug|Any CPU
@@ -886,20 +880,6 @@ Global
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.ActiveCfg = Release|Any CPU
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.Build.0 = Release|Any CPU
 		{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.Deploy.0 = Release|Any CPU
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.Build.0 = Debug|x86
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.Deploy.0 = Debug|x86
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.ActiveCfg = Debug|ARM
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.Build.0 = Debug|ARM
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.Deploy.0 = Debug|ARM
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|iPhone.ActiveCfg = Debug|ARM
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.ActiveCfg = Debug|x64
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.Build.0 = Debug|x64
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.Deploy.0 = Debug|x64
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.ActiveCfg = Debug|x86
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.Build.0 = Debug|x86
-		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.Deploy.0 = Debug|x86
 		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|Any CPU.ActiveCfg = Release|x86
 		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|Any CPU.Build.0 = Release|x86
 		{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|Any CPU.Deploy.0 = Release|x86
@@ -945,7 +925,6 @@ Global
 		{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x64.Build.0 = Debug|Any CPU
 		{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -963,13 +942,11 @@ Global
 		{C9696465-7657-4843-872E-3C01891C4A9B}.Release|x86.ActiveCfg = Release|Any CPU
 		{C9696465-7657-4843-872E-3C01891C4A9B}.Release|x86.Build.0 = Release|Any CPU
 		{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
 		{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|ARM.ActiveCfg = Debug|iPhone
 		{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|ARM.Build.0 = Debug|iPhone
 		{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhone.Build.0 = Debug|iPhone
 		{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
 		{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
 		{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|x64.Build.0 = Debug|iPhoneSimulator
 		{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
@@ -987,7 +964,6 @@ Global
 		{392156B2-760A-4EE3-A822-CABD3238A21D}.Release|x86.ActiveCfg = Release|iPhoneSimulator
 		{392156B2-760A-4EE3-A822-CABD3238A21D}.Release|x86.Build.0 = Release|iPhoneSimulator
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|ARM.Build.0 = Debug|Any CPU
@@ -996,7 +972,6 @@ Global
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|iPhone.Deploy.0 = Debug|Any CPU
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|x64.Build.0 = Debug|Any CPU
@@ -1023,13 +998,11 @@ Global
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Release|x86.Build.0 = Release|Any CPU
 		{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Release|x86.Deploy.0 = Release|Any CPU
 		{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|ARM.Build.0 = Debug|Any CPU
 		{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|x64.Build.0 = Debug|Any CPU
 		{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -1143,13 +1116,11 @@ Global
 		{9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|x86.ActiveCfg = Release|Any CPU
 		{9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|x86.Build.0 = Release|Any CPU
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|ARM.ActiveCfg = Debug|iPhone
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|ARM.Build.0 = Debug|iPhone
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhone.Build.0 = Debug|iPhone
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|x64.Build.0 = Debug|iPhoneSimulator
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
@@ -1166,20 +1137,6 @@ Global
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Release|x64.Build.0 = Release|iPhoneSimulator
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Release|x86.ActiveCfg = Release|iPhoneSimulator
 		{29DDE791-5608-4072-8E1C-D37D72992A83}.Release|x86.Build.0 = Release|iPhoneSimulator
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|Any CPU.Build.0 = Debug|x86
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|Any CPU.Deploy.0 = Debug|x86
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.ActiveCfg = Debug|ARM
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.Build.0 = Debug|ARM
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.Deploy.0 = Debug|ARM
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|iPhone.ActiveCfg = Debug|ARM
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.ActiveCfg = Debug|x64
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.Build.0 = Debug|x64
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.Deploy.0 = Debug|x64
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.ActiveCfg = Debug|x86
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.Build.0 = Debug|x86
-		{73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.Deploy.0 = Debug|x86
 		{73A22D45-2350-457D-A191-F888148E4280}.Release|Any CPU.ActiveCfg = Release|x86
 		{73A22D45-2350-457D-A191-F888148E4280}.Release|Any CPU.Build.0 = Release|x86
 		{73A22D45-2350-457D-A191-F888148E4280}.Release|Any CPU.Deploy.0 = Release|x86
@@ -1616,7 +1573,7 @@ Global
 		{FDBEC08E-9452-4167-BE3B-30653190DE1E}.Release|x86.ActiveCfg = Release|Any CPU
 		{FDBEC08E-9452-4167-BE3B-30653190DE1E}.Release|x86.Build.0 = Release|Any CPU
 		{FDBEC08E-9452-4167-BE3B-30653190DE1E}.Release|x86.Deploy.0 = Release|Any CPU
-		{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+		{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
 		{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|ARM.ActiveCfg = Debug|iPhone
 		{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|iPhone.Build.0 = Debug|iPhone
@@ -1632,6 +1589,7 @@ Global
 		{160053B8-745A-41DB-9B33-30479729D6DC}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{160053B8-745A-41DB-9B33-30479729D6DC}.Release|x64.ActiveCfg = Release|iPhone
 		{160053B8-745A-41DB-9B33-30479729D6DC}.Release|x86.ActiveCfg = Release|iPhone
+		{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
 		{868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|ARM.ActiveCfg = Debug|ARM
 		{868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|ARM.Build.0 = Debug|ARM

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -17,6 +17,14 @@ variables:
   value: 0
 - name: buildversion
   value: $[counter('$(Build.SourceBranchName)_counter', 1)]
+- name: MONO_VERSION
+  value: 5_18_1
+- name: XCODE_VERSION
+  value: 10.2
+- name: provisioning
+  value: false
+- name: NUGET_VERSION
+  value: 5.0.2
 
 resources:
   repositories:
@@ -36,9 +44,10 @@ trigger:
     - README.md
 
 pr:
-- master
-- 3.*
-- 4.*
+  autoCancel: false
+  branches:
+    include:
+    - '*'
 
 jobs:
 - job: Phase_1
@@ -63,32 +72,18 @@ jobs:
       release:
         BuildConfiguration: 'Release'
         BuildPlatform: $(DefaultBuildPlatform)
+  variables:
+    nugetVersion: $(NUGET_VERSION)
   steps:
      - template: build/steps/build-windows.yml
 
-- job: Phase_3
-  displayName: Test Windows Phase
-  dependsOn: Phase_2
-  condition: succeeded()
-  pool:
-    name: $(winVmImage)
-    demands: vstest
-  strategy:
-    matrix:
-      debug:
-        BuildConfiguration: $(DefaultBuildConfiguration)
-      release:
-        BuildConfiguration: 'Release'
-  steps:
-     - template: build/steps/build-windows-test.yml
-
 - template: build/steps/build-android.yml
   parameters:
     name: android_legacy
     displayName: Build Android [Legacy Renderers]
     vmImage: $(macOSVmImage)
     targetFolder: Xamarin.Forms.ControlGallery.Android/legacyRenderers/
-    androidProjectArguments: '/t:"Rebuild;SignAndroidPackage"'
+    androidProjectArguments: '/t:"Rebuild;SignAndroidPackage" /bl:$(Build.ArtifactStagingDirectory)\android-legacy.binlog'
     dependsOn: Phase_1
     buildConfiguration: $(DefaultBuildConfiguration)
 
@@ -98,7 +93,7 @@ jobs:
     displayName: Build Android [Pre-AppCompat]
     vmImage: $(macOSVmImage)
     targetFolder: Xamarin.Forms.ControlGallery.Android/preAppCompat
-    androidProjectArguments: '/t:"Rebuild;SignAndroidPackage" /p:DefineConstants="TRACE DEBUG FORMS_APPLICATION_ACTIVITY APP"'
+    androidProjectArguments: '/t:"Rebuild;SignAndroidPackage" /p:DefineConstants="TRACE DEBUG FORMS_APPLICATION_ACTIVITY APP" /bl:$(Build.ArtifactStagingDirectory)\android-preappcompact.binlog'
     dependsOn: Phase_1
     buildConfiguration: $(DefaultBuildConfiguration)
 
@@ -108,7 +103,7 @@ jobs:
     displayName: Build Android [Fast Renderers]
     vmImage: $(macOSVmImage)
     targetFolder: Xamarin.Forms.ControlGallery.Android/newRenderers/
-    androidProjectArguments: '/t:"Rebuild;SignAndroidPackage" /p:DefineConstants="TRACE DEBUG TEST_EXPERIMENTAL_RENDERERS APP"'
+    androidProjectArguments: '/t:"Rebuild;SignAndroidPackage" /p:DefineConstants="TRACE DEBUG TEST_EXPERIMENTAL_RENDERERS APP" /bl:$(Build.ArtifactStagingDirectory)\android-newrenderers.binlog'
     dependsOn: Phase_1
     buildConfiguration: $(DefaultBuildConfiguration)
 
@@ -129,7 +124,7 @@ jobs:
     provisionator.signPath : 'build/provisioning/provisioning_sign.csx'
     buildConfiguration: $(DefaultBuildConfiguration)
     slnPath: $(SolutionFile)
-    nugetVersion: 4.8.1
+    nugetVersion: $(NUGET_VERSION)
     iOSCertSecureFileName: 'Xamarin Forms iOS Certificate.p12'
     iOSProvisioningSecureFileName: 'Xamarin Forms iOS Provisioning.mobileprovision'
   steps:
@@ -138,7 +133,7 @@ jobs:
 - job: Phase_5
   displayName: Nuget Phase
   dependsOn:
-   - Phase_3
+   - Phase_2
    - android_legacy
    - android_preappcompact
    - android_fast
@@ -148,6 +143,7 @@ jobs:
   variables:
     FormsIdAppend: ''
     buildConfiguration: $(DefaultBuildConfiguration)
+    pacakageVersion : $[ dependencies.Phase_2.outputs['debug.winbuild.packageversion'] ]
   steps:
      - template: build/steps/build-nuget.yml
 

diff --git a/build/steps/build-android.yml b/build/steps/build-android.yml
@@ -13,7 +13,7 @@ parameters:
   androidProjectPath : 'Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj'
   androidProjectArguments : ''
   buildConfiguration : 'Debug'
-  nugetVersion: 4.8.1
+  nugetVersion: $(NUGET_VERSION)
   apkTargetFolder: '$(build.artifactstagingdirectory)/androidApp'
 
 jobs:

diff --git a/build/steps/build-nuget.yml b/build/steps/build-nuget.yml
@@ -26,17 +26,23 @@ steps:
        $preXamForms = $env:XAMARINFORMSPACKAGEVERSION
        $prefix = $env:SUFFIX
        Write-Host("Pre FormsVersion = $preXamForms $prefix")
-
+       Write-Host("MSBUILD packageVersion = $(pacakageVersion)")
+       $packageVer = "$(pacakageVersion)"
        if(!$preXamForms)
        {
           $formsNugetVersion = $env:major + "." + $env:minor + "." + $env:patch + "." + $env:buildversion
           if($prefix)
           {
             $formsNugetVersion = $formsNugetVersion +"-"+$prefix
           }
-          Write-Host("FormsVersion = $formsNugetVersion")
-          Write-Host("##{0}[task.setvariable variable=XamarinFormsPackageVersion]{1}" -f "vso",$formsNugetVersion.ToString() )
+          if($packageVer)
+          {
+              $formsNugetVersion = $packageVer
+          }
+
        }
+       Write-Host("FormsVersion = $formsNugetVersion")
+       Write-Host("##{0}[task.setvariable variable=XamarinFormsPackageVersion]{1}" -f "vso",$formsNugetVersion.ToString() )
 
     failOnStderr: true
     displayName: 'Set Nuget version'

diff --git a/build/steps/build-osx.yml b/build/steps/build-osx.yml
@@ -8,11 +8,16 @@ steps:
       provisioning_script: $(provisionator.osxPath)
       provisioning_extra_args: $(provisionator.extraArguments)
 
+  - bash: sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(MONO_VERSION)
+    displayName: Switch to the latest Xamarin SDK
+
+  - bash: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(XCODE_VERSION).app;sudo xcode-select --switch /Applications/Xcode_$(XCODE_VERSION).app/Contents/Developer
+    displayName: Switch to the latest Xcode
+
   - task: NuGetToolInstaller@0
-    displayName: 'Use NuGet $(nugetVersion)'
+    displayName: 'Use NuGet'
     inputs:
       versionSpec: $(nugetVersion)
-      checkLatest: true
 
   - task: NuGetCommand@2
     displayName: 'NuGet restore'