Merge pull request #656 from ikvmnet/net472unix

NET472 tool support on Unix
ikvmnet · Feb 2, 2025 · 14fdb4f · 14fdb4f
2 parents 928905d + c85f31f
commit 14fdb4f
Show file tree

Hide file tree

Showing 14 changed files with 220 additions and 97 deletions.
diff --git a/src/IKVM.MSBuild.Tools.runtime.linux-x64/IKVM.MSBuild.Tools.runtime.linux-x64.csproj b/src/IKVM.MSBuild.Tools.runtime.linux-x64/IKVM.MSBuild.Tools.runtime.linux-x64.csproj
@@ -15,6 +15,22 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PublishProjectReference Include="..\ikvmc\ikvmc.csproj">
+            <SetTargetFramework>TargetFramework=net472</SetTargetFramework>
+            <SetRuntimeIdentifier>RuntimeIdentifier=linux-x64</SetRuntimeIdentifier>
+            <PublishTargetPath Condition=" '$(TargetFramework)' != '' ">ikvmc\net472\linux-x64</PublishTargetPath>
+            <CopyToOutputDirectory Condition=" '$(TargetFramework)' != '' ">PreserveNewest</CopyToOutputDirectory>
+            <PublishPackagePath>ikvmc\net472\linux-x64</PublishPackagePath>
+            <Pack>true</Pack>
+        </PublishProjectReference>
+        <PublishProjectReference Include="..\ikvmstub\ikvmstub.csproj">
+            <SetTargetFramework>TargetFramework=net472</SetTargetFramework>
+            <SetRuntimeIdentifier>RuntimeIdentifier=linux-x64</SetRuntimeIdentifier>
+            <PublishTargetPath Condition=" '$(TargetFramework)' != '' ">ikvmstub\net472\linux-x64</PublishTargetPath>
+            <CopyToOutputDirectory Condition=" '$(TargetFramework)' != '' ">PreserveNewest</CopyToOutputDirectory>
+            <PublishPackagePath>ikvmstub\net472\linux-x64</PublishPackagePath>
+            <Pack>true</Pack>
+        </PublishProjectReference>
         <PublishProjectReference Include="..\ikvmc\ikvmc.csproj">
             <SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=linux-x64</SetRuntimeIdentifier>

diff --git a/...SBuild.Tools.runtime.linux-x64/buildTransitive/IKVM.MSBuild.Tools.runtime.linux-x64.props b/...SBuild.Tools.runtime.linux-x64/buildTransitive/IKVM.MSBuild.Tools.runtime.linux-x64.props
@@ -4,7 +4,9 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net472\linux-x64\" TargetFramework="net472" RuntimeIdentifier="linux-x64" />
         <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net8.0\linux-x64\" TargetFramework="net8.0" RuntimeIdentifier="linux-x64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net472\linux-x64\" TargetFramework="net472" RuntimeIdentifier="linux-x64" />
         <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net8.0\linux-x64\" TargetFramework="net8.0" RuntimeIdentifier="linux-x64" />
     </ItemGroup>
 

diff --git a/src/IKVM.MSBuild.Tools.runtime.osx-arm64/IKVM.MSBuild.Tools.runtime.osx-arm64.csproj b/src/IKVM.MSBuild.Tools.runtime.osx-arm64/IKVM.MSBuild.Tools.runtime.osx-arm64.csproj
@@ -15,6 +15,22 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PublishProjectReference Include="..\ikvmc\ikvmc.csproj">
+            <SetTargetFramework>TargetFramework=net472</SetTargetFramework>
+            <SetRuntimeIdentifier>RuntimeIdentifier=osx-arm64</SetRuntimeIdentifier>
+            <PublishTargetPath Condition=" '$(TargetFramework)' != '' ">ikvmc\net472\osx-arm64</PublishTargetPath>
+            <CopyToOutputDirectory Condition=" '$(TargetFramework)' != '' ">PreserveNewest</CopyToOutputDirectory>
+            <PublishPackagePath>ikvmc\net472\osx-arm64</PublishPackagePath>
+            <Pack>true</Pack>
+        </PublishProjectReference>
+        <PublishProjectReference Include="..\ikvmstub\ikvmstub.csproj">
+            <SetTargetFramework>TargetFramework=net472</SetTargetFramework>
+            <SetRuntimeIdentifier>RuntimeIdentifier=osx-arm64</SetRuntimeIdentifier>
+            <PublishTargetPath Condition=" '$(TargetFramework)' != '' ">ikvmstub\net472\osx-arm64</PublishTargetPath>
+            <CopyToOutputDirectory Condition=" '$(TargetFramework)' != '' ">PreserveNewest</CopyToOutputDirectory>
+            <PublishPackagePath>ikvmstub\net472\osx-arm64</PublishPackagePath>
+            <Pack>true</Pack>
+        </PublishProjectReference>
         <PublishProjectReference Include="..\ikvmc\ikvmc.csproj">
             <SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=osx-arm64</SetRuntimeIdentifier>

diff --git a/...SBuild.Tools.runtime.osx-arm64/buildTransitive/IKVM.MSBuild.Tools.runtime.osx-arm64.props b/...SBuild.Tools.runtime.osx-arm64/buildTransitive/IKVM.MSBuild.Tools.runtime.osx-arm64.props
@@ -4,7 +4,9 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net472\osx-arm64\" TargetFramework="net472" RuntimeIdentifier="osx-arm64" />
         <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net8.0\osx-arm64\" TargetFramework="net8.0" RuntimeIdentifier="osx-arm64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net472\osx-arm64\" TargetFramework="net472" RuntimeIdentifier="osx-arm64" />
         <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net8.0\osx-arm64\" TargetFramework="net8.0" RuntimeIdentifier="osx-arm64" />
     </ItemGroup>
 

diff --git a/src/IKVM.MSBuild.Tools.runtime.osx-x64/IKVM.MSBuild.Tools.runtime.osx-x64.csproj b/src/IKVM.MSBuild.Tools.runtime.osx-x64/IKVM.MSBuild.Tools.runtime.osx-x64.csproj
@@ -15,6 +15,22 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PublishProjectReference Include="..\ikvmc\ikvmc.csproj">
+            <SetTargetFramework>TargetFramework=net472</SetTargetFramework>
+            <SetRuntimeIdentifier>RuntimeIdentifier=osx-x64</SetRuntimeIdentifier>
+            <PublishTargetPath Condition=" '$(TargetFramework)' != '' ">ikvmc\net472\osx-x64</PublishTargetPath>
+            <CopyToOutputDirectory Condition=" '$(TargetFramework)' != '' ">PreserveNewest</CopyToOutputDirectory>
+            <PublishPackagePath>ikvmc\net472\osx-x64</PublishPackagePath>
+            <Pack>true</Pack>
+        </PublishProjectReference>
+        <PublishProjectReference Include="..\ikvmstub\ikvmstub.csproj">
+            <SetTargetFramework>TargetFramework=net472</SetTargetFramework>
+            <SetRuntimeIdentifier>RuntimeIdentifier=osx-x64</SetRuntimeIdentifier>
+            <PublishTargetPath Condition=" '$(TargetFramework)' != '' ">ikvmstub\net472\osx-x64</PublishTargetPath>
+            <CopyToOutputDirectory Condition=" '$(TargetFramework)' != '' ">PreserveNewest</CopyToOutputDirectory>
+            <PublishPackagePath>ikvmstub\net472\osx-x64</PublishPackagePath>
+            <Pack>true</Pack>
+        </PublishProjectReference>
         <PublishProjectReference Include="..\ikvmc\ikvmc.csproj">
             <SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=osx-x64</SetRuntimeIdentifier>

diff --git a/...VM.MSBuild.Tools.runtime.osx-x64/buildTransitive/IKVM.MSBuild.Tools.runtime.osx-x64.props b/...VM.MSBuild.Tools.runtime.osx-x64/buildTransitive/IKVM.MSBuild.Tools.runtime.osx-x64.props
@@ -4,7 +4,9 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net472\osx-x64\" TargetFramework="net472" RuntimeIdentifier="osx-x64" />
         <IkvmCompilerToolPath Include="$(MSBuildThisFileDirectory)..\ikvmc\net8.0\osx-x64\" TargetFramework="net8.0" RuntimeIdentifier="osx-x64" />
+        <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net472\osx-x64\" TargetFramework="net472" RuntimeIdentifier="osx-x64" />
         <IkvmExporterToolPath Include="$(MSBuildThisFileDirectory)..\ikvmstub\net8.0\osx-x64\" TargetFramework="net8.0" RuntimeIdentifier="osx-x64" />
     </ItemGroup>
 

diff --git a/src/IKVM.Tests.Util/DotNetSdkUtil.cs b/src/IKVM.Tests.Util/DotNetSdkUtil.cs
@@ -5,8 +5,6 @@
 using System.Reflection.Metadata;
 using System.Reflection.PortableExecutable;
 
-using Microsoft.Build.Utilities;
-
 namespace IKVM.Tests.Util
 {
 
@@ -63,11 +61,21 @@ public static string GetCoreLibName(string tfm, string targetFrameworkIdentifier
         public static IList<string> GetPathToReferenceAssemblies(string tfm, string targetFrameworkIdentifier, string targetFrameworkVersion)
         {
             if (targetFrameworkIdentifier == ".NETFramework")
-                return ToolLocationHelper.GetPathToReferenceAssemblies(targetFrameworkIdentifier, targetFrameworkVersion, "");
+            {
+                var l = new List<string>();
+                var dir = Path.Combine(Path.GetDirectoryName(typeof(DotNetSdkUtil).Assembly.Location), "netfxref", tfm);
+                if (Directory.Exists(dir))
+                    l.Add(dir);
+
+                return l;
+            }
+
             if (targetFrameworkIdentifier == ".NETCore")
+            {
                 return GetCorePathToReferenceAssemblies(tfm, targetFrameworkVersion);
+            }
 
-            throw new InvalidOperationException();
+            throw new ArgumentException(nameof(targetFrameworkIdentifier));
         }
 
         /// <summary>

diff --git a/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj b/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
+    <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
     <PropertyGroup>
         <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
@@ -8,5 +10,30 @@
         <PackageReference Include="Microsoft.Build" Version="17.3.2" />
         <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.2" />
         <PackageReference Include="System.Reflection.Metadata" Version="8.0.1" />
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3" GeneratePathProperty="true" />
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net481" Version="1.0.3" GeneratePathProperty="true" />
     </ItemGroup>
+
+    <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+    <PropertyGroup>
+        <AssignTargetPathsDependsOn>
+            IncludeReferenceAssemblies;
+            $(AssignTargetPathsDependsOn)
+        </AssignTargetPathsDependsOn>
+    </PropertyGroup>
+
+    <Target Name="IncludeReferenceAssemblies" BeforeTargets="AssignTargetPaths">
+        <ItemGroup>
+            <__ReferenceAssemblies Include="$(PkgMicrosoft_NETFramework_ReferenceAssemblies_net472)\build\.NETFramework\v4.7.2\*.dll" Framework="net472" />
+            <__ReferenceAssemblies Include="$(PkgMicrosoft_NETFramework_ReferenceAssemblies_net472)\build\.NETFramework\v4.7.2\Facades\*.dll" Framework="net472" />
+            <__ReferenceAssemblies Include="$(PkgMicrosoft_NETFramework_ReferenceAssemblies_net481)\build\.NETFramework\v4.8.1\*.dll" Framework="net481" />
+            <__ReferenceAssemblies Include="$(PkgMicrosoft_NETFramework_ReferenceAssemblies_net481)\build\.NETFramework\v4.8.1\Facades\*.dll" Framework="net481" />
+            <None Include="@(__ReferenceAssemblies)">
+                <TargetPath>netfxref\%(Framework)\%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
+                <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            </None>
+        </ItemGroup>
+    </Target>
+
 </Project>
diff --git a/src/IKVM.Tools.Runner/Exporter/IkvmExporterLauncher.cs b/src/IKVM.Tools.Runner/Exporter/IkvmExporterLauncher.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -145,30 +146,52 @@ public async Task<int> ExecuteAsync(IkvmExporterOptions options, CancellationTok
             try
             {
                 // locate EXE file
+                string? wrap = null;
                 var exe = GetToolExe();
-                if (File.Exists(exe) == false)
+                if (exe is null || File.Exists(exe) == false)
                     throw new FileNotFoundException($"Could not locate tool at '{exe}'.");
 
-                // if we're running on Unix, we might need to set the execute bit on the file,
-                // since the NuGet package is built on Windows
+                // executing on Unix requires some considerations
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                 {
-                    try
+                    // tool executables on Unix need to be invoked through Mono
+                    if (exe.EndsWith(".exe"))
                     {
-                        var psx = Mono.Unix.UnixFileSystemInfo.GetFileSystemEntry(exe);
-                        if (psx.FileAccessPermissions.HasFlag(Mono.Unix.FileAccessPermissions.UserExecute) == false)
-                            psx.FileAccessPermissions |= Mono.Unix.FileAccessPermissions.UserExecute;
+                        wrap = "mono";
                     }
-                    catch (Exception e)
+                    else
                     {
-                        throw new IkvmToolException($"Could not set user executable bit on '{exe}'.", e);
+                        // else we need to ensure executable bit is set
+
+                        try
+                        {
+                            var psx = Mono.Unix.UnixFileSystemInfo.GetFileSystemEntry(exe);
+                            if (psx.FileAccessPermissions.HasFlag(Mono.Unix.FileAccessPermissions.UserExecute) == false)
+                                psx.FileAccessPermissions |= Mono.Unix.FileAccessPermissions.UserExecute;
+                        }
+                        catch (Exception e)
+                        {
+                            throw new IkvmToolException($"Could not set user executable bit on '{exe}'.", e);
+                        }
                     }
                 }
 
-                // configure CLI
-                var cli = Cli.Wrap(exe).WithWorkingDirectory(Environment.CurrentDirectory);
+                // configure CLI, with wrapper if required
+                Command cli;
+                if (wrap != null)
+                {
+                    cli = Cli.Wrap(wrap);
+                    args.Insert(0, exe);
+                }
+                else
+                    cli = Cli.Wrap(exe);
+
+                // set configuration of CLI
+                cli = cli.WithWorkingDirectory(Environment.CurrentDirectory);
                 cli = cli.WithArguments(args);
                 cli = cli.WithValidation(CommandResultValidation.None);
+
+                // log the command we're about to run
                 await LogEventAsync(IkvmToolDiagnosticEventLevel.Trace, "Executing {0} {1}", [cli.TargetFilePath, cli.Arguments], ctk);
 
                 // send output to MSBuild (TODO, replace with binary reading)

diff --git a/src/IKVM.Tools.Runner/IkvmToolLauncher.cs b/src/IKVM.Tools.Runner/IkvmToolLauncher.cs
@@ -92,44 +92,16 @@ protected IkvmToolDiagnosticEvent ParseEvent(string line)
         /// <summary>
         /// Gets the path to executable for the given environment.
         /// </summary>
-        /// <param name="platform"></param>
-        /// <param name="architecture"></param>
         /// <returns></returns>
         /// <exception cref="ArgumentNullException"></exception>
         /// <exception cref="NotImplementedException"></exception>
-        public string GetToolExe(OSPlatform platform, Architecture architecture)
+        public string? GetToolExe()
         {
-            return Path.Combine(toolPath, platform == OSPlatform.Windows ? $"{toolName}.exe" : toolName);
-        }
-
-        /// <summary>
-        /// Gets the path to executable for the given environment.
-        /// </summary>
-        /// <returns></returns>
-        /// <exception cref="ArgumentNullException"></exception>
-        /// <exception cref="NotImplementedException"></exception>
-        public string GetToolExe()
-        {
-            return GetToolExe(GetOSPlatform(), RuntimeInformation.OSArchitecture);
-        }
-
-        /// <summary>
-        /// Gets the current OS platform.
-        /// </summary>
-        /// <returns></returns>
-        /// <exception cref="PlatformNotSupportedException"></exception>
-        OSPlatform GetOSPlatform()
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                return OSPlatform.Windows;
-
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                return OSPlatform.Linux;
-
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                return OSPlatform.OSX;
+            foreach (var name in (Span<string>)[toolName + ".exe", toolName])
+                if (File.Exists(Path.Combine(toolPath, name)))
+                    return Path.Combine(toolPath, name);
 
-            throw new PlatformNotSupportedException();
+            return null;
         }
 
     }

diff --git a/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs b/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -263,40 +264,62 @@ public async Task<int> ExecuteAsync(IkvmImporterOptions options, CancellationTok
             try
             {
                 // create response file
-                Directory.CreateDirectory(Path.GetDirectoryName(response));
+                Directory.CreateDirectory(Path.GetDirectoryName(response) ?? throw new InvalidOperationException());
                 File.WriteAllText(response, w.ToString());
 
                 // locate EXE file
+                string? wrap = null;
                 var exe = GetToolExe();
-                if (File.Exists(exe) == false)
+                if (exe is null || File.Exists(exe) == false)
                     throw new FileNotFoundException($"Could not locate tool at '{exe}'.");
 
-                // if we're running on Linux, we might need to set the execute bit on the file,
-                // since the NuGet package is built on Windows
+                // executing on Unix requires some considerations
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                 {
-                    try
+                    // tool executables on Unix need to be invoked through Mono
+                    if (exe.EndsWith(".exe"))
                     {
-                        var psx = Mono.Unix.UnixFileSystemInfo.GetFileSystemEntry(exe);
-                        var prm = psx.FileAccessPermissions;
-                        prm |= Mono.Unix.FileAccessPermissions.UserExecute;
-                        prm |= Mono.Unix.FileAccessPermissions.GroupExecute;
-                        prm |= Mono.Unix.FileAccessPermissions.OtherExecute;
-                        if (prm != psx.FileAccessPermissions)
-                            psx.FileAccessPermissions = prm;
+                        wrap = "mono";
                     }
-                    catch (Exception e)
+                    else
                     {
-                        throw new IkvmToolException($"Could not set user executable bit on '{exe}'.", e);
+                        // else we need to ensure executable bit is set
+
+                        try
+                        {
+                            var psx = Mono.Unix.UnixFileSystemInfo.GetFileSystemEntry(exe);
+                            if (psx.FileAccessPermissions.HasFlag(Mono.Unix.FileAccessPermissions.UserExecute) == false)
+                                psx.FileAccessPermissions |= Mono.Unix.FileAccessPermissions.UserExecute;
+                        }
+                        catch (Exception e)
+                        {
+                            throw new IkvmToolException($"Could not set user executable bit on '{exe}'.", e);
+                        }
                     }
                 }
 
-                // configure CLI
-                var cli = Cli.Wrap(exe).WithWorkingDirectory(Environment.CurrentDirectory);
+                // assemble list of args
+                var args = new List<string>();
+                args.Add($"@{response}");
 
-                // execute the contents of the response file
-                cli = cli.WithArguments([$"@{response}"]);
+                // configure CLI, with wrapper if required
+                Command cli;
+                if (wrap != null)
+                {
+                    cli = Cli.Wrap(wrap);
+                    args.Insert(0, exe);
+                }
+                else
+                    cli = Cli.Wrap(exe);
+
+                // set working directory
+                cli = cli.WithWorkingDirectory(Environment.CurrentDirectory);
+
+                // set configuration of CLI
+                cli = cli.WithArguments(args);
                 cli = cli.WithValidation(CommandResultValidation.None);
+
+                // log the command we're about to run
                 await LogEventAsync(IkvmToolDiagnosticEventLevel.Trace, "Executing {0} {1}", [cli.TargetFilePath, cli.Arguments], ctk);
 
                 // send output to MSBuild (TODO, replace with binary reading)