dotnet_version standalone

Author: scivision

+stdlib/cpu_arch.m

@@ -2,10 +2,12 @@
 
 function a = cpu_arch()
 
+a = '';
+
 if stdlib.has_dotnet()
   a = System.Runtime.InteropServices.RuntimeInformation.OSArchitecture;
   % https://learn.microsoft.com/en-us/dotnet/core/compatibility/interop/7.0/osarchitecture-emulation
-else
+elseif stdlib.has_java()
   a = javaMethod("getProperty", "java.lang.System", "os.arch");
 end
 

+stdlib/create_symlink.m

@@ -28,7 +28,7 @@
       if stdlib.has_python()
         py.pathlib.Path(link).symlink_to(target);
         ok = true;
-      elseif stdlib.has_dotnet() && stdlib.dotnet_api() >= 6
+      elseif stdlib.dotnet_api() >= 6
         % https://learn.microsoft.com/en-us/dotnet/api/system.io.file.createsymboliclink
         System.IO.File.CreateSymbolicLink(link, target);
         ok = true;

+stdlib/dotnet_api.m

@@ -1,7 +1,11 @@
-%% DOTNET_API major version integer .NET 
+%% DOTNET_API major version integer .NET
 
 function v = dotnet_api()
 
-v = System.Environment.Version.Major;
+try
+  v = System.Environment.Version.Major;
+catch
+  v = -1;
+end
 
 end

+stdlib/get_owner.m

@@ -1,4 +1,4 @@
-%% GET_OWNER owner of file or directory
+%% GET_OWNER owner name of file or directory
 %
 %%% Inputs
 % * p: path to examine

+stdlib/read_symlink.m

@@ -22,7 +22,7 @@
       if stdlib.has_python()
         % https://docs.python.org/3/library/pathlib.html#pathlib.Path.readlink
         r = string(py.str(py.pathlib.Path(p).readlink()));
-      elseif stdlib.has_dotnet() && stdlib.dotnet_api() >= 6
+      elseif stdlib.dotnet_api() >= 6
         r = System.IO.FileInfo(p).LinkTarget;
       elseif stdlib.has_java()
         % must be absolute path

+stdlib/relative_to.m

@@ -17,7 +17,7 @@
 end
 
 
-if stdlib.has_dotnet() && stdlib.dotnet_api() >= 5
+if stdlib.dotnet_api() >= 5
 
   if strempty(base) && strempty(other), rel = "."; return, end
 

buildfile.m

@@ -277,11 +277,11 @@ function build_exe(context)
 srcs{end+1} = ["src/is_symlink.cpp", win, sym];
 end
 
-if (isMATLABReleaseOlderThan("R2024b") && ~stdlib.has_java() && ~stdlib.has_python() && ~stdlib.has_dotnet() || stdlib.dotnet_api() < 6) || build_all
+if (isMATLABReleaseOlderThan("R2024b") && ~stdlib.has_java() && ~stdlib.has_python() && stdlib.dotnet_api() < 6) || build_all
 srcs{end+1} = ["src/read_symlink.cpp", win, sym];
 end
 
-if (isMATLABReleaseOlderThan("R2024b") && ~stdlib.has_python() && ~stdlib.has_dotnet() || stdlib.dotnet_api() < 6) || build_all
+if (isMATLABReleaseOlderThan("R2024b") && ~stdlib.has_python() && stdlib.dotnet_api() < 6) || build_all
 % so that we don't need to run matlab AsAdmin on Windows
 srcs{end+1} = ["src/create_symlink.cpp", win, sym];
 end

test/TestRelative.m

@@ -8,14 +8,14 @@
 methods (Test)
 
 function test_relative_to(tc, pr)
-tc.assumeTrue((stdlib.has_dotnet() && stdlib.dotnet_api() >= 5) || stdlib.is_mex_fun("stdlib.relative_to"))
+tc.assumeTrue((stdlib.dotnet_api() >= 5) || stdlib.is_mex_fun("stdlib.relative_to"))
 
 tc.verifyEqual(stdlib.relative_to(pr{1}, pr{2}), pr{3}, ...
   "relative_to(" + pr{1} + "," + pr{2}+")")
 end
 
 function test_proximate_to(tc, pp)
-tc.assumeTrue((stdlib.has_dotnet() && stdlib.dotnet_api() >= 5) || stdlib.is_mex_fun("stdlib.proximate_to"))
+tc.assumeTrue((stdlib.dotnet_api() >= 5) || stdlib.is_mex_fun("stdlib.proximate_to"))
 
 tc.verifyEqual(stdlib.proximate_to(pp{1}, pp{2}), pp{3}, ...
   "proximate_to(" + pp{1} + ", " + pp{2}+")")