Upgrade SDK version to alpha2

firely-validator-api-tests.props

@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<FirelySdkVersion>5.11.7</FirelySdkVersion>
+		<FirelySdkVersion>6.0.0-alpha3-20250611.3</FirelySdkVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -37,8 +37,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<NoWarn>ExperimentalApi</NoWarn>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+		<NoWarn>ExperimentalApi;SDK0001</NoWarn>
 	</PropertyGroup>
 
 </Project>

firely-validator-api.props

@@ -2,7 +2,8 @@
 
 	<!-- Solution-wide properties for NuGet packaging -->
 	<PropertyGroup>
-		<VersionPrefix>2.6.7</VersionPrefix>
+		<VersionPrefix>2.7.0</VersionPrefix>
+        <VersionSuffix>alpha</VersionSuffix>
 		<Authors>Firely</Authors>
 		<Company>Firely (https://fire.ly)</Company>
 		<Copyright>Copyright 2015-2025 Firely</Copyright>
@@ -24,11 +25,10 @@
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<Nullable>enable</Nullable>
 		<EnableNETAnalyzers>true</EnableNETAnalyzers>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<FirelySdkVersion>5.11.7</FirelySdkVersion>
+		<FirelySdkVersion>6.0.0-alpha3-20250611.3</FirelySdkVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -54,9 +54,9 @@
 		<!-- Error	CS4014	Because this call is not awaited, execution of the current method continues before the call is completed. 
     Consider applying the 'await' operator to the result of the call.	-->
 		<WarningsAsErrors>CS4014</WarningsAsErrors>
-<!--		<WarningsNotAsErrors>NU5104</WarningsNotAsErrors>-->
+		<WarningsNotAsErrors>NU5104, CS8602, CS8604, CS8619, CS8620, CS8603</WarningsNotAsErrors>
 		<!-- RS0027 falsely complains about misuse of optional parameters in the public API-->
-		<NoWarn>RS0027;ExperimentalApi</NoWarn>
+		<NoWarn>RS0027;ExperimentalApi;SDK0001</NoWarn>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 </Project>

src/Firely.Fhir.Validation.Compilation.Shared/SchemaBuilders/FixedBuilder.cs

@@ -8,6 +8,7 @@
 
 using Hl7.Fhir.ElementModel;
 using Hl7.Fhir.Introspection;
+using Hl7.Fhir.Model;
 using Hl7.Fhir.Specification.Navigation;
 using System.Collections.Generic;
 

src/Firely.Fhir.Validation.Compilation.Shared/SchemaBuilders/MaxValueBuilder.cs

@@ -7,6 +7,7 @@
  */
 using Hl7.Fhir.ElementModel;
 using Hl7.Fhir.Introspection;
+using Hl7.Fhir.Model;
 using Hl7.Fhir.Specification.Navigation;
 using System.Collections.Generic;
 

src/Firely.Fhir.Validation.Compilation.Shared/SchemaBuilders/MinValueBuilder.cs

@@ -7,6 +7,7 @@
  */
 using Hl7.Fhir.ElementModel;
 using Hl7.Fhir.Introspection;
+using Hl7.Fhir.Model;
 using Hl7.Fhir.Specification.Navigation;
 using System.Collections.Generic;
 

src/Firely.Fhir.Validation.Compilation.Shared/SchemaBuilders/PatternBuilder.cs

@@ -8,6 +8,7 @@
 
 using Hl7.Fhir.ElementModel;
 using Hl7.Fhir.Introspection;
+using Hl7.Fhir.Model;
 using Hl7.Fhir.Specification.Navigation;
 using System.Collections.Generic;
 

src/Firely.Fhir.Validation.Compilation.Shared/SchemaBuilders/StandardBuilders.cs

@@ -38,7 +38,7 @@ public class StandardBuilders(IAsyncResourceResolver source) : ISchemaBuilder
                 new CanonicalBuilder(),
                 new FhirStringBuilder(),
                 new FhirUriBuilder(),
-                // new ExtensionContextBuilder()
+                //new ExtensionContextBuilder()
             ];
 
     /// <inheritdoc/>

src/Firely.Fhir.Validation.Compilation.Shared/StructureDefinitionToElementSchemaResolver.cs

@@ -119,7 +119,7 @@ internal StructureDefinitionToElementSchemaResolver(IAsyncResourceResolver sourc
         {
             try
             {
-                return TaskHelper.Await(() => Source.FindStructureDefinitionAsync((string)schemaUri)) is StructureDefinition sd
+                return TaskHelper.Await(() => Source.FindStructureDefinitionAsync((string)schemaUri)) is { } sd
                     ? _schemaBuilder.BuildSchema(sd)
                     : null;
             }

src/Firely.Fhir.Validation.Shared/Validator.cs

@@ -62,8 +62,8 @@ public Validator(
             o switch
             {
                 null => null,
-                ElementNode en => en,
-                Resource r => r.ToTypedElement(),
+                ElementNode en => en.ToPocoNode(ModelInfo.ModelInspector),
+                Resource r => r.ToPocoNode(ModelInfo.ModelInspector),
                 _ => throw new ArgumentException("Reference resolver must return either a Resource or ElementNode.")
             };
 
@@ -74,22 +74,24 @@ public Validator(
         /// </summary>
         /// <returns>A report containing the issues found during validation.</returns>
 #pragma warning disable RS0026 // Do not add multiple public overloads with optional parameters
-        // Suppressing this issue since this will be a single method call when we introduce IScopedNode.
-        public OperationOutcome Validate(Resource instance, string? profile = null) => Validate(instance.ToTypedElement(ModelInfo.ModelInspector).AsScopedNode(), profile);
+        // Suppressing this issue since this will be a single method call when we introduce ITypedElement.
+#pragma warning disable CS0618 // Type or member is obsolete
+        public OperationOutcome Validate(Resource instance, string? profile = null) => Validate(instance.ToPocoNode(ModelInfo.ModelInspector), profile);
+#pragma warning restore CS0618 // Type or member is obsolete
 #pragma warning restore RS0026 // Do not add multiple public overloads with optional parameters
 
         /// <summary>
         /// Validates an instance against a profile.
         /// </summary>
         /// <returns>A report containing the issues found during validation.</returns>
 #pragma warning disable RS0026 // Do not add multiple public overloads with optional parameters
-        public OperationOutcome Validate(ElementNode instance, string? profile = null) => Validate(instance.AsScopedNode(), profile);
+        public OperationOutcome Validate(ElementNode instance, string? profile = null) => Validate(instance.ToPocoNode(ModelInfo.ModelInspector), profile);
 #pragma warning restore RS0026 // Do not add multiple public overloads with optional parameters
 
-        internal OperationOutcome Validate(IScopedNode sn, string? profile = null)
+        internal OperationOutcome Validate(ITypedElement sn, string? profile = null)
         {
             if (sn.InstanceType is null)
-                throw new ArgumentException($"Cannot validate the resource because {nameof(IScopedNode)} does not have an instance type.");
+                throw new ArgumentException($"Cannot validate the resource because {nameof(ITypedElement)} does not have an instance type.");
 
             profile ??= _settings.TypeNameMapper.MapTypeName(sn.InstanceType).ToString();
 

src/Firely.Fhir.Validation/Impl/AllValidator.cs

@@ -7,6 +7,8 @@
  */
 
 
+using Hl7.Fhir.ElementModel;
+using Hl7.Fhir.Model;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -74,9 +76,9 @@ public AllValidator(bool shortcircuitEvaluation, params IAssertion[] members) :
         {
         }
 
-        /// <inheritdoc cref="IGroupValidatable.Validate(IEnumerable{IScopedNode}, ValidationSettings, ValidationState)"/>
+        /// <inheritdoc cref="IGroupValidatable.Validate(IEnumerable{ITypedElement}, ValidationSettings, ValidationState)"/>
         ResultReport IGroupValidatable.Validate(
-            IEnumerable<IScopedNode> input,
+            IEnumerable<ITypedElement> input,
             ValidationSettings vc,
             ValidationState state)
         {
@@ -98,7 +100,7 @@ ResultReport IGroupValidatable.Validate(
         }
 
         /// <inheritdoc />
-        ResultReport IValidatable.Validate(IScopedNode input, ValidationSettings vc, ValidationState state) => ((IGroupValidatable)this).Validate(new[] { input }, vc, state);
+        ResultReport IValidatable.Validate(ITypedElement input, ValidationSettings vc, ValidationState state) => ((IGroupValidatable)this).Validate(new[] { input }, vc, state);
 
 
         /// <inheritdoc />

src/Firely.Fhir.Validation/Impl/AnyValidator.cs

@@ -6,6 +6,8 @@
  * available at https://github.com/FirelyTeam/firely-validator-api/blob/main/LICENSE
  */
 
+using Hl7.Fhir.ElementModel;
+using Hl7.Fhir.Model;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -56,9 +58,9 @@ public AnyValidator(params IAssertion[] members) : this(members.AsEnumerable(),
         {
         }
 
-        /// <inheritdoc cref="IGroupValidatable.Validate(IEnumerable{IScopedNode}, ValidationSettings, ValidationState)"/>
+        /// <inheritdoc cref="IGroupValidatable.Validate(IEnumerable{ITypedElement}, ValidationSettings, ValidationState)"/>
         ResultReport IGroupValidatable.Validate(
-            IEnumerable<IScopedNode> input,
+            IEnumerable<ITypedElement> input,
             ValidationSettings vc,
             ValidationState state)
         {
@@ -90,7 +92,7 @@ ResultReport IGroupValidatable.Validate(
         }
 
         /// <inheritdoc />
-        ResultReport IValidatable.Validate(IScopedNode input, ValidationSettings vc, ValidationState state) => ((IGroupValidatable)this).Validate(new[] { input }, vc, state);
+        ResultReport IValidatable.Validate(ITypedElement input, ValidationSettings vc, ValidationState state) => ((IGroupValidatable)this).Validate(new[] { input }, vc, state);
 
 
         /// <inheritdoc cref="IJsonSerializable.ToJson"/>

src/Firely.Fhir.Validation/Impl/BaseTypeInvariantConstraintsValidator.cs

@@ -1,3 +1,4 @@
+using Hl7.Fhir.ElementModel;
 using Newtonsoft.Json.Linq;
 using System;
 using System.ComponentModel;
@@ -31,10 +32,10 @@ internal class BaseTypeInvariantConstraintsValidator : IValidatable
     /// <param name="vc"></param>
     /// <param name="state"></param>
     /// <returns></returns>
-    public ResultReport Validate(IScopedNode input, ValidationSettings vc, ValidationState state)
+    public ResultReport Validate(ITypedElement input, ValidationSettings vc, ValidationState state)
     {
         if (input.InstanceType is null)
-            throw new ArgumentException($"Cannot validate the resource because {nameof(IScopedNode)} does not have an instance type.");
+            throw new ArgumentException($"Cannot validate the resource because {nameof(ITypedElement)} does not have an instance type.");
 
         return FhirSchemaGroupAnalyzer.FetchSchema(vc.ElementSchemaResolver, state, vc.TypeNameMapper.MapTypeName(input.InstanceType)) switch
         {

src/Firely.Fhir.Validation/Impl/BasicValidator.cs

@@ -6,6 +6,8 @@
  * available at https://github.com/FirelyTeam/firely-validator-api/blob/main/LICENSE
  */
 
+using Hl7.Fhir.ElementModel;
+using Hl7.Fhir.Model;
 using Newtonsoft.Json.Linq;
 using System.ComponentModel;
 
@@ -26,10 +28,10 @@ public abstract class BasicValidator : IValidatable
         public virtual JToken ToJson() => new JProperty(Key, Value);
 
         /// <inheritdoc />
-        ResultReport IValidatable.Validate(IScopedNode input, ValidationSettings vc, ValidationState state) =>
+        ResultReport IValidatable.Validate(ITypedElement input, ValidationSettings vc, ValidationState state) =>
             BasicValidate(input, vc, state);
 
-        internal abstract ResultReport BasicValidate(IScopedNode input, ValidationSettings vc, ValidationState state);
+        internal abstract ResultReport BasicValidate(ITypedElement input, ValidationSettings vc, ValidationState state);
 
 
         /// <summary>

src/Firely.Fhir.Validation/Impl/BindingValidator.cs

@@ -6,6 +6,7 @@
  * available at https://github.com/FirelyTeam/firely-validator-api/blob/main/LICENSE
  */
 
+using Hl7.Fhir.ElementModel;
 using Hl7.Fhir.Introspection;
 using Hl7.Fhir.Model;
 using Hl7.Fhir.Rest;
@@ -100,7 +101,7 @@ public BindingValidator(Canonical valueSetUri, BindingStrength? strength, bool a
         }
 
         /// <inheritdoc />
-        ResultReport IValidatable.Validate(IScopedNode input, ValidationSettings vc, ValidationState s)
+        ResultReport IValidatable.Validate(ITypedElement input, ValidationSettings vc, ValidationState s)
         {
             if (input is null) throw Error.ArgumentNull(nameof(input));
             if (input.InstanceType is null) throw Error.Argument(nameof(input), "Binding validation requires input to have an instance type.");
@@ -138,7 +139,7 @@ ResultReport IValidatable.Validate(IScopedNode input, ValidationSettings vc, Val
         /// Validates whether the instance has the minimum required coded content, depending on the binding.
         /// </summary>
         /// <remarks>Will throw an <c>InvalidOperationException</c> when the input is not of a bindeable type.</remarks>
-        private ResultReport verifyContentRequirements(IScopedNode source, Element bindable, ValidationState s)
+        private ResultReport verifyContentRequirements(ITypedElement source, Element bindable, ValidationState s)
         {
             switch (bindable)
             {
@@ -162,7 +163,7 @@ private static bool codeableConceptHasCode(CodeableConcept cc) =>
             cc.Coding.Any(cd => !string.IsNullOrEmpty(cd.Code));
 
 
-        private ResultReport validateCode(Element bindable, ValidationSettings vc, ValidationState s, IScopedNode input)
+        private ResultReport validateCode(Element bindable, ValidationSettings vc, ValidationState s, ITypedElement input)
         {
             //EK 20170605 - disabled inclusion of warnings/errors for all but required bindings since this will 
             // 1) create superfluous messages (both saying the code is not valid) coming from the validateResult + the outcome.AddIssue() 
@@ -211,14 +212,14 @@ private static string buildCodingDisplay(ValidateCodeParameters p)
                 _ => throw new NotSupportedException("Logic error: one of code/coding/cc should have been not null.")
             };
 
-            static string codeToString(string code, string? system)
+            static string codeToString(string? code, string? system)
             {
                 var systemAddition = system is null ? string.Empty : $" (system '{system}')";
-                return $"'{code}'{systemAddition}";
+                return $"'{code ?? "(node code)"}'{systemAddition}";
             }
 
             static string ccToString(CodeableConcept cc) =>
-                string.Join(',', cc.Coding?.Select(c => codeToString(c.Code, c.System)) ?? Enumerable.Empty<string>());
+                string.Join(',', cc.Coding?.Select(c => codeToString(c.Code, c.System)) ?? []);
         }
 
 

src/Firely.Fhir.Validation/Impl/CanonicalValidator.cs

@@ -6,6 +6,8 @@
  * available at https://github.com/FirelyTeam/firely-validator-api/blob/main/LICENSE
  */
 
+using Hl7.Fhir.ElementModel;
+using Hl7.Fhir.Model;
 using Hl7.Fhir.Support;
 using Newtonsoft.Json.Linq;
 using System.ComponentModel;
@@ -31,7 +33,7 @@ public class CanonicalValidator : IValidatable
         public JToken ToJson() => new JProperty("canonical", new JObject());
 
         /// <inheritdoc/>
-        ResultReport IValidatable.Validate(IScopedNode input, ValidationSettings vc, ValidationState state)
+        ResultReport IValidatable.Validate(ITypedElement input, ValidationSettings vc, ValidationState state)
         {
             switch (input.Value)
             {

src/Firely.Fhir.Validation/Impl/CardinalityValidator.cs

@@ -6,6 +6,8 @@
  * available at https://github.com/FirelyTeam/firely-validator-api/blob/main/LICENSE
  */
 
+using Hl7.Fhir.ElementModel;
+using Hl7.Fhir.Model;
 using Hl7.Fhir.Support;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
@@ -82,21 +84,21 @@ string other when int.TryParse(other, out var maximum) => maximum,
         }
 
         /// <inheritdoc />
-        ResultReport IGroupValidatable.Validate(IEnumerable<IScopedNode> input, ValidationSettings _, ValidationState s)
+        ResultReport IGroupValidatable.Validate(IEnumerable<ITypedElement> input, ValidationSettings _, ValidationState s)
         {
             var count = input.Count();
             return buildResult(input.FirstOrDefault(), count, s);
         }
 
-        private ResultReport buildResult(IScopedNode? input, int count, ValidationState s) => !inRange(count) ?
+        private ResultReport buildResult(ITypedElement? input, int count, ValidationState s) => !inRange(count) ?
                         new IssueAssertion(Issue.CONTENT_INCORRECT_OCCURRENCE,
                         $"Instance count is {count}, which is not within the specified cardinality of {CardinalityDisplay}").AsResult(s, input, nameof(CardinalityValidator))
                         : ResultReport.SUCCESS;
 
         /// <inheritdoc />
-        ResultReport IValidatable.Validate(IScopedNode input, ValidationSettings vc, ValidationState state) =>
+        ResultReport IValidatable.Validate(ITypedElement input, ValidationSettings vc, ValidationState state) =>
             buildResult(input, 1, state);
-
+        
         private bool inRange(int x) => (!Min.HasValue || x >= Min.Value) && (!Max.HasValue || x <= Max.Value);
 
         private string CardinalityDisplay => $"{Min?.ToString() ?? "<-"}..{Max?.ToString() ?? "*"}";