From 05ca3f373c413c7ec01f05b05462a07554895df2 Mon Sep 17 00:00:00 2001
From: Ewout Kramer <e.kramer@furore.com>
Date: Tue, 7 Dec 2021 11:06:27 +0100
Subject: [PATCH] Changes necessary to use the newest changes in common

---
 common                                          |  2 +-
 .../Validation/ValidatePatient.cs               | 17 +++++++----------
 .../Validation/ValidationTests.cs               |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/common b/common
index 37f913fcc0..71a8b5fbb2 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 37f913fcc01a7f0e15835162c4e49fa0de899aa7
+Subproject commit 71a8b5fbb2fd25ce84ca0fbb36682a6861097f6a
diff --git a/src/Hl7.Fhir.Core.Tests/Validation/ValidatePatient.cs b/src/Hl7.Fhir.Core.Tests/Validation/ValidatePatient.cs
index 72d5851f09..37ee920056 100644
--- a/src/Hl7.Fhir.Core.Tests/Validation/ValidatePatient.cs
+++ b/src/Hl7.Fhir.Core.Tests/Validation/ValidatePatient.cs
@@ -6,22 +6,19 @@
  * available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE
  */
 
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Hl7.Fhir.Model;
 using Hl7.Fhir.Serialization;
-using System.Xml;
-using System.Collections.Generic;
 using Hl7.Fhir.Validation;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Hl7.Fhir.Model;
-using System.Xml.Linq;
-using System.Xml.Schema;
 using System.IO;
+using System.Xml;
 
 namespace Hl7.Fhir.Tests.Validation
 {
     [TestClass]
-	public class ValidatePatient
+    public class ValidatePatient
     {
         [TestMethod]
         public void ValidateDemoPatient()
@@ -32,7 +29,7 @@ public void ValidateDemoPatient()
 
             ICollection<ValidationResult> results = new List<ValidationResult>();
 
-            foreach (var contained in patient.Contained) ((DomainResource)contained).Text = new Narrative() { Div = "<wrong />" };
+            foreach (var contained in patient.Contained) ((DomainResource)contained).Text = new Narrative() { Div = "<wrong />", Status = Narrative.NarrativeStatus.Generated };
 
             Assert.IsFalse(DotNetAttributeValidation.TryValidate(patient, results, true));
             Assert.IsTrue(results.Count > 0);
@@ -46,7 +43,7 @@ public void ValidateDemoPatient()
             patient.Identifier[0].System = "urn:oid:crap really not valid";
 
             results = new List<ValidationResult>();
-            
+
             Assert.IsFalse(DotNetAttributeValidation.TryValidate(patient, results, true));
             Assert.IsTrue(results.Count > 0);
         }
diff --git a/src/Hl7.Fhir.Core.Tests/Validation/ValidationTests.cs b/src/Hl7.Fhir.Core.Tests/Validation/ValidationTests.cs
index 0a783bbea7..4280accc4a 100644
--- a/src/Hl7.Fhir.Core.Tests/Validation/ValidationTests.cs
+++ b/src/Hl7.Fhir.Core.Tests/Validation/ValidationTests.cs
@@ -61,7 +61,7 @@ public void ValidatesResourceTag()
             Assert.IsFalse(DotNetAttributeValidation.TryValidate(p, recurse: true));
         }
 
-        private static void validateErrorOrFail(object instance, bool recurse = false, string membername = null)
+        private static void validateErrorOrFail(Base instance, bool recurse = false, string membername = null)
         {
             try
             {