Browse Source

Fix web project options panel behaviour when IIS and IIS Express is not installed.

Allow modification of IIS and IIS Express settings in a project
even if IIS or IIS Express is not found.
pull/39/merge
Matt Ward 13 years ago
parent
commit
0f78edb8bb
  1. 23
      src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/WebProjectOptions/WebProjectOptionsPanel.xaml.cs

23
src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/WebProjectOptions/WebProjectOptionsPanel.xaml.cs

@ -30,16 +30,13 @@ namespace ICSharpCode.AspNet.Mvc
CreateWebProject(project); CreateWebProject(project);
if (!WebProjectService.IsIISOrIISExpressInstalled) { if (!WebProjectService.IsIISOrIISExpressInstalled) {
StatusLabel.Text = ResourceService.GetString("ICSharpCode.WebProjectOptionsPanel.IISNotFound"); StatusLabel.Text = ResourceService.GetString("ICSharpCode.WebProjectOptionsPanel.IISNotFound");
return;
} }
if (properties.UseIISExpress) { if (properties.UseIISExpress) {
if (WebProjectService.IsIISExpressInstalled) { UseIISExpress.IsChecked = true;
UseIISExpress.IsChecked = true; PortTextBox.Text = properties.DevelopmentServerPort.ToString();
PortTextBox.Text = properties.DevelopmentServerPort.ToString(); ProjectUrl.Text = String.Empty;
ProjectUrl.Text = String.Empty; SelectIISExpress();
SelectIISExpress();
}
} else if (properties.UseIIS) { } else if (properties.UseIIS) {
if (WebProjectService.IISVersion != IISVersion.None) { if (WebProjectService.IISVersion != IISVersion.None) {
UseLocalIIS.IsChecked = true; UseLocalIIS.IsChecked = true;
@ -101,13 +98,12 @@ namespace ICSharpCode.AspNet.Mvc
bool isIISExpressInstalled = WebProjectService.IsIISExpressInstalled; bool isIISExpressInstalled = WebProjectService.IsIISExpressInstalled;
if (!isIISExpressInstalled) { if (!isIISExpressInstalled) {
UseIISExpress.IsChecked = false;
properties.UseIISExpress = false;
StatusLabel.Text = ResourceService.GetString("ICSharpCode.WebProjectOptionsPanel.IISNotFound"); StatusLabel.Text = ResourceService.GetString("ICSharpCode.WebProjectOptionsPanel.IISNotFound");
} else { } else {
StatusLabel.Text = String.Empty; StatusLabel.Text = String.Empty;
} }
IISExpressGroup.IsEnabled = CreateVirtualDirectoryButton.IsEnabled = isIISExpressInstalled; IISExpressGroup.IsEnabled = true;
CreateVirtualDirectoryButton.IsEnabled = isIISExpressInstalled;
LocalIISGroup.IsEnabled = false; LocalIISGroup.IsEnabled = false;
} }
@ -126,13 +122,12 @@ namespace ICSharpCode.AspNet.Mvc
if (!isIISInstalled) { if (!isIISInstalled) {
StatusLabel.Text = ResourceService.GetString("ICSharpCode.WebProjectOptionsPanel.IISNotFound"); StatusLabel.Text = ResourceService.GetString("ICSharpCode.WebProjectOptionsPanel.IISNotFound");
ProjectUrl.Text = String.Empty;
UseLocalIIS.IsChecked = false;
} else { } else {
StatusLabel.Text = String.Empty; StatusLabel.Text = String.Empty;
ProjectUrl.Text = properties.IISUrl; ProjectUrl.Text = properties.IISUrl;
} }
LocalIISGroup.IsEnabled = CreateVirtualDirectoryButton.IsEnabled = isIISInstalled; LocalIISGroup.IsEnabled = true;
CreateVirtualDirectoryButton.IsEnabled = isIISInstalled;
IISExpressGroup.IsEnabled = false; IISExpressGroup.IsEnabled = false;
} }

Loading…
Cancel
Save