[Java.Base] Begin binding JDK-11 java.base module

Directory.Build.props

@@ -30,6 +30,10 @@
       Project="$(_OutputPath)JdkInfo.props"
       Condition="Exists('$(_OutputPath)JdkInfo.props')"
   />
+  <Import
+      Project="$(_OutputPath)JdkInfo-11.props"
+      Condition="Exists('$(_OutputPath)JdkInfo-11.props')"
+  />
   <Import
       Project="$(_OutputPath)MonoInfo.props"
       Condition="Exists('$(_OutputPath)MonoInfo.props')"

Java.Interop.sln

@@ -105,6 +105,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.JavaType
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaTypeSystem-Tests", "tests\Java.Interop.Tools.JavaTypeSystem-Tests\Java.Interop.Tools.JavaTypeSystem-Tests.csproj", "{11942DE9-AEC2-4B95-87AB-CA707C37643D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Base", "src\Java.Base\Java.Base.csproj", "{30DCECA5-16FD-4FD0-883C-E5E83B11565D}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{58b564a1-570d-4da2-b02d-25bddb1a9f4f}*SharedItemsImports = 5
@@ -296,6 +298,10 @@ Global
 		{11942DE9-AEC2-4B95-87AB-CA707C37643D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11942DE9-AEC2-4B95-87AB-CA707C37643D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11942DE9-AEC2-4B95-87AB-CA707C37643D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30DCECA5-16FD-4FD0-883C-E5E83B11565D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30DCECA5-16FD-4FD0-883C-E5E83B11565D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30DCECA5-16FD-4FD0-883C-E5E83B11565D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30DCECA5-16FD-4FD0-883C-E5E83B11565D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -346,6 +352,7 @@ Global
 		{BF5A4019-F2FF-45AC-949D-EF7E8C94196B} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
 		{B173F53B-986C-4E0D-881C-063BBB116E1D} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
 		{11942DE9-AEC2-4B95-87AB-CA707C37643D} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
+		{30DCECA5-16FD-4FD0-883C-E5E83B11565D} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {29204E0C-382A-49A0-A814-AD7FBF9774A5}

build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/JdkInfo.cs

@@ -19,6 +19,8 @@ public class JdkInfo : Task
 	{
 		public  string  JdksRoot              { get; set; }
 
+		public  string  PropertyNameModifier  { get; set; } = "";
+		public  string  MinimumJdkVersion     { get; set; }
 		public  string  MaximumJdkVersion     { get; set; }
 
 		public  string  DotnetToolPath        { get; set; }
@@ -28,19 +30,22 @@ public class JdkInfo : Task
 		[Required]
 		public  ITaskItem       PropertyFile        { get; set; }
 
-		[Required]
 		public  ITaskItem       MakeFragmentFile    { get; set; }
 
 		[Output]
 		public  string          JavaHomePath        { get; set; }
 
 		public override bool Execute ()
 		{
+			var minVersion      = GetVersion (MinimumJdkVersion);
 			var maxVersion      = GetVersion (MaximumJdkVersion);
 
-			XATInfo jdk         = XATInfo.GetKnownSystemJdkInfos (CreateLogger ())
+			var explicitJdks    = GetJdkRoots ();
+			var defaultJdks     = XATInfo.GetKnownSystemJdkInfos (CreateLogger ())
+				.Where (j => minVersion != null ? j.Version >= minVersion : true)
 				.Where (j => maxVersion != null ? j.Version <= maxVersion : true)
-				.Where (j => j.IncludePath.Any ())
+				.Where (j => j.IncludePath.Any ());
+			var jdk             = explicitJdks.Concat (defaultJdks)
 				.FirstOrDefault ();
 
 			if (jdk == null) {
@@ -56,14 +61,31 @@ public override bool Execute ()
 			JavaHomePath  = jdk.HomePath;
 
 			Directory.CreateDirectory (Path.GetDirectoryName (PropertyFile.ItemSpec));
-			Directory.CreateDirectory (Path.GetDirectoryName (MakeFragmentFile.ItemSpec));
-
 			WritePropertyFile (jdk.JavaPath, jdk.JarPath, jdk.JavacPath, jdk.JdkJvmPath, rtJarPath, jdk.IncludePath);
-			WriteMakeFragmentFile (jdk.JavaPath, jdk.JarPath, jdk.JavacPath, jdk.JdkJvmPath, rtJarPath, jdk.IncludePath);
+
+			if (MakeFragmentFile != null) {
+				Directory.CreateDirectory (Path.GetDirectoryName (MakeFragmentFile.ItemSpec));
+				WriteMakeFragmentFile (jdk.JavaPath, jdk.JarPath, jdk.JavacPath, jdk.JdkJvmPath, rtJarPath, jdk.IncludePath);
+			}
 
 			return !Log.HasLoggedErrors;
 		}
 
+		XATInfo[] GetJdkRoots ()
+		{
+			XATInfo jdk = null;
+			try {
+				if (!string.IsNullOrEmpty (JdksRoot))
+					jdk = new XATInfo (JdksRoot);
+			} catch (Exception e) {
+				Log.LogWarning ($"Could not get information about JdksRoot path `{JdksRoot}`: {e.Message}");
+				Log.LogMessage (MessageImportance.Low, e.ToString ());
+			}
+			return jdk == null
+				? Array.Empty<XATInfo>()
+				: new[] { jdk };
+		}
+
 		Version GetVersion (string value)
 		{
 			if (string.IsNullOrEmpty (value))
@@ -97,39 +119,35 @@ Action<TraceLevel, string> CreateLogger ()
 
 		void WritePropertyFile (string javaPath, string jarPath, string javacPath, string jdkJvmPath, string rtJarPath, IEnumerable<string> includes)
 		{
-			var dotnet = string.IsNullOrEmpty (DotnetToolPath) ? "dotnet" : DotnetToolPath;
 			var msbuild = XNamespace.Get ("http://schemas.microsoft.com/developer/msbuild/2003");
+			var jdkJvmP = $"JdkJvm{PropertyNameModifier}Path";
 			var project = new XElement (msbuild + "Project",
 				new XElement (msbuild + "Choose",
-					new XElement (msbuild + "When", new XAttribute ("Condition", " '$(JdkJvmPath)' == '' "),
+					new XElement (msbuild + "When", new XAttribute ("Condition", $" '$({jdkJvmP})' == '' "),
 						new XElement (msbuild + "PropertyGroup",
-							new XElement (msbuild + "JdkJvmPath", jdkJvmPath)),
+							new XElement (msbuild + jdkJvmP, jdkJvmPath)),
 						new XElement (msbuild + "ItemGroup",
-							includes.Select (i => new XElement (msbuild + "JdkIncludePath", new XAttribute ("Include", i)))))),
+							includes.Select (i => new XElement (msbuild + $"Jdk{PropertyNameModifier}IncludePath", new XAttribute ("Include", i)))))),
 				new XElement (msbuild + "PropertyGroup",
-					new XElement (msbuild + "JavaSdkDirectory", new XAttribute ("Condition", " '$(JavaSdkDirectory)' == '' "),
-						JavaHomePath),
-					new XElement (msbuild + "JavaPath", new XAttribute ("Condition", " '$(JavaPath)' == '' "),
-						javaPath),
-					new XElement (msbuild + "JavaCPath", new XAttribute ("Condition", " '$(JavaCPath)' == '' "),
-						javacPath),
-					new XElement (msbuild + "JarPath", new XAttribute ("Condition", " '$(JarPath)' == '' "),
-						jarPath),
-					new XElement (msbuild + "DotnetToolPath", new XAttribute ("Condition", " '$(DotnetToolPath)' == '' "),
-						dotnet),
-					CreateJreRtJarPath (msbuild, rtJarPath)));
+					CreateProperty (msbuild, $"Java{PropertyNameModifier}SdkDirectory", JavaHomePath),
+					CreateProperty (msbuild, $"Java{PropertyNameModifier}Path", javaPath),
+					CreateProperty (msbuild, $"JavaC{PropertyNameModifier}Path", javacPath),
+					CreateProperty (msbuild, $"Jar{PropertyNameModifier}Path", jarPath),
+					CreateProperty (msbuild, $"Dotnet{PropertyNameModifier}ToolPath", DotnetToolPath),
+					CreateProperty (msbuild, $"Jre{PropertyNameModifier}RtJarPath", rtJarPath)));
 			project.Save (PropertyFile.ItemSpec);
 		}
 
-		static XElement CreateJreRtJarPath (XNamespace msbuild, string rtJarPath)
+		XElement CreateProperty (XNamespace msbuild, string propertyName, string propertyValue)
 		{
-			if (rtJarPath == null)
+			if (string.IsNullOrEmpty (propertyValue)) {
 				return null;
-			return new XElement (msbuild + "JreRtJarPath",
-					new XAttribute ("Condition", " '$(JreRtJarPath)' == '' "),
-					rtJarPath);
-		}
+			}
 
+			return new XElement (msbuild + propertyName,
+					new XAttribute ("Condition", $" '$({propertyName})' == '' "),
+					propertyValue);
+		}
 		void WriteMakeFragmentFile (string javaPath, string jarPath, string javacPath, string jdkJvmPath, string rtJarPath, IEnumerable<string> includes)
 		{
 			using (var o = new StreamWriter (MakeFragmentFile.ItemSpec)) {

build-tools/scripts/Prepare.targets

@@ -13,14 +13,26 @@
     <PropertyGroup>
       <_MaxJdk>$(MaxJdkVersion)</_MaxJdk>
       <_MaxJdk Condition=" '$(_MaxJdk)' == '' ">$(JI_MAX_JDK)</_MaxJdk>
+      <Jdks8Root Condition=" '$(Jdks8Root)' == '' And '$(JAVA_HOME_8_X64)' != '' And Exists($(JAVA_HOME_8_X64)) ">$(JAVA_HOME_8_X64)</Jdks8Root>
     </PropertyGroup>
     <JdkInfo
-        JdksRoot="$(ProgramFiles)\Java"
+        JdksRoot="$(Jdks8Root)"
         MakeFragmentFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\JdkInfo.mk"
         MaximumJdkVersion="$(_MaxJdk)"
         DotnetToolPath="$(DotnetToolPath)"
         PropertyFile="$(_TopDir)\bin\Build$(Configuration)\JdkInfo.props">
       <Output TaskParameter="JavaHomePath" PropertyName="_JavaSdkDirectory" />
     </JdkInfo>
+    <PropertyGroup>
+      <Jdks11Root Condition=" '$(Jdks11Root)' == '' And '$(JAVA_HOME_11_X64)' != '' And Exists($(JAVA_HOME_11_X64)) ">$(JAVA_HOME_11_X64)</Jdks11Root>
+    </PropertyGroup>
+    <JdkInfo
+        JdksRoot="$(Jdks11Root)"
+        PropertyNameModifier="11"
+        MinimumJdkVersion="11.0"
+        MaximumJdkVersion="11.99.0"
+        PropertyFile="$(_TopDir)\bin\Build$(Configuration)\JdkInfo-11.props">
+      <Output TaskParameter="JavaHomePath" PropertyName="Java11SdkDirectory"/>
+    </JdkInfo>
   </Target>
 </Project>

build-tools/scripts/jdk.targets

@@ -10,5 +10,13 @@
         PropertyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\JdkInfo.props">
       <Output TaskParameter="JavaHomePath" PropertyName="_JavaHome"/>
     </JdkInfo>
+    <JdkInfo
+        JdksRoot="$(JdksRoot)"
+        PropertyNameModifier="11"
+        MinimumJdkVersion="11.0"
+        MaximumJdkVersion="11.99.0"
+        PropertyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\JdkInfo-11.props">
+      <Output TaskParameter="JavaHomePath" PropertyName="Java11SdkDirectory"/>
+    </JdkInfo>
   </Target>
 </Project>

samples/Hello/Hello.csproj

@@ -1,14 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <OutputPath>..\..\bin\Test$(Configuration)</OutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <OutputPath>$(TestOutputFullPath)</OutputPath>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,6 +14,8 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Java.Interop\Java.Interop.csproj" />
     <ProjectReference Include="..\..\src\Java.Runtime.Environment\Java.Runtime.Environment.csproj" />
+    <ProjectReference Include="..\..\src\Java.Base\Java.Base.csproj" />
+    <ProjectReference Include="..\..\tests\TestJVM\TestJVM.csproj" />
   </ItemGroup>
 
 </Project>

samples/Hello/Program.cs

@@ -1,23 +1,65 @@
 using System;
 using System.Threading;
 
+using Mono.Options;
+
 using Java.Interop;
 
 namespace Hello
 {
-	class MainClass
+	class App
 	{
-		public static unsafe void Main (string[] args)
+		public static void Main (string[] args)
 		{
-			Console.WriteLine ("Hello World!");
-			try {
-				var ignore = JniRuntime.CurrentRuntime;
-			} catch (InvalidOperationException e) {
-				Console.WriteLine (e);
+			string? jvmPath             = global::Java.InteropTests.TestJVM.GetJvmLibraryPath ();
+			bool    createMultipleVMs   = false;
+			bool    showHelp            = false;
+			var options = new OptionSet () {
+				"Using the JVM from C#!",
+				"",
+				"Options:",
+				{ "jvm=",
+				  $"{{PATH}} to JVM to use.  Default is:\n  {jvmPath}",
+				  v => jvmPath = v },
+				{ "m",
+				  "Create multiple Java VMs.  This will likely creash.",
+				  v => createMultipleVMs = v != null },
+				{ "h|help",
+				  "Show this message and exit.",
+				  v => showHelp = v != null },
+			};
+			options.Parse (args);
+			if (showHelp) {
+				options.WriteOptionDescriptions (Console.Out);
+				return;
 			}
+			Console.WriteLine ("Hello World!");
+			var builder = new JreRuntimeOptions () {
+				JniAddNativeMethodRegistrationAttributePresent  = true,
+				JvmLibraryPath                                  = jvmPath,
+			};
+			builder.AddOption ("-Xcheck:jni");
+			var jvm = builder.CreateJreVM ();
+			Console.WriteLine ($"JniRuntime.CurrentRuntime == jvm? {ReferenceEquals (JniRuntime.CurrentRuntime, jvm)}");
 			foreach (var h in JniRuntime.GetAvailableInvocationPointers ()) {
 				Console.WriteLine ("PRE: GetCreatedJavaVMHandles: {0}", h);
 			}
+
+			CreateJLO ();
+
+			if (createMultipleVMs) {
+				CreateAnotherJVM ();
+			}
+		}
+
+		static void CreateJLO ()
+		{
+			var jlo = new Java.Lang.Object ();
+			Console.WriteLine ($"binding? {jlo.ToString ()}");
+		}
+
+		static unsafe void CreateAnotherJVM ()
+		{
 			Console.WriteLine ("Part 2!");
 			using (var vm = new JreRuntimeOptions ().CreateJreVM ()) {
 				Console.WriteLine ("# JniEnvironment.EnvironmentPointer={0}", JniEnvironment.EnvironmentPointer);

src/Java.Base/Java.Base.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Nullable>enable</Nullable>
+    <NoWarn>8764</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Java.Interop\Java.Interop.csproj" />
+    <ProjectReference Include="..\..\tools\class-parse\class-parse.csproj"  ReferenceOutputAssembly="False" />
+    <ProjectReference Include="..\..\tools\generator\generator.csproj"      ReferenceOutputAssembly="False" />
+  </ItemGroup>
+
+  <Import Project="Java.Base.targets" />
+
+</Project>