Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono-addins.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ward <matt.ward@microsoft.com>2021-02-08 20:13:35 +0300
committerMatt Ward <matt.ward@microsoft.com>2021-02-09 13:06:44 +0300
commit849d197bf7bb8d8173d3fd63793fe5ef20a461d1 (patch)
tree5240e292121cc059e39d4d11cd87bd5ed83ad02d
parentd6bf9e8103cc70dc17c80b1cd3eace5d26a62a07 (diff)
Fix incorrect setup process path
The path was being created without the path separator for the Mono.Addins.SetupProcess assembly. Also the file extension was incorrectly set to .dll when running with Mono.
-rw-r--r--Mono.Addins/Mono.Addins.Database/SetupProcess.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/Mono.Addins/Mono.Addins.Database/SetupProcess.cs b/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
index d23fde9..e3da326 100644
--- a/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
+++ b/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
@@ -69,8 +69,13 @@ namespace Mono.Addins.Database
Process process = new Process ();
- string thisAsm = typeof (SetupProcess).Assembly.Location;
- string asm = Path.GetDirectoryName (thisAsm) + "Mono.Addins.SetupProcess.dll";
+ string thisAsmDir = Path.GetDirectoryName (typeof (SetupProcess).Assembly.Location);
+ string asm;
+ if (Util.IsMono)
+ asm = Path.Combine (thisAsmDir, "Mono.Addins.SetupProcess.exe");
+ else
+ asm = Path.Combine (thisAsmDir, "Mono.Addins.SetupProcess.dll");
+
try {
if (!Util.IsMono)
process.StartInfo = new ProcessStartInfo (asm, sb.ToString ());