Handle CodeableReferences that have a reference, not a code.

.gitignore

@@ -41,7 +41,6 @@ working/
 *.vssscc
 .builds
 *.pidb
-*.log
 *.scc
 
 # Visual C++ cache files
@@ -164,4 +163,6 @@ src/.vs/
 .vs/
 build/runbuild.txt
 
-dist/
+dist/
+/.idea/.idea.Hl7.Fhir.Validation.Legacy/.idea/indexLayout.xml
+/.idea/.idea.Hl7.Fhir.Validation.Legacy/.idea/workspace.xml

src/Hl7.Fhir.Validation.Legacy.R5.Tests/Validation/BindingValidationTests.cs

@@ -47,7 +47,8 @@ public void TestValueValidation()
 
             v = new Quantity(4.0m, "not-human", "http://hl7.org/fhir/administrative-gender");  // nonsense, but hey UCUM is not provided with the spec
             node = v.ToTypedElement();
-            Assert.False(validator.Validate(node, vc).Success);
+            var r = validator.Validate(node, vc);
+            Assert.False(r.Success);
 
             v = new Quantity(4.0m, "kg");  // sorry, UCUM is not provided with the spec - still validate against data-absent-reason
             node = v.ToTypedElement();
@@ -69,6 +70,27 @@ public void TestValueValidation()
             ic.Code = "not=human";
             node = ext.ToTypedElement();
             Assert.False(validator.Validate(node, vc).Success);
+
+            var cr1 = new CodeableReference
+            {
+                Concept = new CodeableConcept("http://hl7.org/fhir/administrative-gender", "female")
+            }.ToTypedElement();
+
+            validator.Validate(cr1, vc).Success.Should().BeTrue();
+
+            var cr2 = new CodeableReference
+            {
+                Concept = new CodeableConcept("http://hl7.org/fhir/administrative-gender", "femaleX")
+            }.ToTypedElement();
+
+            validator.Validate(cr2, vc).Success.Should().BeFalse();
+
+            var cr3 = new CodeableReference
+            {
+                Reference = new ResourceReference("http://some.uri")
+            }.ToTypedElement();
+
+            validator.Validate(cr3, vc).Success.Should().BeTrue();
         }
 
 
@@ -194,6 +216,8 @@ public void TestCodeableConceptValidation()
             Assert.Equal(0, result.Warnings);
         }
 
+
+
         [Fact]
         public void TestValidationErrorMessageForCodings()
         {

src/Hl7.Fhir.Validation.Legacy.Shared.Tests/Validation/ParseExtensionsTests.cs

@@ -1,12 +1,5 @@
 using Hl7.Fhir.ElementModel;
-using Hl7.Fhir.FhirPath;
 using Hl7.Fhir.Model;
-using Hl7.FhirPath;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace Hl7.Fhir.Validation
@@ -109,6 +102,28 @@ public void TestParseBindableUri()
             Assert.NotNull(c);
             Assert.Equal(iu.Value, c.Value);
         }
+
+        [Fact]
+        public void TestParseBindableCodeableReference()
+        {
+            var i = new Model.CodeableReference
+            {
+                Reference = new("http://unitsofmeasure.org"),
+                Concept = new CodeableConcept
+                {
+                    Text = "Entered text"
+                }
+            };
+            i.Concept.Coding.Add(
+               new Coding("system", "code"));
+
+            var node = i.ToTypedElement();
+            var c = node.ParseBindable() as CodeableConcept;
+
+            Assert.NotNull(node);
+            Assert.Equal(i.Concept.Coding[0].Code, c.Coding[0].Code);
+            Assert.Equal("system", c.Coding[0].System);
+        }
 
         [Fact]
         public void TestParseBindableExtension()
@@ -133,7 +148,7 @@ public void TestParseBindableExtension()
 
         [Fact]
         public void TestParseUnbindable()
-        { 
+        {
             // Now, something non-bindable
             var x = new HumanName().WithGiven("Ewout");
             var node = x.ToTypedElement();

src/Hl7.Fhir.Validation.Legacy.Shared/Schema/Binding.cs

@@ -91,22 +91,21 @@ public OperationOutcome Validate(ITypedElement input, ValidationContext vc)
             if (!ModelInfo.IsBindable(input.InstanceType))
                 return new OperationOutcome();  // success
 
-            var bindable = parseBindable(input);
+            var bindable = input.ParseBindable();
+
+            if (bindable is null)
+            {
+                // When there is no bindable content, the binding is not applicable to the instance, and we will
+                // just return a successful result.
+                return new OperationOutcome();
+            }
+
             var outcome = VerifyContentRequirements(input, bindable);
             if (!outcome.Success) return outcome;
 
             return TaskHelper.Await(() => ValidateCode(input, bindable, vc));
         }
 
-        private static Element parseBindable(ITypedElement input)
-        {
-            var bindable = input.ParseBindable();
-            if (bindable == null)    // should never happen, since we already checked IsBindable
-                throw Error.NotSupported($"Type '{input.InstanceType}' is bindable, but could not be parsed by ParseBindable().");
-
-            return bindable;
-        }
-
         internal async Task<OperationOutcome> ValidateCode(ITypedElement source, Element bindable, ValidationContext vc)
         {
             OperationOutcome outcome;

src/firely-net-sdk.props

@@ -23,7 +23,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<FirelySdkVersion>5.5.1</FirelySdkVersion>
+		<FirelySdkVersion>5.6.1</FirelySdkVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>