Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Submodule Java.Interop updated 48 files
+1 −1 .editorconfig
+6 −0 .gitattributes
+9 −0 .github/dependabot.yml
+11 −11 Directory.Build.targets
+6 −16 Documentation/Architecture.md
+15 −32 build-tools/jnienv-gen/Generator.cs
+1 −1 build-tools/scripts/cecil.projitems
+1 −1 external/xamarin-android-tools
+6 −6 global.json
+1 −1 src/Java.Base-ref.cs
+9 −0 src/Java.Interop.Localization/Resources.Designer.cs
+4 −0 src/Java.Interop.Localization/Resources.resx
+1 −0 src/Java.Interop.Tools.Generator/Utilities/Report.cs
+2 −2 src/Java.Interop/Java.Interop.csproj
+0 −18 src/Java.Interop/Java.Interop/JavaException.cs
+0 −18 src/Java.Interop/Java.Interop/JavaObject.cs
+0 −14 src/Java.Interop/Java.Interop/JniAllocObjectRef.cs
+3 −39 src/Java.Interop/Java.Interop/JniEnvironment.Types.cs
+0 −71 src/Java.Interop/Java.Interop/JniEnvironment.cs
+0 −29 src/Java.Interop/Java.Interop/JniGlobalReference.cs
+0 −40 src/Java.Interop/Java.Interop/JniLocalReference.cs
+0 −70 src/Java.Interop/Java.Interop/JniObjectReference.cs
+0 −12 src/Java.Interop/Java.Interop/JniPeerMembers.cs
+0 −91 src/Java.Interop/Java.Interop/JniReferenceSafeHandle.cs
+0 −9 src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
+0 −7 src/Java.Interop/Java.Interop/JniTransition.cs
+0 −30 src/Java.Interop/Java.Interop/JniWeakGlobalReference.cs
+1 −0 tests/Java.Base-Tests/Java.Base-Tests.csproj
+0 −4 tests/Java.Interop-Tests/Java.Interop-Tests.csproj
+0 −8 tests/Java.Interop-Tests/Java.Interop/JavaArrayContract.cs
+0 −8 tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs
+0 −36 tests/Java.Interop-Tests/Java.Interop/JniReferenceSafeHandleTest.cs
+0 −8 tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs
+70 −0 tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinInlineClassCollisionTests.cs
+7 −1 tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj
+25 −0 tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.targets
+4 −0 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin-gradle/.gitignore
+21 −0 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin-gradle/build.gradle.kts
+5 −0 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin-gradle/gradle.properties
+1 −0 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin-gradle/settings.gradle.kts
+34 −0 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin-gradle/src/main/kotlin/InlineClassCollisions.kt
+150 −0 tests/generator-Tests/Unit-Tests/KotlinFixupsTests.cs
+20 −51 tests/invocation-overhead/README.md
+0 −226 tests/invocation-overhead/invocation-overhead.cs
+1 −1 tests/invocation-overhead/invocation-overhead.csproj
+10 −4,785 tests/invocation-overhead/jni.cs
+45 −2 tools/generator/Java.Interop.Tools.Generator.Transformation/KotlinFixups.cs
+1 −1 tools/param-name-importer/HtmlLoader.cs
37 changes: 37 additions & 0 deletions src-ThirdParty/NUnitLite/Attributes/OneTimeSetUpAttribute.cs
Original file line numberDiff line numberDiff line change
@@ -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
{
}
}
37 changes: 37 additions & 0 deletions src-ThirdParty/NUnitLite/Attributes/OneTimeTearDownAttribute.cs
Original file line numberDiff line numberDiff line change
@@ -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
{
}
}
Loading