diff --git a/Makefile b/Makefile
index 8d0c1491e55..4b5507d44e5 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ MSBUILD_FLAGS += /p:AndroidApiLevel=$(API_LEVEL) /p:AndroidFrameworkVersion=$(wo
endif
all-tests::
- MSBUILD="$(MSBUILD)" $(call MSBUILD_BINLOG,all-tests,tools/scripts/xabuild) $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln
+ MSBUILD="$(MSBUILD)" $(call MSBUILD_BINLOG,all-tests,tools/scripts/xabuild) $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln /restore
install::
@if [ ! -d "bin/$(CONFIGURATION)" ]; then \
diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index b0b96883663..ea70f1a639d 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -197,7 +197,7 @@ stages:
displayName: xabuild Xamarin.Android-Tests
inputs:
filename: bin\$(XA.Build.Configuration)\bin\xabuild.exe
- arguments: Xamarin.Android-Tests.sln /p:Configuration=$(XA.Build.Configuration) /bl:$(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\msbuild-build-tests.binlog
+ arguments: Xamarin.Android-Tests.sln /p:Configuration=$(XA.Build.Configuration) /bl:$(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\msbuild-build-tests.binlog /restore
- task: MSBuild@1
displayName: nunit Java.Interop Tests
diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml
index cb40baedcb8..f514d28fc1c 100644
--- a/build-tools/automation/yaml-templates/setup-test-environment.yaml
+++ b/build-tools/automation/yaml-templates/setup-test-environment.yaml
@@ -33,10 +33,17 @@ steps:
version: $(DotNetCoreVersion)
# Restore solutions for Xamarin.Android.Tools.sln, Xamarin.Android.sln, and Xamarin.Android-Tests.sln
+- task: MSBuild@1
+ displayName: msbuild restore Xamarin.Android-Tests.sln
+ inputs:
+ solution: Xamarin.Android-Tests.sln
+ configuration: ${{ parameters.configuration }}
+ msbuildArguments: /t:Restore /bl:$(System.DefaultWorkingDirectory)/bin/Test${{ parameters.configuration }}/Xamarin.Android-Tests.restore.binlog
+
- task: NuGetCommand@2
displayName: nuget restore Xamarin.Android solutions
inputs:
- restoreSolution: '**/Xamarin.Android*.sln'
+ restoreSolution: 'Xamarin.Android*.sln'
feedsToUse: config
nugetConfigPath: NuGet.config
diff --git a/build-tools/timing/timing.projitems b/build-tools/timing/timing.projitems
index f24244d620f..ac89d589a32 100644
--- a/build-tools/timing/timing.projitems
+++ b/build-tools/timing/timing.projitems
@@ -17,7 +17,7 @@
$([System.IO.Path]::GetFullPath('$(_TopDir)tests\Xamarin.Forms-Performance-Integration'))
$(_TopDir)tests\Xamarin.Forms-Performance-Integration\Droid\MainActivity.cs
$(_TopDir)tests\Xamarin.Forms-Performance-Integration\Droid\Resources\values\styles.xml
- $(_TopDir)tests\Xamarin.Forms-Performance-Integration\Xamarin.Forms.Performance.Integration.csproj
+ $(_TopDir)Xamarin.Android-Tests.sln
\ No newline at end of file
diff --git a/build-tools/timing/timing.targets b/build-tools/timing/timing.targets
index 2c3ac44ae2d..d1b329cc0da 100644
--- a/build-tools/timing/timing.targets
+++ b/build-tools/timing/timing.targets
@@ -107,10 +107,9 @@
Condition=" '%(XACaptureBuildTimingProject.Restore)' != '' "
Command="$(_TopDir).nuget\NuGet.exe restore "%(XACaptureBuildTimingProject.Restore)""
/>
-
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
index 3fc1bb47b55..8d870408dee 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
@@ -118,13 +118,7 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, string packag
proj.IsRelease = isRelease;
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
- if (xamarinForms) {
- // With Android API Level 29, we will get a warning: "... is only compatible with TargetFrameworkVersion: MonoAndroid,v9.0 (Android API Level 28)"
- // We should allow a maximum of 1 warning to cover this case until the packages get updated to be compatible with Api level 29
- Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 1 Warning(s)"), "Should have no more than 1 MSBuild warnings.");
- } else {
- Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"), "Should have no MSBuild warnings.");
- }
+ Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"), "Should have no MSBuild warnings.");
Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "Warning: end of file not at end of a line"),
"Should not get a warning from the task.");
var lockFile = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, ".__lock");
@@ -353,7 +347,6 @@ public void SkipConvertResourcesCases ([Values (false, true)] bool useAapt2)
"Xamarin.Android.Support.Transition.dll",
"Xamarin.Android.Support.v7.AppCompat.dll",
"Xamarin.Android.Support.v7.CardView.dll",
- "Xamarin.Android.Support.v7.MediaRouter.dll",
"Xamarin.Android.Support.v7.RecyclerView.dll",
"material-menu-1.1.0.aar",
};
@@ -2804,7 +2797,7 @@ public void BuildAfterUpgradingNuget ()
proj.PackageReferences.Clear ();
//NOTE: we can get all the other dependencies transitively, yay!
- proj.PackageReferences.Add (KnownPackages.XamarinForms_4_0_0_425677);
+ proj.PackageReferences.Add (KnownPackages.XamarinForms_LatestStable);
b.Save (proj, doNotCleanupOnUpdate: true);
Assert.IsTrue (b.Build (proj), "second build should have succeeded.");
Assert.IsFalse (b.Output.IsTargetSkipped ("_CleanIntermediateIfNuGetsChange"), "`_CleanIntermediateIfNuGetsChange` should have run!");
@@ -2847,7 +2840,7 @@ public void CompileBeforeUpgradingNuGet ()
proj.PackageReferences.Clear ();
//NOTE: we can get all the other dependencies transitively, yay!
- proj.PackageReferences.Add (KnownPackages.XamarinForms_4_0_0_425677);
+ proj.PackageReferences.Add (KnownPackages.XamarinForms_LatestStable);
Assert.IsTrue (b.Build (proj, saveProject: true, doNotCleanupOnUpdate: true), "second build should have succeeded.");
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, "Refreshing Xamarin.Android.Support.v7.AppCompat.dll"), "`ResolveLibraryProjectImports` should not skip `Xamarin.Android.Support.v7.AppCompat.dll`!");
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, "Deleting unknown jar: support-annotations.jar"), "`support-annotations.jar` should be deleted!");
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DesignerTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DesignerTests.cs
index f421a93e457..e6db1deb8a7 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DesignerTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DesignerTests.cs
@@ -147,7 +147,7 @@ public void IncrementalDesignTimeBuild ()
var resourcepathscache = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "designtime", "libraryprojectimports.cache");
FileAssert.Exists (resourcepathscache);
var doc = XDocument.Load (resourcepathscache);
- Assert.AreEqual (40, doc.Root.Element ("Jars").Elements ("Jar").Count (), "libraryprojectimports.cache did not contain expected jar files");
+ Assert.AreEqual (38, doc.Root.Element ("Jars").Elements ("Jar").Count (), "libraryprojectimports.cache did not contain expected jar files");
}
}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs
index 8b760409a53..eb01cbc3edc 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs
@@ -151,19 +151,6 @@ public static class KnownPackages
}
}
};
- public static Package XamarinFormsPCL_2_3_4_231 = new Package {
- Id = "Xamarin.Forms",
- Version = "2.3.4.231",
- TargetFramework = "portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10",
- References = {
- new BuildItem.Reference ("Xamarin.Forms.Core") {
- MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.2.3.4.231\\lib\\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\\Xamarin.Forms.Core.dll"
- },
- new BuildItem.Reference ("Xamarin.Forms.Xaml") {
- MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.2.3.4.231\\lib\\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\\Xamarin.Forms.Xaml.dll"
- },
- }
- };
public static Package XamarinForms_2_3_4_231 = new Package {
Id = "Xamarin.Forms",
Version = "2.3.4.231",
@@ -186,38 +173,40 @@ public static class KnownPackages
},
}
};
- public static Package XamarinForms_4_0_0_425677 = new Package {
+ public static Package XamarinForms_LatestStable => XamarinForms_4_3_0_991221;
+ public static Package XamarinForms_4_3_0_991221 = new Package {
Id = "Xamarin.Forms",
- Version = "4.0.0.425677",
+ Version = "4.3.0.991221",
TargetFramework = "MonoAndroid90",
References = {
new BuildItem.Reference ("Xamarin.Forms.Platform.Android") {
- MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Platform.Android.dll"
+ MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Platform.Android.dll"
},
new BuildItem.Reference ("FormsViewGroup") {
- MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.0.0.425677\\lib\\MonoAndroid90\\FormsViewGroup.dll"
+ MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.3.0.991221\\lib\\MonoAndroid90\\FormsViewGroup.dll"
},
new BuildItem.Reference ("Xamarin.Forms.Core") {
- MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Core.dll"
+ MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Core.dll"
},
new BuildItem.Reference ("Xamarin.Forms.Xaml") {
- MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Xaml.dll"
+ MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Xaml.dll"
},
new BuildItem.Reference ("Xamarin.Forms.Platform") {
- MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Platform.dll"
+ MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Platform.dll"
},
}
};
- public static Package XamarinFormsMaps_4_0_0_425677 = new Package {
+ public static Package XamarinFormsMaps_LatestStable => XamarinFormsMaps_4_3_0_991221;
+ public static Package XamarinFormsMaps_4_3_0_991221 = new Package {
Id = "Xamarin.Forms.Maps",
- Version = "4.0.0.425677",
+ Version = "4.3.0.991221",
TargetFramework = "MonoAndroid90",
References = {
new BuildItem.Reference ("Xamarin.Forms.Maps.Android") {
- MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.Maps.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Maps.Android.dll"
+ MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.Maps.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Maps.Android.dll"
},
new BuildItem.Reference ("Xamarin.Forms.Maps") {
- MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.Maps.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Maps.dll"
+ MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.Maps.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Maps.dll"
},
}
};
@@ -390,11 +379,11 @@ public static class KnownPackages
};
public static Package Android_Arch_Work_Runtime = new Package {
Id = "Xamarin.Android.Arch.Work.Runtime",
- Version = "1.0.0",
+ Version = "1.0.0.3",
TargetFramework = "MonoAndroid90",
References = {
new BuildItem.Reference("Xamarin.Android.Arch.Work.Runtime") {
- MetadataValues = "HintPath=..\\packages\\Xamarin.Android.Arch.Work.Runtime.1.0.0\\lib\\MonoAndroid90\\Xamarin.Android.Arch.Work.Runtime.dll"
+ MetadataValues = "HintPath=..\\packages\\Xamarin.Android.Arch.Work.Runtime.1.0.0.3\\lib\\MonoAndroid90\\Xamarin.Android.Arch.Work.Runtime.dll"
}
}
};
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinFormsAndroidApplicationProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinFormsAndroidApplicationProject.cs
index 6b1d01b81ed..4c275457908 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinFormsAndroidApplicationProject.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinFormsAndroidApplicationProject.cs
@@ -41,7 +41,7 @@ public XamarinFormsAndroidApplicationProject (string debugConfigurationName = "D
: base (debugConfigurationName, releaseConfigurationName)
{
//NOTE: we can get all the other dependencies transitively, yay!
- PackageReferences.Add (KnownPackages.XamarinForms_4_0_0_425677);
+ PackageReferences.Add (KnownPackages.XamarinForms_LatestStable);
AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\values\\colors.xml") {
TextContent = () => colors_xml,
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinFormsMapsApplicationProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinFormsMapsApplicationProject.cs
index af403ea82d8..d55f119dcc3 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinFormsMapsApplicationProject.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinFormsMapsApplicationProject.cs
@@ -15,7 +15,7 @@ static XamarinFormsMapsApplicationProject ()
public XamarinFormsMapsApplicationProject ()
{
- PackageReferences.Add (KnownPackages.XamarinFormsMaps_4_0_0_425677);
+ PackageReferences.Add (KnownPackages.XamarinFormsMaps_LatestStable);
MainActivity = MainActivity.Replace ("//${AFTER_FORMS_INIT}", "Xamarin.FormsMaps.Init (this, savedInstanceState);");
//NOTE: API_KEY metadata just has to *exist*
AndroidManifest = AndroidManifest.Replace ("", "");
diff --git a/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs b/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs
index 38a4f9acdc6..4b87d6e717f 100644
--- a/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs
@@ -234,7 +234,7 @@ public void Build_XAML_Change (bool produceReferenceAssembly, bool install)
}
},
PackageReferences = {
- KnownPackages.XamarinForms_4_0_0_425677
+ KnownPackages.XamarinForms_LatestStable
}
};
lib.SetProperty ("ProduceReferenceAssembly", produceReferenceAssembly.ToString ());
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 fbc0cc88240..d256c4e750b 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
@@ -1,6 +1,5 @@
-
Debug
AnyCPU
@@ -47,194 +46,14 @@
True
-
- ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\netstandard2.0\Newtonsoft.Json.dll
- True
-
-
- ..\..\..\packages\Xam.Plugin.Connectivity.3.2.0\lib\MonoAndroid10\Plugin.Connectivity.dll
- True
-
-
- ..\..\..\packages/Xam.Plugin.Connectivity.3.2.0\lib\MonoAndroid10\Plugin.Connectivity.Abstractions.dll
- True
-
-
- ..\..\..\packages\Xamarin.Forms.4.0.0.425677\lib\MonoAndroid90\FormsViewGroup.dll
-
-
- ..\..\..\packages/Xamarin.Android.Arch.Core.Common.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll
- True
-
-
- ..\..\..\packages/Xamarin.Android.Arch.Core.Runtime.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.Core.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Arch.Lifecycle.ViewModel.1.1.1.1\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Annotations.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.AsyncLayoutInflater.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Collections.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Collections.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Compat.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Compat.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.CoordinaterLayout.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Core.UI.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Core.Utils.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.CursorAdapter.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.CustomView.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Design.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Design.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.DocumentFile.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.DrawerLayout.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Fragment.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Interpolator.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Loader.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Loader.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.LocalBroadcastManager.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Media.Compat.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Print.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Print.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.SlidingPaneLayout.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.SwipeRefreshLayout.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Transition.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Transition.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.v4.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.v4.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.v7.AppCompat.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.v7.CardView.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.v7.Palette.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.v7.Palette.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.VersionedParcelable.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll
- True
-
-
- ..\..\..\packages\Xamarin.Android.Support.ViewPager.28.0.0.1\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll
- True
-
-
- ..\..\..\packages\Xamarin.Forms.4.0.0.425677\lib\MonoAndroid90\Xamarin.Forms.Core.dll
-
-
- ..\..\..\packages\Xamarin.Forms.4.0.0.425677\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll
-
-
- ..\..\..\packages\Xamarin.Forms.4.0.0.425677\lib\MonoAndroid90\Xamarin.Forms.Platform.dll
-
-
- ..\..\..\packages\Xamarin.Forms.4.0.0.425677\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll
-
+
+
+
Xamarin.Forms.Performance.Integration
{195BE9C2-1F91-40DC-BD6D-DE860BF083FB}
@@ -244,7 +63,6 @@
-
@@ -264,88 +82,4 @@
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/Xamarin.Forms-Performance-Integration/Droid/packages.config b/tests/Xamarin.Forms-Performance-Integration/Droid/packages.config
deleted file mode 100644
index fd46238f33b..00000000000
--- a/tests/Xamarin.Forms-Performance-Integration/Droid/packages.config
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tests/Xamarin.Forms-Performance-Integration/Views/MainPage.xaml.cs b/tests/Xamarin.Forms-Performance-Integration/Views/MainPage.xaml.cs
index 0c94b746b0f..428b3415615 100644
--- a/tests/Xamarin.Forms-Performance-Integration/Views/MainPage.xaml.cs
+++ b/tests/Xamarin.Forms-Performance-Integration/Views/MainPage.xaml.cs
@@ -21,8 +21,6 @@ public MainPage ()
aboutPage = new NavigationPage (new AboutPage ()) {
Title = "About"
};
- itemsPage.Icon = "tab_feed.png";
- aboutPage.Icon = "tab_about.png";
break;
default:
itemsPage = new ItemsPage () {
diff --git a/tests/Xamarin.Forms-Performance-Integration/Xamarin.Forms.Performance.Integration.csproj b/tests/Xamarin.Forms-Performance-Integration/Xamarin.Forms.Performance.Integration.csproj
index e2e6ca7a2ee..91c0cd59ba2 100644
--- a/tests/Xamarin.Forms-Performance-Integration/Xamarin.Forms.Performance.Integration.csproj
+++ b/tests/Xamarin.Forms-Performance-Integration/Xamarin.Forms.Performance.Integration.csproj
@@ -6,10 +6,12 @@
+
+
-
+
\ No newline at end of file
diff --git a/tests/apk-sizes-reference/TestResult-Xamarin.Forms_Tests-values-Release.csv b/tests/apk-sizes-reference/TestResult-Xamarin.Forms_Tests-values-Release.csv
index 09d448dafca..6dbbcf041c7 100644
--- a/tests/apk-sizes-reference/TestResult-Xamarin.Forms_Tests-values-Release.csv
+++ b/tests/apk-sizes-reference/TestResult-Xamarin.Forms_Tests-values-Release.csv
@@ -1,2 +1,2 @@
apk-Release,Java.Interop.dll-Release,Mono.Android.dll-Release,mscorlib.dll-Release,monosgen-armeabi-v7a-Release,apk-Release-Aot,Java.Interop.dll-Release-Aot,Mono.Android.dll-Release-Aot,mscorlib.dll-Release-Aot,monosgen-armeabi-v7a-Release-Aot,Java.Interop.dll.so-Release-Aot,mscorlib.dll.so-Release-Aot,Mono.Android.dll.so-Release-Aot,apk-Release-Profiled-Aot,Java.Interop.dll-Release-Profiled-Aot,Mono.Android.dll-Release-Profiled-Aot,mscorlib.dll-Release-Profiled-Aot,monosgen-armeabi-v7a-Release-Profiled-Aot,Mono.Android.dll.so-Release-Profiled-Aot,Java.Interop.dll.so-Release-Profiled-Aot,mscorlib.dll.so-Release-Profiled-Aot,apk-Release-Bundle,monosgen-armeabi-v7a-Release-Bundle
-21069561,162816,2226688,2113024,3843248,46788671,162816,2226688,2113024,3843248,831180,8460084,9131876,25268287,162816,2226688,2113024,3843248,759148,285668,2053044,15935912,3843248
+20962858,162816,2226688,2113024,3843248,47054272,162816,2226688,2113024,3843248,831180,8460084,9131876,25268287,162816,2226688,2113024,3843248,759148,285668,2053044,15751579,3843248