diff --git a/DataTests/DataTests.csproj b/DataTests/DataTests.csproj
index 4790be9..7782088 100644
--- a/DataTests/DataTests.csproj
+++ b/DataTests/DataTests.csproj
@@ -10,14 +10,14 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index c825ce6..9fb548b 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -10,14 +10,14 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/XmlResolver/XmlResolver.cs b/XmlResolver/XmlResolver.cs
index bd84baa..32e530b 100644
--- a/XmlResolver/XmlResolver.cs
+++ b/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);
}
diff --git a/XmlResolver/XmlResolver.csproj b/XmlResolver/XmlResolver.csproj
index a17be0d..8e25277 100644
--- a/XmlResolver/XmlResolver.csproj
+++ b/XmlResolver/XmlResolver.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net6.0;net8.0
True
Norman Walsh
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.
@@ -25,13 +25,12 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/gradle.properties b/gradle.properties
index 762f7f4..c7cdcfc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-resolverVersion=6.0.2
+resolverVersion=6.0.3