diff --git a/Directory.Build.targets b/Directory.Build.targets
index 838e2015637..3757e938813 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -5,7 +5,7 @@
     <PackageReference Update="Microsoft.SourceLink.GitHub"                  Version="8.0.0" />
     <PackageReference Update="Microsoft.Win32.Registry"                     Version="5.0.0" />
     <PackageReference Update="System.CodeDom"                               Version="10.0.8" />
-    <PackageReference Update="Irony"                                        Version="1.1.0" />
+    <PackageReference Update="Irony"                                        Version="1.5.3" />
   </ItemGroup>
 
   <!-- Automatically add NRT attribute support for netstandard2.0 projects using NRT -->
diff --git a/external/Java.Interop b/external/Java.Interop
index e38211334a7..b881d21f51c 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit e38211334a73cb77656324ce2eeefb16707ef5a2
+Subproject commit b881d21f51cbac6e175de1b2f6c254fe3846aa1d
diff --git a/src-ThirdParty/NUnitLite/Attributes/OneTimeSetUpAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/OneTimeSetUpAttribute.cs
new file mode 100644
index 00000000000..4f7104e9fc5
--- /dev/null
+++ b/src-ThirdParty/NUnitLite/Attributes/OneTimeSetUpAttribute.cs
@@ -0,0 +1,37 @@
+// ***********************************************************************
+// Copyright (c) 2009 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
+
+// Compat shim so test source using NUnit 3.x [OneTimeSetUp]/[OneTimeTearDown] still compiles against Xamarin.Android.NUnitLite.
+namespace NUnit.Framework
+{
+	using System;
+
+	/// <summary>
+	/// Compatibility alias for <see cref="TestFixtureSetUpAttribute"/> so test source
+	/// targeting NUnit 3.x's [OneTimeSetUp] name compiles against bundled NUnitLite.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Method, AllowMultiple=false, Inherited=true)]
+	public class OneTimeSetUpAttribute : TestFixtureSetUpAttribute
+	{
+	}
+}
diff --git a/src-ThirdParty/NUnitLite/Attributes/OneTimeTearDownAttribute.cs b/src-ThirdParty/NUnitLite/Attributes/OneTimeTearDownAttribute.cs
new file mode 100644
index 00000000000..290ab470552
--- /dev/null
+++ b/src-ThirdParty/NUnitLite/Attributes/OneTimeTearDownAttribute.cs
@@ -0,0 +1,37 @@
+// ***********************************************************************
+// Copyright (c) 2009 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
+
+// Compat shim so test source using NUnit 3.x [OneTimeSetUp]/[OneTimeTearDown] still compiles against Xamarin.Android.NUnitLite.
+namespace NUnit.Framework
+{
+	using System;
+
+	/// <summary>
+	/// Compatibility alias for <see cref="TestFixtureTearDownAttribute"/> so test source
+	/// targeting NUnit 3.x's [OneTimeTearDown] name compiles against bundled NUnitLite.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Method, AllowMultiple=false, Inherited=true)]
+	public class OneTimeTearDownAttribute : TestFixtureTearDownAttribute
+	{
+	}
+}