From 95518a7e47a330c70ce126f45e2888b338defba1 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 4 Dec 2019 15:07:48 -0500 Subject: [PATCH 01/18] Bump to xamarin/monodroid@accf1b17 --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 72570a40307..245d69f13c9 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:master@1b907d680cc6561dcfaddc6f997d2f6ff5456644 +xamarin/monodroid:pjcollins_netstd2-xabt@accf1b17122372420527531eb53d647d9562cc5c mono/mono:2019-10@18920a83f423fb864a2263948737681968f5b2c8 From 451ee781144ebee28303226ef3a8c02222bbe248 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 4 Dec 2019 16:13:41 -0500 Subject: [PATCH 02/18] Bump .NET Core version --- build-tools/automation/azure-pipelines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index e8c3b6f4039..fd708a592b2 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -21,7 +21,7 @@ variables: InstallerArtifactName: installers TestAssembliesArtifactName: test-assemblies NUnitConsoleVersion: 3.9.0 - DotNetCoreVersion: 2.1.701 + DotNetCoreVersion: 3.1.100 HostedMacMojave: Hosted Mac Internal Mojave HostedMac: Hosted Mac Internal HostedWinVS2019: Hosted Windows 2019 with VS2019 From c17528c6469ec82406c534315db1b20d57cb99dc Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 4 Dec 2019 17:22:10 -0500 Subject: [PATCH 03/18] [build] Standardize MSBuild and other NuGet refs Updates the shared `MSBuildReferences.projitems` file to instead include NuGet references to the required Microsoft.Build.* assemblies. The Mono.Posix.NETStandard, Xamarin.Build.AsyncTask, and Xamarin.LibZipSharp NuGet references have also been moved into this file to make it easier to update versions as needed. All projects which reference `MSBuildReferences.projitems` have been converted from the old `packages.config` to the new `PackageReference` NuGet reference style. --- ...amarin.Android.Tools.BootstrapTasks.csproj | 14 +-- .../scripts/MSBuildReferences.projitems | 28 ++---- src/Mono.Android/Mono.Android.targets | 4 +- .../Xamarin.Android.Build.Tests.csproj | 28 +----- .../packages.config | 22 ----- .../Xamarin.ProjectTools.csproj | 11 --- .../Xamarin.ProjectTools/packages.config | 7 -- .../Xamarin.Android.Build.Tasks.csproj | 93 +++++-------------- ...marin.Android.Tools.JavadocImporter.csproj | 14 +-- .../packages.config | 6 -- .../UnitTests/CodeBehindUnitTests.csproj | 5 +- tests/CodeBehind/UnitTests/packages.config | 4 - ...amarin.Android.MakeBundle-UnitTests.csproj | 9 +- .../packages.config | 6 -- .../EmbeddedDSO-UnitTests.csproj | 13 +-- .../EmbeddedDSO-UnitTests/packages.config | 6 -- .../MSBuildDeviceIntegration.csproj | 16 +--- .../MSBuildDeviceIntegration/packages.config | 7 -- tools/xabuild/xabuild.csproj | 14 ++- 19 files changed, 65 insertions(+), 242 deletions(-) delete mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/packages.config delete mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/packages.config delete mode 100644 src/Xamarin.Android.Tools.JavadocImporter/packages.config delete mode 100644 tests/CodeBehind/UnitTests/packages.config delete mode 100644 tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/packages.config delete mode 100644 tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/packages.config delete mode 100644 tests/MSBuildDeviceIntegration/packages.config diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj index 9c64a1e25cc..9204c328322 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj @@ -35,12 +35,6 @@ - - ..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - @@ -67,6 +61,10 @@ + + + + {7CE69551-BD73-4726-ACAA-AAF89C84BAF8} @@ -77,10 +75,6 @@ Xamarin.Android.Tools.AndroidSdk - - - - diff --git a/build-tools/scripts/MSBuildReferences.projitems b/build-tools/scripts/MSBuildReferences.projitems index dddf241115d..73d7c827c64 100644 --- a/build-tools/scripts/MSBuildReferences.projitems +++ b/build-tools/scripts/MSBuildReferences.projitems @@ -1,24 +1,12 @@ - - $(MSBuildToolsPath) - $([System.IO.Path]::GetFullPath ('$(MSBuildToolsPath)\..\..\..\msbuild\15.0\bin')) - - - $(MSBuildReferencePath)\Microsoft.Build.dll - - - $(MSBuildReferencePath)\Microsoft.Build.Engine.dll - - - $(MSBuildReferencePath)\Microsoft.Build.Framework.dll - - - $(MSBuildReferencePath)\Microsoft.Build.Tasks.Core.dll - - - $(MSBuildReferencePath)\Microsoft.Build.Utilities.Core.dll - + + + + + + + - \ No newline at end of file + diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets index 80c2ea6441c..ffb616f5a1d 100644 --- a/src/Mono.Android/Mono.Android.targets +++ b/src/Mono.Android/Mono.Android.targets @@ -172,8 +172,10 @@ Name="AfterBuild" Inputs="$(TargetPath);@(ApiCompatibilityFiles)" Outputs="$(IntermediateOutputPath)CheckApiCompatibility.stamp"> + - - Debug AnyCPU @@ -39,37 +37,23 @@ - - ..\..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - ..\..\..\..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll - - - ..\..\..\..\packages\System.Runtime.InteropServices.4.1.0\lib\net462\System.Runtime.InteropServices.dll - - - ..\..\..\..\packages\Xamarin.Build.AsyncTask.0.3.4\lib\netstandard2.0\Xamarin.Build.AsyncTask.dll - ..\..\..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Cecil.dll - - ..\..\..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - + + + + @@ -86,9 +70,6 @@ Xamarin.Android.Tools.AndroidSdk - - - @@ -131,5 +112,4 @@ - diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/packages.config b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/packages.config deleted file mode 100644 index f09c0e2095f..00000000000 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/packages.config +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj index 52b0c29b98e..d717bdc5a66 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj @@ -32,15 +32,6 @@ - - ..\..\..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - - - ..\..\..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - @@ -151,7 +142,6 @@ - PreserveNewest @@ -170,5 +160,4 @@ - diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/packages.config b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/packages.config deleted file mode 100644 index 4b471b5d19f..00000000000 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index ef437c0341c..857ff915d02 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -1,7 +1,5 @@ - - Debug AnyCPU @@ -40,73 +38,17 @@ - - ..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll - - - ..\..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll - - - ..\..\packages\Irony.0.9.1\lib\net40\Irony.dll - - - ..\..\packages\FSharp.Compiler.CodeDom.1.0.0.1\lib\net40\FSharp.Compiler.CodeDom.dll - - - ..\..\packages\FSharp.Core.3.1.2.5\lib\net40\FSharp.Core.dll - - - ..\..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NuGet.Frameworks.4.6.0\lib\net46\NuGet.Frameworks.dll - - - ..\..\packages\NuGet.Common.4.6.0\lib\net46\NuGet.Common.dll - - - ..\..\packages\NuGet.Configuration.4.6.0\lib\net46\NuGet.Configuration.dll - - - ..\..\packages\NuGet.Versioning.4.6.0\lib\net46\NuGet.Versioning.dll - - - ..\..\packages\NuGet.LibraryModel.4.6.0\lib\net46\NuGet.LibraryModel.dll - - - ..\..\packages\NuGet.Packaging.Core.4.6.0\lib\net46\NuGet.Packaging.Core.dll - - - ..\..\packages\NuGet.Packaging.4.6.0\lib\net46\NuGet.Packaging.dll - - - ..\..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - - - ..\..\packages\System.Runtime.InteropServices.4.3.0\lib\net462\System.Runtime.InteropServices.dll - - - ..\..\packages\NuGet.Protocol.4.6.0\lib\net46\NuGet.Protocol.dll - - - ..\..\packages\NuGet.DependencyResolver.Core.4.6.0\lib\net46\NuGet.DependencyResolver.Core.dll - - - ..\..\packages\NuGet.ProjectModel.4.6.0\lib\net46\NuGet.ProjectModel.dll - - - ..\..\packages\Xamarin.Build.AsyncTask.0.3.4\lib\netstandard2.0\Xamarin.Build.AsyncTask.dll - + ..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\pdb2mdb.exe @@ -119,12 +61,29 @@ ..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Cecil.Mdb.dll - - ..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - + + + + + + + + + + + + + + + + + + + + + + + @@ -625,7 +584,6 @@ - @@ -773,7 +731,4 @@ False - - - diff --git a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj index 330ab859685..81935e2e8d7 100644 --- a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj +++ b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj @@ -31,19 +31,10 @@ - - ..\..\packages\Microsoft.Xml.SgmlReader.1.8.14\lib\net45\SgmlReaderDll.dll - ..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Cecil.dll - - ..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - @@ -81,10 +72,11 @@ - + + + - diff --git a/src/Xamarin.Android.Tools.JavadocImporter/packages.config b/src/Xamarin.Android.Tools.JavadocImporter/packages.config deleted file mode 100644 index 9a76d10804c..00000000000 --- a/src/Xamarin.Android.Tools.JavadocImporter/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj b/tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj index d3e16e301c2..3ceeff05b8f 100644 --- a/tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj +++ b/tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj @@ -26,15 +26,12 @@ - - ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - + diff --git a/tests/CodeBehind/UnitTests/packages.config b/tests/CodeBehind/UnitTests/packages.config deleted file mode 100644 index 803d28fa912..00000000000 --- a/tests/CodeBehind/UnitTests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj b/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj index 7f6878f0282..17e4c4a069b 100644 --- a/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj +++ b/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj @@ -31,18 +31,12 @@ - - ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - ..\..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - - + @@ -51,5 +45,4 @@ Xamarin.ProjectTools - diff --git a/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/packages.config b/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/packages.config deleted file mode 100644 index 0ea38d42982..00000000000 --- a/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj b/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj index 63b6aaf3c9f..def9cc81bd4 100644 --- a/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj +++ b/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj @@ -31,20 +31,14 @@ - - ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - ..\..\..\bin\$(Configuration)\lib/xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Build.Tasks.dll + ..\..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Build.Tasks.dll True - ..\..\..\bin\$(Configuration)\lib/xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Tools.AndroidSdk.dll + ..\..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Tools.AndroidSdk.dll True - - ..\..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - @@ -55,7 +49,7 @@ - + @@ -79,5 +73,4 @@ Replacements="@ANDROID_SDK_DIRECTORY@=$(AndroidSdkDirectory);@BUILD_TOOLS_FOLDER@=$(XABuildToolsFolder);@EXECUTABLE_EXTENSION@=$(ExecutableExtension)" /> - diff --git a/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/packages.config b/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/packages.config deleted file mode 100644 index 0ea38d42982..00000000000 --- a/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj index f4de9bfd3ea..33c53c42baf 100644 --- a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj +++ b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj @@ -29,18 +29,6 @@ - - ..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - ..\..\packages\NodaTime.2.4.5\lib\net45\NodaTime.dll - - - ..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - @@ -55,7 +43,8 @@ - + + @@ -85,5 +74,4 @@ - diff --git a/tests/MSBuildDeviceIntegration/packages.config b/tests/MSBuildDeviceIntegration/packages.config deleted file mode 100644 index 9719367ea39..00000000000 --- a/tests/MSBuildDeviceIntegration/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/tools/xabuild/xabuild.csproj b/tools/xabuild/xabuild.csproj index 66349c36385..0ab58e0f4f4 100644 --- a/tools/xabuild/xabuild.csproj +++ b/tools/xabuild/xabuild.csproj @@ -13,7 +13,6 @@ <_MSBuildExtension Condition=" '$(OS)' != 'Windows_NT' ">dll - x86 true @@ -33,8 +32,19 @@ - $(MSBuildReferencePath)\MSBuild.$(_MSBuildExtension) + $(MSBuildToolsPath)\MSBuild.$(_MSBuildExtension) + + $(MSBuildToolsPath)\Microsoft.Build.dll + + + $(MSBuildToolsPath)\Microsoft.Build.Framework.dll + + + $(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll + + + $(MSBuildToolsPath)\Microsoft.Build.Utilities.Core.dll From c5796af6302a6d76818dc7bec11c35b2b937ab92 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 4 Dec 2019 17:32:19 -0500 Subject: [PATCH 04/18] Bump to xamarin/monodroid@fb3ea0f --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 245d69f13c9..e6192ba7530 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:pjcollins_netstd2-xabt@accf1b17122372420527531eb53d647d9562cc5c +xamarin/monodroid:pjcollins_netstd2-xabt@fb3ea0ff799c70886ce725843e0b7228442385fc mono/mono:2019-10@18920a83f423fb864a2263948737681968f5b2c8 From 95d3750d4cd8621dd0af12779d69085cc8de08f2 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 4 Dec 2019 17:57:08 -0500 Subject: [PATCH 05/18] Restore prep and bootstrap task NuGets --- Makefile | 2 +- .../xaprepare/Steps/Step_PrepareLocal.cs | 28 ++++++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8d0c1491e55..a861972d0c0 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ _PREPARE_ARGS = BOOTSTRAP_SOLUTION = Xamarin.Android.BootstrapTasks.sln BOOTSTRAP_BUILD_LOG = bin/Build$(CONFIGURATION)/bootstrap-build.binlog -BOOTSTRAP_MSBUILD_FLAGS = /binaryLogger:"$(BOOTSTRAP_BUILD_LOG)" $(PREPARE_COMMON_MSBUILD_FLAGS) +BOOTSTRAP_MSBUILD_FLAGS = /t:Restore,Build /binaryLogger:"$(BOOTSTRAP_BUILD_LOG)" $(PREPARE_COMMON_MSBUILD_FLAGS) all: $(call MSBUILD_BINLOG,all,$(_SLN_BUILD)) $(MSBUILD_FLAGS) $(SOLUTION) diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_PrepareLocal.cs b/build-tools/xaprepare/xaprepare/Steps/Step_PrepareLocal.cs index 9f5052c3a9a..33e71e9b044 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_PrepareLocal.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_PrepareLocal.cs @@ -14,14 +14,34 @@ protected override async Task Execute(Context context) { var msbuild = new MSBuildRunner (context); + string prepTasksPath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "build-tools", "xa-prep-tasks", "xa-prep-tasks.csproj"); + string bootstrapTasksPath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "build-tools", "Xamarin.Android.Tools.BootstrapTasks", "Xamarin.Android.Tools.BootstrapTasks.csproj"); string xfTestPath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "tests", "Xamarin.Forms-Performance-Integration", "Xamarin.Forms.Performance.Integration.csproj"); + + if (!await RestorePackageRefProjects (msbuild, prepTasksPath, "prep-tasks-restore")) { + return false; + } + + if (!await RestorePackageRefProjects (msbuild, bootstrapTasksPath, "bootstrap-tasks-restore")) { + return false; + } + + if (!await RestorePackageRefProjects (msbuild, xfTestPath, "xfperf-restore")) { + return false; + } + + return true; + } + + async Task RestorePackageRefProjects (MSBuildRunner msbuild, string projectPath, string tag) + { return await msbuild.Run ( - projectPath: xfTestPath, - logTag: "xfperf", - arguments: new List { + projectPath: projectPath, + logTag: tag, + arguments: new List { "/t:Restore" }, - binlogName: "prepare-restore" + binlogName: tag ); } } From e72f9289b637bc6ca9429b5cca8bbe35b03aed19 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 5 Dec 2019 13:25:48 -0500 Subject: [PATCH 06/18] [build] Conditionally import generated files NuGet restore will be skipped if any issues occur when calculating the dependency graph for the solution or project that it is operating on. A lot of our sources attempt to import props/targets/projitems files that are generated by the build, and these should be conditionally imported so that NuGet restore attempts can succeed before these files are generated. Example NuGet restore error: src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets(8,3): error MSB4019: The imported project "bin/BuildRelease/ProfileAssemblies.projitems" was not found. Confirm that the expression in the Import declaration "../../bin/BuildRelease/ProfileAssemblies.projitems" is correct, and that the file exists on disk. /var/folders/pp/x88nqyvd0h18ttl996vv2c3w0000gn/T/NuGetScratch/ok90j1ok.3t3.nugetrestore.targets(266,5): warning : Skipping restore for project 'src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj'. The project file may be invalid or missing targets required for restore. --- Novell/MonoDroid.FSharp.targets | 4 ++++ Novell/Novell.MonoDroid.CSharp.targets | 3 +++ Novell/Novell.MonoDroid.Common.targets | 4 ++++ build-tools/api-xml-adjuster/api-xml-adjuster.targets | 2 +- build-tools/installers/create-installers.targets | 4 ++-- build-tools/scripts/XAVersionInfo.targets | 2 +- src/Mono.Android/Mono.Android.targets | 2 +- src/OpenTK-1.0/OpenTK.csproj | 2 +- .../System.EnterpriseServices.csproj | 2 +- .../Xamarin.Android.Build.Tasks.csproj | 5 ----- .../Xamarin.Android.Build.Tasks.targets | 2 +- .../Xamarin.Android.NUnitLite.csproj | 2 +- src/monodroid/monodroid.targets | 2 +- .../Xamarin.Android.Bcl-Tests.targets | 2 +- tools/xabuild/xabuild.csproj | 1 + 15 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 Novell/MonoDroid.FSharp.targets create mode 100644 Novell/Novell.MonoDroid.CSharp.targets create mode 100644 Novell/Novell.MonoDroid.Common.targets diff --git a/Novell/MonoDroid.FSharp.targets b/Novell/MonoDroid.FSharp.targets new file mode 100644 index 00000000000..743d84bde21 --- /dev/null +++ b/Novell/MonoDroid.FSharp.targets @@ -0,0 +1,4 @@ + + + + diff --git a/Novell/Novell.MonoDroid.CSharp.targets b/Novell/Novell.MonoDroid.CSharp.targets new file mode 100644 index 00000000000..8901664f2c4 --- /dev/null +++ b/Novell/Novell.MonoDroid.CSharp.targets @@ -0,0 +1,3 @@ + + + diff --git a/Novell/Novell.MonoDroid.Common.targets b/Novell/Novell.MonoDroid.Common.targets new file mode 100644 index 00000000000..fc2a4de3d97 --- /dev/null +++ b/Novell/Novell.MonoDroid.Common.targets @@ -0,0 +1,4 @@ + + + + diff --git a/build-tools/api-xml-adjuster/api-xml-adjuster.targets b/build-tools/api-xml-adjuster/api-xml-adjuster.targets index 3d8708151da..8432970bf27 100644 --- a/build-tools/api-xml-adjuster/api-xml-adjuster.targets +++ b/build-tools/api-xml-adjuster/api-xml-adjuster.targets @@ -1,6 +1,6 @@ - + <_TopDir>$(MSBuildThisFileDirectory)..\.. diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index 82c459153eb..4d067a50807 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -2,8 +2,8 @@ - - + + $(XamarinAndroidSourcePath)bin\$(Configuration)\ diff --git a/build-tools/scripts/XAVersionInfo.targets b/build-tools/scripts/XAVersionInfo.targets index 263a71243b9..cef0321d1b5 100644 --- a/build-tools/scripts/XAVersionInfo.targets +++ b/build-tools/scripts/XAVersionInfo.targets @@ -6,7 +6,7 @@ - + - - - - + + + + + + + + + PreserveNewest + + + PreserveNewest + + From ebb778e90b4686d317ffb1b109634cb7c5d456cf Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 10 Dec 2019 14:56:38 -0500 Subject: [PATCH 09/18] Partially revert "Restore prep and bootstrap task NuGets" This partially reverts commit a4c8e09ae55141dcf3c3343ca27f5aef6c863653. --- .../xaprepare/Steps/Step_PrepareLocal.cs | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_PrepareLocal.cs b/build-tools/xaprepare/xaprepare/Steps/Step_PrepareLocal.cs index 33e71e9b044..9f5052c3a9a 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_PrepareLocal.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_PrepareLocal.cs @@ -14,34 +14,14 @@ protected override async Task Execute(Context context) { var msbuild = new MSBuildRunner (context); - string prepTasksPath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "build-tools", "xa-prep-tasks", "xa-prep-tasks.csproj"); - string bootstrapTasksPath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "build-tools", "Xamarin.Android.Tools.BootstrapTasks", "Xamarin.Android.Tools.BootstrapTasks.csproj"); string xfTestPath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "tests", "Xamarin.Forms-Performance-Integration", "Xamarin.Forms.Performance.Integration.csproj"); - - if (!await RestorePackageRefProjects (msbuild, prepTasksPath, "prep-tasks-restore")) { - return false; - } - - if (!await RestorePackageRefProjects (msbuild, bootstrapTasksPath, "bootstrap-tasks-restore")) { - return false; - } - - if (!await RestorePackageRefProjects (msbuild, xfTestPath, "xfperf-restore")) { - return false; - } - - return true; - } - - async Task RestorePackageRefProjects (MSBuildRunner msbuild, string projectPath, string tag) - { return await msbuild.Run ( - projectPath: projectPath, - logTag: tag, - arguments: new List { + projectPath: xfTestPath, + logTag: "xfperf", + arguments: new List { "/t:Restore" }, - binlogName: tag + binlogName: "prepare-restore" ); } } From 2a902029003c98179faeba48f95a9c32a4c7cf50 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 10 Dec 2019 15:08:23 -0500 Subject: [PATCH 10/18] Don't run ApiCompat when building BootstrapTasks --- .../Xamarin.Android.Tools.BootstrapTasks.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj index 9204c328322..af86f75ea66 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj @@ -8,6 +8,8 @@ Xamarin.Android.Tools.BootstrapTasks Xamarin.Android.Tools.BootstrapTasks true + + false From 3207311ce59f631276aa9ee662473dc8dc989ee0 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 10 Dec 2019 15:08:56 -0500 Subject: [PATCH 11/18] [ci] Install .NET Core locally for Jenkins builds Context: https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script --- build-tools/automation/build.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-tools/automation/build.groovy b/build-tools/automation/build.groovy index 89ae9fd30e9..424509be6e3 100644 --- a/build-tools/automation/build.groovy +++ b/build-tools/automation/build.groovy @@ -174,6 +174,8 @@ timestamps { } } } + // Install .NET Core and temporarily append it to PATH + sh "curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -version 3.1.100" } utils.stageWithTimeout('build', 6, 'HOURS', XADir, true) { // Typically takes less than one hour except a build on a new bot to populate local caches can take several hours From 4518bba3c63615f81bee497088f180e2f9fef26f Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 10 Dec 2019 15:43:09 -0500 Subject: [PATCH 12/18] Move ApiCompat ref to Mono.Android.csproj --- .../Xamarin.Android.Tools.BootstrapTasks.csproj | 3 --- src/Mono.Android/Mono.Android.csproj | 3 +++ src/Mono.Android/Mono.Android.targets | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj index af86f75ea66..1e4468f8aed 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj @@ -8,8 +8,6 @@ Xamarin.Android.Tools.BootstrapTasks Xamarin.Android.Tools.BootstrapTasks true - - false @@ -64,7 +62,6 @@ - diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj index 0865a4ce467..a48ac69f899 100644 --- a/src/Mono.Android/Mono.Android.csproj +++ b/src/Mono.Android/Mono.Android.csproj @@ -82,6 +82,9 @@ False + + + JavaNativeTypeManager.cs diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets index bdf0a90c7b4..5e1977ed976 100644 --- a/src/Mono.Android/Mono.Android.targets +++ b/src/Mono.Android/Mono.Android.targets @@ -173,7 +173,7 @@ Inputs="$(TargetPath);@(ApiCompatibilityFiles)" Outputs="$(IntermediateOutputPath)CheckApiCompatibility.stamp"> + PackageReference declared in Mono.Android.csproj --> Date: Tue, 10 Dec 2019 15:53:41 -0500 Subject: [PATCH 13/18] Remove accidental file additions --- Novell/MonoDroid.FSharp.targets | 4 --- Novell/Novell.MonoDroid.CSharp.targets | 3 -- Novell/Novell.MonoDroid.Common.targets | 4 --- .../packages.config | 7 ----- .../packages.config | 30 ------------------- 5 files changed, 48 deletions(-) delete mode 100644 Novell/MonoDroid.FSharp.targets delete mode 100644 Novell/Novell.MonoDroid.CSharp.targets delete mode 100644 Novell/Novell.MonoDroid.Common.targets delete mode 100644 build-tools/Xamarin.Android.Tools.BootstrapTasks/packages.config delete mode 100644 src/Xamarin.Android.Build.Tasks/packages.config diff --git a/Novell/MonoDroid.FSharp.targets b/Novell/MonoDroid.FSharp.targets deleted file mode 100644 index 743d84bde21..00000000000 --- a/Novell/MonoDroid.FSharp.targets +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Novell/Novell.MonoDroid.CSharp.targets b/Novell/Novell.MonoDroid.CSharp.targets deleted file mode 100644 index 8901664f2c4..00000000000 --- a/Novell/Novell.MonoDroid.CSharp.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Novell/Novell.MonoDroid.Common.targets b/Novell/Novell.MonoDroid.Common.targets deleted file mode 100644 index fc2a4de3d97..00000000000 --- a/Novell/Novell.MonoDroid.Common.targets +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/packages.config b/build-tools/Xamarin.Android.Tools.BootstrapTasks/packages.config deleted file mode 100644 index e4c135f8ddb..00000000000 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/packages.config b/src/Xamarin.Android.Build.Tasks/packages.config deleted file mode 100644 index 7e11ec8cf75..00000000000 --- a/src/Xamarin.Android.Build.Tasks/packages.config +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From f7d125ae744f7873f870e653b94267005e7a0511 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 11 Dec 2019 16:10:00 -0500 Subject: [PATCH 14/18] [ci] Build all tests in Azure Pipeline --- build-tools/automation/azure-pipelines.yaml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index fd708a592b2..86f8c27e38b 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -83,23 +83,8 @@ stages: displayName: make jenkins # Build and package test assemblies - - task: MSBuild@1 - displayName: msbuild tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj - inputs: - solution: $(System.DefaultWorkingDirectory)/tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj - configuration: $(XA.Build.Configuration) - - - task: MSBuild@1 - displayName: msbuild tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj - inputs: - solution: $(System.DefaultWorkingDirectory)/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj - configuration: $(XA.Build.Configuration) - - - task: MSBuild@1 - displayName: msbuild tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj - inputs: - solution: $(System.DefaultWorkingDirectory)/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj - configuration: $(XA.Build.Configuration) + - script: make all-tests V=1 CONFIGURATION=$(XA.Build.Configuration) + displayName: make all-tests - script: | cp -r bin/$(XA.Build.Configuration)/bcl-tests bin/Test$(XA.Build.Configuration)/bcl-tests From 7dc665798f9bb4e0e6ad867907f5f7a205ac545d Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 12 Dec 2019 16:41:26 -0500 Subject: [PATCH 15/18] [tests] Copy and invoke NuGet.exe from subfolder `NuGet.exe` throws on macOS when it is invoked from the same folder as `Xunit.NetCore.Extensions.dll`: mono bin/TestRelease/NuGet.exe VTable setup of type Xunit.NetCore.Extensions.SkippedTestCase failed System.TypeLoadException: VTable setup of type Xunit.NetCore.Extensions.SkippedTestCase failed at (wrapper managed-to-native) System.RuntimeType.GetPropertiesByName_native(System.RuntimeType,intptr,System.Reflection.BindingFlags,System.RuntimeType/MemberListType) at System.RuntimeType.GetPropertiesByName (System.String name, System.Reflection.BindingFlags bindingAttr, System.RuntimeType+MemberListType listType, System.RuntimeType reflectedType) [0x0001b] in <7d0bc631cadd4a07bf74717847e90cfa>:0 at System.RuntimeType.GetPropertyCandidates (System.String name, System.Reflection.BindingFlags bindingAttr, System.Type[] types, System.Boolean allowPrefixLookup) [0x00010] in <7d0bc631cadd4a07bf74717847e90cfa>:0 at System.RuntimeType.GetProperties (System.Reflection.BindingFlags bindingAttr) [0x00000] in <7d0bc631cadd4a07bf74717847e90cfa>:0 at System.ComponentModel.Composition.AttributedModel.AttributedPartCreationInfo+d__32.MoveNext () [0x000eb] in <5e20d4aa8c6c44a89bf1aeb3c06f166c>:0 at System.Linq.Enumerable.Any[TSource] (System.Collections.Generic.IEnumerable`1[T] source) [0x00015] in :0 ... Move the copy of `NuGet.exe`into it's own folder to avoid this wierd behavior when executing `Xamarin.Android.Build.Tests.dll` on macOS. --- .../Tests/Xamarin.ProjectTools/Common/XamarinProject.cs | 2 +- .../Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs index a2c55bc6bf6..be473ade247 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs @@ -330,7 +330,7 @@ public virtual void NuGetRestore (string directory, string packagesDirectory = n return; var isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT; - var nuget = Path.Combine (Root, "NuGet.exe"); + var nuget = Path.Combine (Root, "nuget", "NuGet.exe"); var psi = new ProcessStartInfo (isWindows ? nuget : "mono") { Arguments = $"{(isWindows ? "" : "\"" + nuget + "\"")} restore -Verbosity Detailed -PackagesDirectory \"{Path.Combine (Root, directory, "..", "packages")}\" \"{Path.Combine (Root, directory, "packages.config")}\"", CreateNoWindow = true, diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj index d717bdc5a66..5cc2b19b465 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj @@ -143,6 +143,7 @@ + nuget\NuGet.exe PreserveNewest From 46640f22c895362ff699d50ea030a1c43bca1218 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 12 Dec 2019 17:36:27 -0500 Subject: [PATCH 16/18] Move ApiCompat ref back to BootstrapTasks proj --- .../Xamarin.Android.Tools.BootstrapTasks.csproj | 1 + src/Mono.Android/Mono.Android.csproj | 3 --- src/Mono.Android/Mono.Android.targets | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj index 1e4468f8aed..d5c1c629a29 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj @@ -62,6 +62,7 @@ + diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj index a48ac69f899..0865a4ce467 100644 --- a/src/Mono.Android/Mono.Android.csproj +++ b/src/Mono.Android/Mono.Android.csproj @@ -82,9 +82,6 @@ False - - - JavaNativeTypeManager.cs diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets index 5e1977ed976..c3cca5f366c 100644 --- a/src/Mono.Android/Mono.Android.targets +++ b/src/Mono.Android/Mono.Android.targets @@ -172,10 +172,8 @@ Name="AfterBuild" Inputs="$(TargetPath);@(ApiCompatibilityFiles)" Outputs="$(IntermediateOutputPath)CheckApiCompatibility.stamp"> - Date: Fri, 13 Dec 2019 10:48:29 -0500 Subject: [PATCH 17/18] Remove accidentially re-added ServiceModel ref Context: https://github.com/xamarin/xamarin-android/commit/9eb4b7f16785902c8942c7f9c88b31cd48a2b9aa --- .../Xamarin.Android.Build.Tasks.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index a86f2df3a35..0388392da1d 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -48,7 +48,6 @@ - ..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\pdb2mdb.exe From 24dd2f35d0533d810f4ccce4bc39a32abd73d1de Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 16 Dec 2019 15:21:08 -0500 Subject: [PATCH 18/18] Remove monodroid bump --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index e6192ba7530..72570a40307 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:pjcollins_netstd2-xabt@fb3ea0ff799c70886ce725843e0b7228442385fc +xamarin/monodroid:master@1b907d680cc6561dcfaddc6f997d2f6ff5456644 mono/mono:2019-10@18920a83f423fb864a2263948737681968f5b2c8