Merge pull request #78 from ndw/update-dep

Update dependencies

Author: ndw

DataTests/DataTests.csproj

@@ -10,14 +10,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageReference Include="NUnit" Version="4.0.1" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="NUnit.Analyzers" Version="4.0.0">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
+        <PackageReference Include="NUnit" Version="4.2.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+        <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.0" />
+        <PackageReference Include="coverlet.collector" Version="6.0.2" />
     </ItemGroup>
 
     <ItemGroup>

Tests/Tests.csproj

@@ -10,14 +10,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageReference Include="NUnit" Version="4.0.1" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="NUnit.Analyzers" Version="4.0.0">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
+        <PackageReference Include="NUnit" Version="4.2.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+        <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.0" />
+        <PackageReference Include="coverlet.collector" Version="6.0.2" />
 
         <!-- Data -->
         <EmbeddedResource Include="Data/org/xmlresolver/catalog.xml">

XmlResolver/XmlResolver.cs

@@ -336,7 +336,7 @@ public ResourceResponse Resolve(ResourceRequest request)
                        lookup.Request is { Nature: not null, Purpose: not null };
         if (tryRddl)
         {
-            if (lookup.IsResolved)
+            if (lookup.IsResolved && lookup.ResolvedUri != null)
             {
                 lookup = _rddlLookup(lookup, lookup.ResolvedUri);
             }

XmlResolver/XmlResolver.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0;net8.0</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Norman Walsh</Authors>
     <Description>The xmlresolver project provides an implementation of the System.Xml.XmlResolver. It uses the OASIS XML Catalogs V1.1 Standard to provide a mapping from external identifiers and URIs to local resources.</Description>
@@ -25,13 +25,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
-      <PackageReference Include="NLog" Version="5.2.8" />
-      <PackageReference Include="NUnit" Version="4.0.1" />
-      <PackageReference Include="NuGet.Frameworks" Version="5.10.0" />
-      <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="8.0.0" />
+      <PackageReference Include="NLog" Version="5.3.4" />
+      <PackageReference Include="NUnit" Version="4.2.2" />
+      <PackageReference Include="System.IO.Packaging" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup>

gradle.properties

@@ -1 +1 @@
-resolverVersion=6.0.2
+resolverVersion=6.0.3