Revert some unintended changes.

Author: jpobst

tools/generator/CodeGenerationOptions.cs

@@ -132,10 +132,9 @@ public string GetNullForgiveness (Parameter symbol)
 			return string.Empty;
 		}
 
-		string GetNullable(string s)
+		string GetNullable (string s)
 		{
-			switch (s)
-			{
+			switch (s) {
 				case "void":
 				case "int":
 				//case "int[]":
@@ -162,7 +161,9 @@ string GetNullable(string s)
 
 		// Encoding format:
 		// - Type name prefix: _JniMarshal_PP
-		// - Parameter types, using JNI encoding, e.g. Z is boolean, I is int, etc. Exception: Reference types, normally encoded as L…;, are instead just L.
+		// - Parameter types, using JNI encoding, e.g. Z is boolean, I is int, etc.
+		//   - Exception: Reference types, normally encoded as L…;, are instead just L.
+		//   - Lowercase JNI encoding indicates unsigned type, e.g. i is uint.
 		// - Another _.
 		// - Return type, encoded as with parameters. A void return type is V.
 		internal string GetJniMarshalDelegate (Method method)

tools/generator/generator.csproj

@@ -1,16 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <DefineConstants>$(DefineConstants);GENERATOR;HAVE_CECIL;JCW_ONLY_TYPE_NAMES</DefineConstants>
-    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
     <OutputPath>$(UtilityOutputFullPath)</OutputPath>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="generator.slnf" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\..\src\utils\StringRocks.cs">
       <Link>utils\StringRocks.cs</Link>
@@ -36,7 +39,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Xamarin.SourceWriter\Xamarin.SourceWriter.csproj" />
     <ProjectReference Include="..\..\src\Xamarin.Android.Tools.AnnotationSupport\Xamarin.Android.Tools.AnnotationSupport.csproj" />
     <ProjectReference Include="..\..\src\Xamarin.Android.Tools.ApiXmlAdjuster\Xamarin.Android.Tools.ApiXmlAdjuster.csproj" />
     <ProjectReference Include="..\..\src\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />

tools/generator/generator.sln

@@ -0,0 +1,15 @@
+{
+  "solution": {
+    "path": "C:\\code\\xamarin-android-backport\\external\\Java.Interop\\Java.Interop.sln",
+    "projects": [
+      "src\\Java.Interop.NamingCustomAttributes\\Java.Interop.NamingCustomAttributes.shproj",
+      "src\\Java.Interop.Tools.Cecil\\Java.Interop.Tools.Cecil.csproj",
+      "src\\Java.Interop.Tools.JavaCallableWrappers\\Java.Interop.Tools.JavaCallableWrappers.csproj",
+      "src\\Java.Interop.Tools.Diagnostics\\Java.Interop.Tools.Diagnostics.csproj",
+      "src\\Xamarin.Android.Tools.AnnotationSupport\\Xamarin.Android.Tools.AnnotationSupport.csproj",
+      "src\\Xamarin.Android.Tools.ApiXmlAdjuster\\Xamarin.Android.Tools.ApiXmlAdjuster.csproj",
+      "tests\\generator-Tests\\generator-Tests.csproj",
+      "tools\\generator\\generator.csproj",
+    ]
+  }
+}