build update (#100)

* build update * Update Nuget packages
dk307 · Oct 11, 2023 · f7ed601 · f7ed601
1 parent 693fa19
commit f7ed601
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 123 deletions.
diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml
@@ -34,9 +34,9 @@ jobs:
          restore-keys: ${{ runner.os }}-nuget-
 
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0.9.7
+        uses: gittools/actions/gitversion/setup@v0.10.2
         with:
-         versionSpec: '5.5.0'
+         versionSpec: '5.10.0'
 
       - name: Navigate to Workspace
         run: cd $GITHUB_WORKSPACE
@@ -51,7 +51,7 @@ jobs:
           useConfigFile: true
           configFilePath: ./.github/gitversion.yml
         id:   gitversion
-        uses: gittools/actions/gitversion/execute@v0.9.15
+        uses: gittools/actions/gitversion/execute@v0.10.2
 
       - name: Build Solution
         run: msbuild.exe HSPI_ZWaveParameters.sln /p:platform="Any CPU" /p:configuration="Release"

diff --git a/plugin/HSPI_ZWaveParameters.csproj b/plugin/HSPI_ZWaveParameters.csproj
@@ -80,7 +80,7 @@
     <ManifestCertificateThumbprint>72662FD964D95BFE9FD27373AF263D1DCA0E25E2</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
@@ -153,16 +153,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Destructurama.Attributed">
-      <Version>3.0.0</Version>
+      <Version>3.1.0</Version>
     </PackageReference>
     <PackageReference Include="HomeSeer-PluginSDK">
       <Version>1.3.1</Version>
     </PackageReference>
     <PackageReference Include="HtmlSanitizer">
-      <Version>7.1.488</Version>
+      <Version>8.0.723</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
+      <Version>7.0.4</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -175,7 +175,7 @@
       <Version>5.1.2</Version>
     </PackageReference>
     <PackageReference Include="Serilog">
-      <Version>2.12.0</Version>
+      <Version>3.0.1</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.Console">
       <Version>4.1.0</Version>
@@ -184,12 +184,12 @@
       <Version>5.0.0</Version>
     </PackageReference>
     <PackageReference Include="SonarAnalyzer.CSharp">
-      <Version>9.2.0.71021</Version>
+      <Version>9.11.0.78383</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.Collections.Immutable">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.Drawing.Primitives">
       <Version>4.3.0</Version>
@@ -198,7 +198,7 @@
       <Version>4.3.4</Version>
     </PackageReference>
     <PackageReference Include="System.Text.Json">
-      <Version>6.0.7</Version>
+      <Version>7.0.3</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/plugin/Hspi/OpenZWaveDB/SanitizeHtml.cs b/plugin/Hspi/OpenZWaveDB/SanitizeHtml.cs
@@ -1,6 +1,7 @@
-using Ganss.XSS;
-using System;
+using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using Ganss.Xss;
 
 #nullable enable
 
@@ -10,13 +11,23 @@ internal sealed class SanitizeHtml
     {
         public SanitizeHtml()
         {
-            htmlSanitizer = new(allowedTags: AllowedTags,
-                                allowedCssProperties: Array.Empty<string>())
+            HtmlSanitizerOptions htmlSanitizerOptions = new()
+            {
+                AllowedTags = SanitizeHtml.AllowedTags.ToImmutableSortedSet(),
+                AllowedCssProperties = { },
+            };
+
+            htmlSanitizer = new(htmlSanitizerOptions)
             {
                 KeepChildNodes = true,
             };
 
-            htmlStriper = new(allowedTags: Array.Empty<string>())
+            HtmlSanitizerOptions htmlSanitizerOptions2 = new()
+            {
+                AllowedTags = { },
+            };
+
+            htmlStriper = new(htmlSanitizerOptions2)
             {
                 KeepChildNodes = true,
             };
@@ -36,7 +47,7 @@ public string Strip(string html)
                                      "h6","i","p","small","strong","sub","sup","ul","ol",
                                      "li","table","tr","td" };
 
-        private readonly HtmlSanitizer htmlSanitizer;
-        private readonly HtmlSanitizer htmlStriper;
+        private readonly Ganss.Xss.HtmlSanitizer htmlSanitizer;
+        private readonly Ganss.Xss.HtmlSanitizer htmlStriper;
     }
 }
diff --git a/tests/HSPI_ZWaveParametersTest.csproj b/tests/HSPI_ZWaveParametersTest.csproj
@@ -81,114 +81,42 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Castle.Core">
-      <Version>4.4.1</Version>
+      <Version>5.1.1</Version>
     </PackageReference>
     <PackageReference Include="HomeSeer-PluginSDK">
-      <Version>1.3.1</Version>
+      <Version>1.4.4</Version>
     </PackageReference>
     <PackageReference Include="HtmlAgilityPack">
-      <Version>1.11.42</Version>
+      <Version>1.11.54</Version>
     </PackageReference>
     <PackageReference Include="HtmlSanitizer">
-      <Version>7.1.488</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
-      <Version>6.0.0</Version>
+      <Version>8.0.723</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Http">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Options">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Primitives">
-      <Version>6.0.0</Version>
+      <Version>7.0.0</Version>
     </PackageReference>
     <PackageReference Include="Moq">
-      <Version>4.16.1</Version>
+      <Version>4.20.69</Version>
     </PackageReference>
     <PackageReference Include="Moq.Contrib.HttpClient">
-      <Version>1.3.0</Version>
+      <Version>1.4.0</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
-      <Version>2.2.8</Version>
+      <Version>3.1.1</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestFramework">
-      <Version>2.2.10</Version>
+      <Version>3.1.1</Version>
     </PackageReference>
     <PackageReference Include="Serilog">
-      <Version>2.12.0</Version>
+      <Version>3.0.1</Version>
     </PackageReference>
     <PackageReference Include="SonarAnalyzer.CSharp">
-      <Version>9.2.0.71021</Version>
+      <Version>9.11.0.78383</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="System.Buffers">
-      <Version>4.5.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.DiagnosticSource">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.IO">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Memory">
-      <Version>4.5.4</Version>
-    </PackageReference>
-    <PackageReference Include="System.Net.Http">
-      <Version>4.3.4</Version>
-    </PackageReference>
-    <PackageReference Include="System.Numerics.Vectors">
-      <Version>4.5.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime">
-      <Version>4.3.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.Algorithms">
-      <Version>4.3.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.Encoding">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.Primitives">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.X509Certificates">
-      <Version>4.3.2</Version>
-    </PackageReference>
     <PackageReference Include="System.Text.Json">
-      <Version>6.0.7</Version>
-    </PackageReference>
-    <PackageReference Include="System.Threading.Tasks.Extensions">
-      <Version>4.5.4</Version>
-    </PackageReference>
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.5.0</Version>
+      <Version>7.0.3</Version>
     </PackageReference>
     <PackageReference Include="System.Xml.XPath">
       <Version>4.3.0</Version>

diff --git a/tests/app.config b/tests/app.config
@@ -3,33 +3,24 @@
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>
-				<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
+				<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
-				<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-4.16.0.0" newVersion="4.16.0.0"/>
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Microsoft.Extensions.Http" publicKeyToken="adb9793829ddae60" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1"/>
+				<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
 			</dependentAssembly>
 			<dependentAssembly>
-				<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-5.0.0.2" newVersion="5.0.0.2"/>
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1"/>
+				<assemblyIdentity name="AngleSharp" publicKeyToken="e83494dcdc6d31ea" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-0.17.1.0" newVersion="0.17.1.0"/>
 			</dependentAssembly>
 			<dependentAssembly>
-				<assemblyIdentity name="AngleSharp" publicKeyToken="e83494dcdc6d31ea" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-0.16.1.0" newVersion="0.16.1.0"/>
+				<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-4.20.69.0" newVersion="4.20.69.0"/>
 			</dependentAssembly>
 		</assemblyBinding>
 	</runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+	</startup>
+</configuration>