Merge pull request #369 from nvisionative/develop

Merge `develop` into `main` for `2.3.1` release
nvisionative · Feb 6, 2023 · 612ee44 · 612ee44
2 parents b8fd19c + 6668c95
commit 612ee44
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/nvQuickSite/Controllers/IISController.cs b/nvQuickSite/Controllers/IISController.cs
@@ -62,9 +62,9 @@ internal static void CreateSite(string siteName, string installFolder, bool useS
                     {
                         bindingInfo = "*:443:" + siteName;
                         protocol = "https";
+                        site.Bindings.Add(bindingInfo, protocol);
                     }
 
-                    site.Bindings.Add(bindingInfo, protocol);
                     site.TraceFailedRequestsLogging.Enabled = true;
                     site.TraceFailedRequestsLogging.Directory = installFolder + "\\Logs";
                     site.LogFile.Directory = installFolder + "\\Logs" + "\\W3svc" + site.Id.ToString(CultureInfo.InvariantCulture);

diff --git a/nvQuickSite/Properties/AssemblyInfo.cs b/nvQuickSite/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.0")]
-[assembly: AssemblyFileVersion("2.3.0")]
+[assembly: AssemblyVersion("2.3.1")]
+[assembly: AssemblyFileVersion("2.3.1")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/nvQuickSite/Start.cs b/nvQuickSite/Start.cs
@@ -589,7 +589,7 @@ private void btnDatabaseInfoNext_Click(object sender, EventArgs e)
                     this.InstallFolder,
                     this.chkSiteSpecificAppPool.Checked,
                     this.chkDeleteSiteIfExists.Checked,
-                    this.certificates[this.cboCertificates.SelectedIndex]);
+                    this.chkEnableSsl.Checked ? this.certificates[this.cboCertificates.SelectedIndex] : null);
 
                 FileSystemController.UpdateHostsFile(this.SiteName);
 

diff --git a/nvQuickSite/data/latestVersion.json b/nvQuickSite/data/latestVersion.json
@@ -1,3 +1,3 @@
 {
-  "latestVersion": "2.3.0"
+  "latestVersion": "2.3.1"
 }