pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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
shortcuts
Daniel Grunwald 17 years ago
parent
d8ff8210c5
commit
a2c4a6783f
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.cs

12
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.cs
Unescape View File

@ -35,7 +35,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
keyFile = Get<ComboBox>("keyFile"); keyFile = Get<ComboBox>("keyFile");
b = helper.BindString(keyFile, "AssemblyOriginatorKeyFile", TextBoxEditMode.EditEvaluatedProperty); b = helper.BindString(keyFile, "AssemblyOriginatorKeyFile", TextBoxEditMode.EditRawProperty);
b.RegisterLocationButton(locationButton); b.RegisterLocationButton(locationButton);
FindKeys(baseDirectory); FindKeys(baseDirectory);
if (keyFile.Text.Length > 0) { if (keyFile.Text.Length > 0) {
@ -74,13 +74,13 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
while (true) { while (true) {
try { try {
foreach (string fileName in Directory.GetFiles(directory, "*.snk")) { 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")) { 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")) { 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 { } catch {
// can happen for networked drives / network locations // can happen for networked drives / network locations
@ -96,7 +96,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
void BrowseKeyFile() void BrowseKeyFile()
{ {
keyFile.SelectedIndex = -1; 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() void CreateKeyFile()
@ -105,7 +105,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
using (CreateKeyForm createKey = new CreateKeyForm(baseDirectory)) { using (CreateKeyForm createKey = new CreateKeyForm(baseDirectory)) {
createKey.KeyFile = project.Name; createKey.KeyFile = project.Name;
if (createKey.ShowDialog(WorkbenchSingleton.MainForm) == DialogResult.OK) { if (createKey.ShowDialog(WorkbenchSingleton.MainForm) == DialogResult.OK) {
keyFile.Text = createKey.KeyFile; keyFile.Text = MSBuildInternals.Escape(createKey.KeyFile);
return; return;
} }
} }

Write Preview
Loading…
Cancel
Save