Add application archive in working directory to assembly search path

src/csharp/Microsoft.Spark/Utils/AssemblyLoader.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
@@ -13,6 +14,7 @@ namespace Microsoft.Spark.Utils
     internal static class AssemblySearchPathResolver
     {
         internal const string AssemblySearchPathsEnvVarName = "DOTNET_ASSEMBLY_SEARCH_PATHS";
+        internal const string DotNetApplicationArchiveEnvVarName = "DOTNET_APPLICATION_ARCHIVE";
 
         /// <summary>
         /// Returns the paths to search when loading assemblies in the following order of
@@ -56,6 +58,21 @@ internal static string[] GetAssemblySearchPaths()
             searchPaths.Add(Directory.GetCurrentDirectory());
             searchPaths.Add(AppDomain.CurrentDomain.BaseDirectory);
 
+            string archiveName = Environment.GetEnvironmentVariable(
+                DotNetApplicationArchiveEnvVarName);
+            if(!string.IsNullOrEmpty(archiveName))
+            {
+                string
+                    archivePath = Path.Combine(Directory.GetCurrentDirectory(), archiveName),
+                    extractPath = Path.Combine(Directory.GetCurrentDirectory(),
+                        Path.GetFileNameWithoutExtension(archiveName));
+                if (File.Exists(archivePath) && !File.Exists(extractPath))
+                {
+                    ZipFile.ExtractToDirectory(archivePath, extractPath);
+                    searchPaths.Add(extractPath);
+                }
+            }
+
             return searchPaths.ToArray();
         }
     }

src/csharp/Microsoft.Spark/Utils/UdfUtils.cs

@@ -177,6 +177,17 @@ private static JvmObjectReference CreateEnvVarsForPythonFunction(IJvmBridge jvm)
                     assemblySearchPath);
             }
 
+            string assemblyArchivePath = Environment.GetEnvironmentVariable(
+                AssemblySearchPathResolver.DotNetApplicationArchiveEnvVarName);
+            if (!string.IsNullOrEmpty(assemblyArchivePath))
+            {
+                jvm.CallNonStaticJavaMethod(
+                    environmentVars,
+                    "put",
+                    AssemblySearchPathResolver.DotNetApplicationArchiveEnvVarName,
+                    assemblyArchivePath);
+            }
+
             return environmentVars;
         }
 

src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala

@@ -52,6 +52,7 @@ object DotnetRunner extends Logging {
     val runInDebugMode = settings._1
     @volatile var dotnetBackendPortNumber = settings._2
     var dotnetExecutable = ""
+    var dotnetApplicationArchive = ""
     var otherArgs: Array[String] = null
 
     if (!runInDebugMode) {
@@ -66,6 +67,8 @@ object DotnetRunner extends Logging {
           zipFileName = downloadDriverFile(zipFileName, workingDir.getAbsolutePath).getName
         }
 
+        dotnetApplicationArchive = zipFileName
+
         logInfo(s"Unzipping .NET driver $zipFileName to $driverDir")
         DotnetUtils.unzip(new File(zipFileName), driverDir)
 
@@ -114,6 +117,12 @@ object DotnetRunner extends Logging {
           val builder = new ProcessBuilder(processParameters)
           val env = builder.environment()
           env.put("DOTNETBACKEND_PORT", dotnetBackendPortNumber.toString)
+          logInfo(s"Adding key=DOTNETBACKEND_PORT and value=$dotnetBackendPortNumber to environment")
+
+          if(dotnetApplicationArchive != "") {
+            env.put("DOTNET_APPLICATION_ARCHIVE", dotnetApplicationArchive)
+            logInfo(s"Adding key=DOTNET_APPLICATION_ARCHIVE and value=$dotnetApplicationArchive to environment")
+          }
 
           for ((key, value) <- Utils.getSystemProperties if key.startsWith("spark.")) {
             env.put(key, value)

src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/deploy/dotnet/DotnetRunner.scala

@@ -52,6 +52,7 @@ object DotnetRunner extends Logging {
     val runInDebugMode = settings._1
     @volatile var dotnetBackendPortNumber = settings._2
     var dotnetExecutable = ""
+    var dotnetApplicationArchive = ""
     var otherArgs: Array[String] = null
 
     if (!runInDebugMode) {
@@ -66,6 +67,8 @@ object DotnetRunner extends Logging {
           zipFileName = downloadDriverFile(zipFileName, workingDir.getAbsolutePath).getName
         }
 
+        dotnetApplicationArchive = zipFileName
+
         logInfo(s"Unzipping .NET driver $zipFileName to $driverDir")
         DotnetUtils.unzip(new File(zipFileName), driverDir)
 
@@ -114,6 +117,12 @@ object DotnetRunner extends Logging {
           val builder = new ProcessBuilder(processParameters)
           val env = builder.environment()
           env.put("DOTNETBACKEND_PORT", dotnetBackendPortNumber.toString)
+          logInfo(s"Adding key=DOTNETBACKEND_PORT and value=$dotnetBackendPortNumber to environment")
+
+          if(dotnetApplicationArchive != "") {
+            env.put("DOTNET_APPLICATION_ARCHIVE", dotnetApplicationArchive)
+            logInfo(s"Adding key=DOTNET_APPLICATION_ARCHIVE and value=$dotnetApplicationArchive to environment")
+          }
 
           for ((key, value) <- Utils.getSystemProperties if key.startsWith("spark.")) {
             env.put(key, value)