Cleanup the PR for fixing build (xamarin#871)

* Cleanup the PR for fixing build

* Fix the info

Author: jamesmontemagno

DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.0.29">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.31">
   <PropertyGroup>
     <!--Work around so the conditions work below-->
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">Xamarin.iOS10;MonoAndroid90;uap10.0.16299</TargetFrameworks>

DeviceTests/build.cake

@@ -6,7 +6,7 @@
 var TARGET = Argument("target", "Default");
 
 var IOS_SIM_NAME = EnvironmentVariable("IOS_SIM_NAME") ?? "iPhone X";
-var IOS_SIM_RUNTIME = EnvironmentVariable("IOS_SIM_RUNTIME") ?? "iOS 12.0";
+var IOS_SIM_RUNTIME = EnvironmentVariable("IOS_SIM_RUNTIME") ?? "iOS 12.2";
 var IOS_PROJ = "./DeviceTests.iOS/DeviceTests.iOS.csproj";
 var IOS_BUNDLE_ID = "com.xamarin.essentials.devicetests";
 var IOS_IPA_PATH = "./DeviceTests.iOS/bin/iPhoneSimulator/Release/XamarinEssentialsDeviceTestsiOS.app";
@@ -106,11 +106,14 @@ Task ("test-ios-emu")
     .IsDependentOn ("build-ios")
     .Does (() =>
 {
+    var sims = ListAppleSimulators ();
+    foreach (var s in sims)
+    {
+        Information("Info: {0} ({1} - {2} - {3})", s.Name, s.Runtime, s.UDID, s.Availability);
+    }
+
     // Look for a matching simulator on the system
-    var sim = ListAppleSimulators ()
-        .First (s => (s.Availability.Contains("available") || s.Availability.Contains("booted"))
-                && !s.Availability.Contains("unavailable")
-                && s.Name == IOS_SIM_NAME && s.Runtime == IOS_SIM_RUNTIME);
+    var sim = sims.First (s => s.Name == IOS_SIM_NAME && s.Runtime == IOS_SIM_RUNTIME);
 
     // Boot the simulator
     Information("Booting: {0} ({1} - {2})", sim.Name, sim.Runtime, sim.UDID);

Xamarin.Essentials/Xamarin.Essentials.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.0.29">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.31">
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard1.0;netstandard2.0;Xamarin.iOS10;MonoAndroid60;MonoAndroid70;MonoAndroid71;MonoAndroid80;MonoAndroid81;MonoAndroid90;uap10.0.16299</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.0;netstandard2.0;Xamarin.iOS10;MonoAndroid60;MonoAndroid70;MonoAndroid71;MonoAndroid80;MonoAndroid81;MonoAndroid90;</TargetFrameworks>

azure-pipelines.yml

@@ -3,10 +3,10 @@ variables:
   CurrentSemanticVersionBase: '1.0.0'
   CurrentSemanticVersion: '$(CurrentSemanticVersionBase)-preview$(Build.BuildNumber)'
   NugetPackageVersion: '$(CurrentSemanticVersion)'
-  MONO_VERSION: 5_16_0
-  XCODE_VERSION: 10.1
+  MONO_VERSION: 5_18_1
+  XCODE_VERSION: 10.2.1
   IOS_SIM_NAME: 'iPhone X'
-  IOS_SIM_RUNTIME: 'iOS 12.1'
+  IOS_SIM_RUNTIME: 'com.apple.CoreSimulator.SimRuntime.iOS-12-2'
   ANDROID_EMU_TARGET: 'system-images;android-26;google_apis;x86'
   ANDROID_EMU_DEVICE: 'Nexus 5X'
   RunPoliCheck: 'false'
@@ -76,7 +76,7 @@ jobs:
   - job: build_macos
     displayName: Build macOS Library
     pool:
-      vmImage: macos-10.13
+      vmImage: macos-10.14
     steps:
       # if this is a tagged build, then update the version number
       - powershell: |
@@ -152,7 +152,7 @@ jobs:
       - build_windows
       - build_macos
     pool:
-      vmImage: macos-10.13
+      vmImage: macos-10.14
     steps:
       - bash: sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(MONO_VERSION)
         displayName: Switch to the latest Xamarin SDK
@@ -183,7 +183,7 @@ jobs:
       - build_windows
       - build_macos
     pool:
-      vmImage: macos-10.13
+      vmImage: macos-10.14
     steps:
       - bash: sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(MONO_VERSION)
         displayName: Switch to the latest Xamarin SDK