From fc5b1497361c7ff959c401a4c193418b087f4aa2 Mon Sep 17 00:00:00 2001 From: Andreas Weizel Date: Sun, 14 Jul 2013 00:38:37 +0200 Subject: [PATCH] Showing correct path to .addin file in list of installed packages when installing an .sdaddin package or an external AddIn. --- .../AddInManager2/Project/Src/Model/AddInSetup.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/AddIns/Misc/AddInManager2/Project/Src/Model/AddInSetup.cs b/src/AddIns/Misc/AddInManager2/Project/Src/Model/AddInSetup.cs index db87b53cc7..bfdbd8b904 100644 --- a/src/AddIns/Misc/AddInManager2/Project/Src/Model/AddInSetup.cs +++ b/src/AddIns/Misc/AddInManager2/Project/Src/Model/AddInSetup.cs @@ -417,11 +417,20 @@ namespace ICSharpCode.AddInManager2.Model { Directory.Delete(targetDir, true); } - Directory.CreateDirectory(targetDir); + var directoryInfo = Directory.CreateDirectory(targetDir); FastZip fastZip = new FastZip(); fastZip.CreateEmptyDirectories = true; fastZip.ExtractZip(zipFile, targetDir, null); + if (addIn.FileName == null) { + // Find .addin file to set it in AddIn object + var addInFiles = directoryInfo.GetFiles("*.addin", SearchOption.TopDirectoryOnly); + var addInFile = addInFiles.FirstOrDefault(); + if (addInFile != null) { + addIn.FileName = addInFile.FullName; + } + } + return true; } catch (Exception)