From f446d0a438f82789eda56c2b733539a847867ab8 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 1 Nov 2017 13:10:01 -0500
Subject: [PATCH 1/3] [build] change path used for xabuild in Makefile

Use `bin/$(CONFIGURATION)/bin/xabuild` instead of `tools/xabuild`

This will help figure out what is going on in #949
---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1371d81ed38..be924773604 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ NUNIT_TESTS = \
 	bin/Test$(CONFIGURATION)/Xamarin.Android.Build.Tests.dll
 
 NUNIT_CONSOLE = packages/NUnit.ConsoleRunner.3.7.0/tools/nunit3-console.exe
+XABUILD       = bin/$(CONFIGURATION)/bin/xabuild
 
 ifneq ($(V),0)
 MONO_OPTIONS += --debug
@@ -25,14 +26,14 @@ include build-tools/scripts/msbuild.mk
 ifeq ($(USE_MSBUILD),1)
 _SLN_BUILD  = $(MSBUILD)
 else    # $(MSBUILD) != 1
-_SLN_BUILD  = MSBUILD="$(MSBUILD)" tools/scripts/xabuild
+_SLN_BUILD  = MSBUILD="$(MSBUILD)" $(XABUILD)
 endif   # $(USE_MSBUILD) == 1
 
 all::
 	$(_SLN_BUILD) $(MSBUILD_FLAGS) $(SOLUTION)
 
 all-tests::
-	MSBUILD="$(MSBUILD)" tools/scripts/xabuild $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln
+	MSBUILD="$(MSBUILD)" $(XABUILD) $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln
 
 install::
 	@if [ ! -d "bin/$(CONFIGURATION)" ]; then \
@@ -130,7 +131,7 @@ rename-test-cases:
 
 clean:
 	$(MSBUILD) $(MSBUILD_FLAGS) /t:Clean Xamarin.Android.sln
-	tools/scripts/xabuild $(MSBUILD_FLAGS) /t:Clean Xamarin.Android-Tests.sln
+	$(XABUILD) $(MSBUILD_FLAGS) /t:Clean Xamarin.Android-Tests.sln
 
 distclean:
 	# It may fail if we're cleaning a half-built tree, no harm done if we ignore it
@@ -181,7 +182,7 @@ TEST_APK_PROJECTS_AOT = \
 # Syntax: $(call BUILD_TEST_APK,path/to/project.csproj,additional_msbuild_flags)
 define BUILD_TEST_APK
 	# Must use xabuild to ensure correct assemblies are resolved
-	MSBUILD="$(MSBUILD)" tools/scripts/xabuild $(MSBUILD_FLAGS) /t:SignAndroidPackage $(2) $(1)
+	MSBUILD="$(MSBUILD)" $(XABUILD) $(MSBUILD_FLAGS) /t:SignAndroidPackage $(2) $(1)
 endef	# BUILD_TEST_APK
 
 # Syntax: $(call RUN_APK_TESTS,projects,additional_msbuild_flags)

From a69acd86f19b67daea7e15f1cbf9584d3cafe484 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 1 Nov 2017 13:50:36 -0500
Subject: [PATCH 2/3] Makefile needs to check if xabuild exists

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index be924773604..878ee33ea56 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,9 @@ NUNIT_TESTS = \
 
 NUNIT_CONSOLE = packages/NUnit.ConsoleRunner.3.7.0/tools/nunit3-console.exe
 XABUILD       = bin/$(CONFIGURATION)/bin/xabuild
+ifeq ($(wildcard $(XABUILD)),)
+	XABUILD   = tools/scripts/xabuild
+endif
 
 ifneq ($(V),0)
 MONO_OPTIONS += --debug

From cb7c2538fff805180868df39987bd3100755f5a5 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 2 Nov 2017 08:23:46 -0500
Subject: [PATCH 3/3] [tests] fixed Forms project TargetFrameworkVersion

This matches what the other Android App project have.
---
 .../Xamarin.Forms.Performance.Integration.Droid.csproj     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj b/tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj
index 49b90451ba8..ac1fea08ab6 100644
--- a/tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj
+++ b/tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj
@@ -8,14 +8,17 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Xamarin.Forms.Performance.Integration.Droid</RootNamespace>
     <AssemblyName>Xamarin.Forms.Performance.Integration.Droid</AssemblyName>
-    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+  </PropertyGroup>
+  <Import Project="..\..\..\Configuration.props" />
+  <PropertyGroup>
+    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>