diff --git a/nvQuickSite/Controllers/FileSystemController.cs b/nvQuickSite/Controllers/FileSystemController.cs index 7bf91d01..fde1ce5f 100644 --- a/nvQuickSite/Controllers/FileSystemController.cs +++ b/nvQuickSite/Controllers/FileSystemController.cs @@ -173,14 +173,14 @@ internal static void CreateDirectories(string installFolder, string siteName, bo if (!Directory.Exists(logsDir)) { Directory.CreateDirectory(logsDir); - SetFolderPermission(dbServiceAccount, logsDir); + SetFolderPermission(appPoolName, logsDir); SetFolderPermission(authenticatedUsers, logsDir); } else { DeleteDirectory(logsDir, null, true); Directory.CreateDirectory(logsDir); - SetFolderPermission(dbServiceAccount, logsDir); + SetFolderPermission(appPoolName, logsDir); SetFolderPermission(authenticatedUsers, logsDir); } @@ -420,8 +420,8 @@ private static void SetFolderPermission(string accountName, string folderPath) } catch (Exception ex) { - Log.Logger.Error(ex, "Error occured while attempting to set folder permissions"); - throw new FileSystemControllerException("There was a problem setting the folder permissions for folder path: " + folderPath, ex) { Source = "Set Folder Permission" }; + Log.Logger.Error(ex, "Error occured while attempting to set permissions for {accountName} on folder {folderPath}", accountName, folderPath); + throw new FileSystemControllerException("There was a problem setting the folder permissions for folder path " + folderPath + " using account name " + accountName, ex) { Source = "Set Folder Permission" }; } } } diff --git a/nvQuickSite/Controllers/PackageController.cs b/nvQuickSite/Controllers/PackageController.cs index 7612a312..d0a1550a 100644 --- a/nvQuickSite/Controllers/PackageController.cs +++ b/nvQuickSite/Controllers/PackageController.cs @@ -84,7 +84,17 @@ public static IEnumerable GetPackageList() var ghPackages = GetGitHubPackages(); if (ghPackages.Any()) { - packages = packages.Union(ghPackages).ToList(); + // Deduplicate exising packages to be safe and fix users that already have duplicates in packages.json + packages = packages.GroupBy(p => p.version).Select(p => p.First()).ToList(); + + foreach (var ghPackage in ghPackages) + { + // Only add the github packages if they are not yet in the local packages.json file. + if (!packages.Any(p => p.version == ghPackage.version)) + { + packages.Add(ghPackage); + } + } } } diff --git a/nvQuickSite/Properties/AssemblyInfo.cs b/nvQuickSite/Properties/AssemblyInfo.cs index 262a2847..4558aa4a 100644 --- 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.1.1")] -[assembly: AssemblyFileVersion("2.1.1")] +[assembly: AssemblyVersion("2.1.2")] +[assembly: AssemblyFileVersion("2.1.2")] [assembly: NeutralResourcesLanguage("en")] diff --git a/nvQuickSite/data/latestVersion.json b/nvQuickSite/data/latestVersion.json index e7d937e0..d2ba521b 100644 --- a/nvQuickSite/data/latestVersion.json +++ b/nvQuickSite/data/latestVersion.json @@ -1,3 +1,3 @@ { - "latestVersion": "2.1.1" + "latestVersion": "2.1.2" } \ No newline at end of file diff --git a/nvQuickSite/nvQuickSite.csproj b/nvQuickSite/nvQuickSite.csproj index 9a075f4c..43d9c360 100644 --- a/nvQuickSite/nvQuickSite.csproj +++ b/nvQuickSite/nvQuickSite.csproj @@ -13,6 +13,7 @@ 512 false + false C:\Dev\nvQuickSite\Publish\ true Disk @@ -32,7 +33,6 @@ false true true - false AnyCPU @@ -58,10 +58,10 @@ prompt 4 false - true - - + false + MinimumRecommendedRules.ruleset bin\Release\nvQuickSite.xml + true 0A724629BFD7DFCC40A44BF2FB61D13E16ED4A93 @@ -272,8 +272,8 @@ 1.2.0.3 - - 3.3.1 + + 5.0.3 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/nvQuickSiteWixInstaller/nvQuickSiteWixInstaller.wixproj b/nvQuickSiteWixInstaller/nvQuickSiteWixInstaller.wixproj index f854b53d..d5a8f086 100644 --- a/nvQuickSiteWixInstaller/nvQuickSiteWixInstaller.wixproj +++ b/nvQuickSiteWixInstaller/nvQuickSiteWixInstaller.wixproj @@ -17,6 +17,7 @@ bin\$(Configuration)\ obj\$(Configuration)\ + ICE69