diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2013-08-26 18:33:35 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2013-08-26 18:34:05 +0400 |
| commit | 71171b90ab137e9b8c88c3fa91a204c3aa268880 (patch) | |
| tree | e8d3e275c1e368f7e148bd7e128ba18a0f2b3ee6 /main/src | |
| parent | 0e36ce75b74f6392137ca7cbdc9e92247f50b6d0 (diff) | |
Fix add-in registry initialization issue
The startup directory was not provided.
Fixes 14226 - mdtool setup reg-build is completely broken.
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/tools/mdtool/mdtool.csproj | 3 | ||||
| -rw-r--r-- | main/src/tools/mdtool/src/mdtool.cs | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/main/src/tools/mdtool/mdtool.csproj b/main/src/tools/mdtool/mdtool.csproj index 10f2424a4d..65f5e20924 100644 --- a/main/src/tools/mdtool/mdtool.csproj +++ b/main/src/tools/mdtool/mdtool.csproj @@ -65,4 +65,7 @@ </Properties> </MonoDevelop> </ProjectExtensions> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> </Project> diff --git a/main/src/tools/mdtool/src/mdtool.cs b/main/src/tools/mdtool/src/mdtool.cs index 1da5671f2a..7c5d1ade9c 100644 --- a/main/src/tools/mdtool/src/mdtool.cs +++ b/main/src/tools/mdtool/src/mdtool.cs @@ -175,9 +175,11 @@ public class MonoDevelopProcessHost if (a == "-v") verbose = true; - string configDir, addinsDir, databaseDir; + string startupDir, configDir, addinsDir, databaseDir; + string asmFile = new Uri (System.Reflection.Assembly.GetEntryAssembly ().CodeBase).LocalPath; + startupDir = System.IO.Path.GetDirectoryName (asmFile); Runtime.GetAddinRegistryLocation (out configDir, out addinsDir, out databaseDir); - SetupTool setupTool = new SetupTool (new AddinRegistry (configDir, addinsDir, databaseDir)); + SetupTool setupTool = new SetupTool (new AddinRegistry (configDir, startupDir, addinsDir, databaseDir)); setupTool.VerboseOutput = verbose; return setupTool.Run (args); } |