Set up packaging of AOT-compiled files in .NET 9 Clojure.Main tool build

Author: dmiller

Clojure/Clojure.Main/Clojure.Main.csproj

@@ -24,6 +24,14 @@
     <ProjectReference Include="..\Clojure.Source\Clojure.Source.csproj" />
     <ProjectReference Include="..\Clojure\Clojure.csproj" />
   </ItemGroup>
+	
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0' ">
+		<TfmSpecificPackageFile Include ="$(OutputPath)\*.clj*.dll">
+			<Pack>true</Pack>
+			<PackagePath>tools\$(TargetFramework)\any\</PackagePath>
+		</TfmSpecificPackageFile>
+	</ItemGroup>
 
 
 </Project>

Clojure/Clojure.Tests/clojure/test_clojure/attributes.clj

@@ -57,16 +57,12 @@ Foo (^{ObsoleteAttribute "abc"
 	{:type AnAttribute :primary "def" :secondary nil}
 	{:type AnAttribute :primary "ghi" :secondary "jkl"}})
 
-(println "expected-attributes:     " expected-attributes)
-(println "expected-attributes+ser: " expected-attributes+ser)
-
 (def expected-attributes-field
  #{ {:type NonSerializedAttribute}
     {:type ObsoleteAttribute :message "abc"}})
 
 (deftest test-attributes-on-type
   (is (=
-
        expected-attributes+ser
        (into #{} (map attribute->map (get-custom-attributes Bar))))))
 

Clojure/Clojure/CljCompiler/Compiler.cs

@@ -1737,6 +1737,13 @@ public static object Compile(GenContext context,TextReader rdr, string sourceDir
             MethodBuilder initMB = initTB.DefineMethod("Initialize", MethodAttributes.Public | MethodAttributes.Static, typeof(void), Type.EmptyTypes);
             CljILGen ilg = new CljILGen(initMB.GetILGenerator());
 
+            //// Print a little message, for debugging purposes
+            //ilg.Emit(OpCodes.Ldstr, $"Initializing {sourceDirectory} {relativePath} ");
+            //ilg.Emit(OpCodes.Call, typeof(Console).GetMethod("WriteLine",
+            //    new Type[] { typeof(string) }));
+            //ilg.Emit(OpCodes.Call, typeof(Console).GetMethod("get_Out"));
+            //ilg.Emit(OpCodes.Call, typeof(System.IO.TextWriter).GetMethod("Flush"));
+
             LineNumberingTextReader lntr = rdr as LineNumberingTextReader ?? new LineNumberingTextReader(rdr);
 
             Var.pushThreadBindings(RT.mapUniqueKeys(

Clojure/Clojure/Clojure.csproj

@@ -31,7 +31,7 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net90' ">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0' ">
 		<PackageReference Include="System.Runtime.Serialization.Formatters" Version="9.0.3" />
 	</ItemGroup>
 
@@ -66,7 +66,7 @@
 	</ItemGroup>
 	-->
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net90'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net9.0'">
 		<Parent Include="$(SolutionDir)Clojure.Compile\$(OutDir)\clojure.*.dll" /> 
 		<EmbeddedResource Include="@(Parent)">
 			<Link>%(Filename)$(Extension)</Link>

Clojure/Clojure/Lib/RT.cs

@@ -3468,8 +3468,10 @@ public static FileInfo FindFile(string fileName)
             FileInfo fi;
 
             foreach (string path in GetFindFilePaths())
-                if ((fi = FindFile(path, fileName)) != null)
-                    return fi;
+            {
+                fi = FindFile(path, fileName);
+                if (fi is not null ) return fi;
+            }
 
             return FindRemappedFile(fileName);
         }