Make all paths relative as $(DllExportDir)..\

+updated [Offline version] wrapper

Author: 3F

.vssbe

@@ -1106,9 +1106,9 @@
         "Command__": [
           "#[$(mgrOffline = \"$(dirsrc)DllExport\\\\Manager\\\\batch\\\\Manager.offline\")]",
           "",
-          "#[IO copy.directory(\"$(odir)\", \"$(dbin)/raw.offline/packages/DllExport\", true, true)]",
+          "#[IO copy.directory(\"$(odir)\", \"$(dbin)/raw.offline/DllExport\", true, true)]",
           "#[IO copy.file(\"$(mgrOffline).bat\", \"$(dbin)/raw.offline/DllExport.bat\", true)]",
-          "#[IO copy.file(\"$(mgrOffline).txt\", \"$(dbin)/raw.offline/Readme.txt\", true)]",
+          "##[IO copy.file(\"$(mgrOffline).txt\", \"$(dbin)/raw.offline/Readme.txt\", true)]",
           "#[IO copy.file({ \".gitattributes\" }, \"$(dbin)/raw.offline/\", true)]",
           "##[IO write(\"$(dbin)/raw.offline/DllExport_Configure.bat\"): DllExport -action Configure %*]",
           "",

src/DllExport/Manager/batch/Manager.offline.bat

@@ -1,37 +1,19 @@
-@echo off
-
-:: Wrapper. Offline .NET DllExport
-:: https://github.com/3F/DllExport
-:: - - - - - - - - - - - - - - - -
-
-:: Activated version
-set "pkgVersion=actual"
-
-:: When there are no arguments to this wrapper
-set "defaultCommand=-action Configure"
-
-:: Path to the received package
-set "pkgsDir=packages"
+::: .NET DllExport [Offline version]
+::!  https://github.com/3F/DllExport
 
 
 
+@set defaultCommand=-action Configure
 
 
 
 
 
+::....................................
+@echo off
+set _args=%*
+set "_launcher=DllExport"
+if not defined _args set _args=%defaultCommand%
 
-
-:: - - - - - - - - - - - - - - -
-setlocal enableDelayedExpansion
-
-set args=%*
-set "__=DllExport"
-if not defined args set args=%defaultCommand%
 set __dxp_pv=/Offline
-
-if "%pkgVersion%"=="actual" (
-    ".\\%pkgsDir%\\%__%\\%__%" -packages %pkgsDir% -dxp-version actual !args!
-) else (
-    ".\\%pkgsDir%\\%__%.%pkgVersion%\\%__%" -packages %pkgsDir% !args!
-)
+"%~dp0\%_launcher%\%_launcher%" -packages "%~dp0" -sln-dir "%~dp0" -dxp-version actual %_args%

src/DllExport/Wizard/Project.cs

@@ -546,6 +546,10 @@ protected ProjectTargetElement AddRestoreDxp(string name, string condition, stri
                 args = Regex.Replace(Config.Wizard.MgrArgs, @"-action\s\w+", "", RegexOptions.IgnoreCase);
                 args = args.Replace("%", "%%"); // part of issue 88, probably because of %(_data.FullPath) etc.
                 args = Regex.Replace(args, @"-force(?:\s|$)", "", RegexOptions.IgnoreCase); // user commands only
+
+                // make all paths relative as `$(DllExportDir)..` /F-334
+                if(!string.IsNullOrEmpty(Config.Wizard.RootPath) && !string.IsNullOrEmpty(Config.Wizard.SlnDir))
+                    args = args.Replace(Config.Wizard.SlnDir, GetDxpDirBased(Config.Wizard.RootPath.MakeRelativePath(Config.Wizard.SlnDir)));
             }
             else
             {