Update nuget packages, some small fixes

nager · Nov 28, 2024 · cd99b4a · cd99b4a
1 parent 456da1d
commit cd99b4a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/src/Nager.PublicSuffix.TestConsole/Nager.PublicSuffix.TestConsole.csproj b/src/Nager.PublicSuffix.TestConsole/Nager.PublicSuffix.TestConsole.csproj
@@ -8,8 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Nager.PublicSuffix.UnitTest/Nager.PublicSuffix.UnitTest.csproj b/src/Nager.PublicSuffix.UnitTest/Nager.PublicSuffix.UnitTest.csproj
@@ -7,11 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Nager.PublicSuffix/Nager.PublicSuffix.csproj b/src/Nager.PublicSuffix/Nager.PublicSuffix.csproj
@@ -23,9 +23,9 @@
 
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
 
-    <Version>3.3.0</Version>
+    <Version>3.4.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -39,8 +39,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Nager.PublicSuffix/RuleProviders/CachedHttpRuleProvider.cs b/src/Nager.PublicSuffix/RuleProviders/CachedHttpRuleProvider.cs
@@ -53,7 +53,7 @@ public CachedHttpRuleProvider(
                 url = "https://publicsuffix.org/list/public_suffix_list.dat";
             }
 
-            this._dataFileUrl = url;
+            this._dataFileUrl = url ?? throw new InvalidOperationException("_dataFileUrl must contain a non-null value");
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public CachedHttpRuleProvider(
                 var tempUrl = configuration["Nager:PublicSuffix:DataUrl"];
                 if (!string.IsNullOrEmpty(tempUrl))
                 {
-                    url = tempUrl;
+                    url = tempUrl!;
                 }
             }
 
@@ -123,7 +123,7 @@ public override async Task<bool> BuildAsync(
             }
 
             var ruleParser = new TldRuleParser();
-            var rules = ruleParser.ParseRules(ruleData);
+            var rules = ruleParser.ParseRules(ruleData!);
 
             base.CreateDomainDataStructure(rules);
 

diff --git a/src/Nager.PublicSuffix/RuleProviders/SimpleHttpRuleProvider.cs b/src/Nager.PublicSuffix/RuleProviders/SimpleHttpRuleProvider.cs
@@ -45,7 +45,7 @@ public SimpleHttpRuleProvider(
                 url = "https://publicsuffix.org/list/public_suffix_list.dat";
             }
 
-            this._dataFileUrl = url;
+            this._dataFileUrl = url ?? throw new InvalidOperationException("_dataFileUrl must contain a non-null value");
         }
 
         /// <inheritdoc/>