From a2c4a6783f7ac7793bb31cf69d6b51fe7fba30b2 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Wed, 21 Jan 2009 19:44:01 +0000 Subject: [PATCH] Use EditRawProperty for strong name key: allow using MSBuild properties in the key file path. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3773 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Dialogs/OptionPanels/ProjectOptions/Signing.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.cs index 2cccaddfd5..a5fdd909fd 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.cs @@ -35,7 +35,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels keyFile = Get("keyFile"); - b = helper.BindString(keyFile, "AssemblyOriginatorKeyFile", TextBoxEditMode.EditEvaluatedProperty); + b = helper.BindString(keyFile, "AssemblyOriginatorKeyFile", TextBoxEditMode.EditRawProperty); b.RegisterLocationButton(locationButton); FindKeys(baseDirectory); if (keyFile.Text.Length > 0) { @@ -74,13 +74,13 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels while (true) { try { foreach (string fileName in Directory.GetFiles(directory, "*.snk")) { - keyFile.Items.Add(FileUtility.GetRelativePath(baseDirectory, fileName)); + keyFile.Items.Add(MSBuildInternals.Escape(FileUtility.GetRelativePath(baseDirectory, fileName))); } foreach (string fileName in Directory.GetFiles(directory, "*.pfx")) { - keyFile.Items.Add(FileUtility.GetRelativePath(baseDirectory, fileName)); + keyFile.Items.Add(MSBuildInternals.Escape(FileUtility.GetRelativePath(baseDirectory, fileName))); } foreach (string fileName in Directory.GetFiles(directory, "*.key")) { - keyFile.Items.Add(FileUtility.GetRelativePath(baseDirectory, fileName)); + keyFile.Items.Add(MSBuildInternals.Escape(FileUtility.GetRelativePath(baseDirectory, fileName))); } } catch { // can happen for networked drives / network locations @@ -96,7 +96,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels void BrowseKeyFile() { keyFile.SelectedIndex = -1; - BrowseForFile(ControlDictionary["keyFileComboBox"], "${res:SharpDevelop.FileFilter.KeyFiles} (" + KeyFileExtensions + ")|" + KeyFileExtensions + "|${res:SharpDevelop.FileFilter.AllFiles}|*.*", TextBoxEditMode.EditEvaluatedProperty); + BrowseForFile(ControlDictionary["keyFileComboBox"], "${res:SharpDevelop.FileFilter.KeyFiles} (" + KeyFileExtensions + ")|" + KeyFileExtensions + "|${res:SharpDevelop.FileFilter.AllFiles}|*.*", TextBoxEditMode.EditRawProperty); } void CreateKeyFile() @@ -105,7 +105,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels using (CreateKeyForm createKey = new CreateKeyForm(baseDirectory)) { createKey.KeyFile = project.Name; if (createKey.ShowDialog(WorkbenchSingleton.MainForm) == DialogResult.OK) { - keyFile.Text = createKey.KeyFile; + keyFile.Text = MSBuildInternals.Escape(createKey.KeyFile); return; } }