From a7871a32f4e1ec626465c60fa6561bde71c8d2f8 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 2 Sep 2024 13:45:20 +0200
Subject: [PATCH] Extra fix
---
src/net/JNet.sln | 6 -
src/net/JNet/JNet.csproj | 10 +-
src/net/JNet/JNetCore.csproj | 121 +++++++++++++++++--
src/net/JNetReflector/Templates/Templates.cs | 4 +-
4 files changed, 115 insertions(+), 26 deletions(-)
diff --git a/src/net/JNet.sln b/src/net/JNet.sln
index 15e204039d..b22ee199f7 100644
--- a/src/net/JNet.sln
+++ b/src/net/JNet.sln
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNetPS", "JNetPS\JNetPS.csp
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNetPSCore", "JNetPSCore\JNetPSCore.csproj", "{071F6CA5-0159-44B3-9670-9404A5B75D65}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNetCore", "JNet\JNetCore.csproj", "{CA9A182E-F0A5-4A48-AB00-C5E70BA243F9}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -47,10 +45,6 @@ Global
{071F6CA5-0159-44B3-9670-9404A5B75D65}.Debug|Any CPU.Build.0 = Debug|Any CPU
{071F6CA5-0159-44B3-9670-9404A5B75D65}.Release|Any CPU.ActiveCfg = Release|Any CPU
{071F6CA5-0159-44B3-9670-9404A5B75D65}.Release|Any CPU.Build.0 = Release|Any CPU
- {CA9A182E-F0A5-4A48-AB00-C5E70BA243F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CA9A182E-F0A5-4A48-AB00-C5E70BA243F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CA9A182E-F0A5-4A48-AB00-C5E70BA243F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CA9A182E-F0A5-4A48-AB00-C5E70BA243F9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/net/JNet/JNet.csproj b/src/net/JNet/JNet.csproj
index 77b813463b..914496848d 100644
--- a/src/net/JNet/JNet.csproj
+++ b/src/net/JNet/JNet.csproj
@@ -51,15 +51,11 @@
-
-
-
-
-
+
+
All
None
-
-
+
diff --git a/src/net/JNet/JNetCore.csproj b/src/net/JNet/JNetCore.csproj
index bdff35cc32..8a2fb10148 100644
--- a/src/net/JNet/JNetCore.csproj
+++ b/src/net/JNet/JNetCore.csproj
@@ -54,8 +54,6 @@
-
-
@@ -63,17 +61,118 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/net/JNetReflector/Templates/Templates.cs b/src/net/JNetReflector/Templates/Templates.cs
index 86bf222056..3461db9ec9 100644
--- a/src/net/JNetReflector/Templates/Templates.cs
+++ b/src/net/JNetReflector/Templates/Templates.cs
@@ -157,8 +157,8 @@ public class ClassStub
public const string LISTENER_CLASS_WARNING = "#warning Remember to build the Java class for event listener";
public static string LISTENER_CLASS_BLOCK = " const string _bridgeClassName = \"ALLPACKAGE_CLASSES_STUB_JAVACLASS_PLACEHOLDER\";" + Environment.NewLine
- + " private static readonly IJavaType _LocalBridgeClazz = ClazzOf(_bridgeClassName);" + Environment.NewLine
- + " private static IJavaType LocalBridgeClazz => _LocalBridgeClazz ?? throw new InvalidOperationException($\"Class {_bridgeClassName} was not found.\");" + Environment.NewLine
+ + " private static readonly MASES.JCOBridge.C2JBridge.JVMInterop.IJavaType _LocalBridgeClazz = ClazzOf(_bridgeClassName);" + Environment.NewLine
+ + " private static MASES.JCOBridge.C2JBridge.JVMInterop.IJavaType LocalBridgeClazz => _LocalBridgeClazz ?? throw new global::System.InvalidOperationException($\"Class {_bridgeClassName} was not found.\");" + Environment.NewLine
+ " " + Environment.NewLine
+ " /// " + Environment.NewLine
+ " /// " + Environment.NewLine