Merge pull request #346 from nvisionative/develop

Merge `develop` into `main` for 2.1.2 release
nvisionative · Oct 31, 2021 · 51b88bc · 51b88bc
2 parents 0b0a862 + 829c276
commit 51b88bc
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git 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
@@ -84,7 +84,17 @@ public static IEnumerable<Package> 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
@@ -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
@@ -1,3 +1,3 @@
 {
-  "latestVersion": "2.1.1"
+  "latestVersion": "2.1.2"
 }
diff --git a/nvQuickSite/nvQuickSite.csproj b/nvQuickSite/nvQuickSite.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile />
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <PublishUrl>C:\Dev\nvQuickSite\Publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -32,7 +33,6 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -58,10 +58,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <CodeAnalysisRuleSet>
-    </CodeAnalysisRuleSet>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Release\nvQuickSite.xml</DocumentationFile>
+    <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>0A724629BFD7DFCC40A44BF2FB61D13E16ED4A93</ManifestCertificateThumbprint>
@@ -272,8 +272,8 @@
     <PackageReference Include="MetroFramework">
       <Version>1.2.0.3</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
-      <Version>3.3.1</Version>
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
+      <Version>5.0.3</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/nvQuickSiteWixInstaller/nvQuickSiteWixInstaller.wixproj b/nvQuickSiteWixInstaller/nvQuickSiteWixInstaller.wixproj
@@ -17,6 +17,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <SuppressIces>ICE69</SuppressIces>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />