-
Notifications
You must be signed in to change notification settings - Fork 2
StructureDefinitionCorrectionsResolver update #632
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
ewoutkramer
merged 12 commits into
support/validator-sdk5
from
task/correcting-resolver-update
Mar 6, 2026
Merged
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
a6762bf
Updated StructureDefinitionCorrectionsResolver to include fix for R5 …
Rob5045 91b49f1
Restoed Firely.Fhir.Validation.Compilation. Added ModelInspector para…
Rob5045 25994fb
Removed ModelInspector parameter from StructureDefinitionToElementSch…
Rob5045 eb9f20e
Added Correct extension method for Resource, Refactored correcting co…
Rob5045 152a7fe
Code cleanup.
Rob5045 59e0927
Merge branch 'support/validator-sdk5' into task/correcting-resolver-u…
Rob5045 5f7837b
Updated FirelySdkVersion for Benchmark project
Rob5045 63b5979
Optimized sd correct performance. Fixed missing existance check when …
Rob5045 be58589
Code cleanup
Rob5045 e570816
Added WithCorrections extension method.
Rob5045 9100b4a
Added generic parameter to WithCorrections.
Rob5045 e3549ac
Added CorrectSnapshot to StructureDefinitionCorrectionExtensions. Upd…
Rob5045 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
26 changes: 26 additions & 0 deletions
26
src/Firely.Fhir.Validation.Compilation.R4B/Firely.Fhir.Validation.Compilation.R4B.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Import Project="..\Firely.Fhir.Validation.Compilation.Shared\Firely.Fhir.Validation.Compilation.Shared.projitems" Label="Shared" /> | ||
| <Import Project="../../firely-validator-api.props" /> | ||
|
|
||
|
|
||
| <PropertyGroup> | ||
| <DefineConstants>R4B</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <Title>Firely validation R4B compiler</Title> | ||
| <Description>Next-gen Firely validation ElementSchema R4B compiler.</Description> | ||
| <PackageTags>HL7;FHIR;Validation;Utility;</PackageTags> | ||
| <AssemblyName>Firely.Fhir.Validation.Compilation.R4B</AssemblyName> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Hl7.Fhir.Base" Version="$(FirelySdkVersion)" /> | ||
| <PackageReference Include="Hl7.Fhir.Conformance" Version="$(FirelySdkVersion)" /> | ||
| <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.24219.2" PrivateAssets="All" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\Firely.Fhir.Validation\Firely.Fhir.Validation.csproj" /> | ||
| </ItemGroup> | ||
| </Project> |
1 change: 1 addition & 0 deletions
1
src/Firely.Fhir.Validation.Compilation.R4B/PublicAPI.Shipped.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| |
28 changes: 28 additions & 0 deletions
28
src/Firely.Fhir.Validation.Compilation.R4B/PublicAPI.Unshipped.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #nullable enable | ||
| Firely.Fhir.Validation.Compilation.ElementConversionMode | ||
| Firely.Fhir.Validation.Compilation.ElementConversionMode.BackboneType = 1 -> Firely.Fhir.Validation.Compilation.ElementConversionMode | ||
| Firely.Fhir.Validation.Compilation.ElementConversionMode.ContentReference = 2 -> Firely.Fhir.Validation.Compilation.ElementConversionMode | ||
| Firely.Fhir.Validation.Compilation.ElementConversionMode.Full = 0 -> Firely.Fhir.Validation.Compilation.ElementConversionMode | ||
| Firely.Fhir.Validation.Compilation.ISchemaBuilder | ||
| Firely.Fhir.Validation.Compilation.ISchemaBuilder.Build(Hl7.Fhir.Specification.Navigation.ElementDefinitionNavigator! nav, Firely.Fhir.Validation.Compilation.ElementConversionMode? conversionMode = Firely.Fhir.Validation.Compilation.ElementConversionMode.Full) -> System.Collections.Generic.IEnumerable<Firely.Fhir.Validation.IAssertion!>! | ||
| Firely.Fhir.Validation.Compilation.SchemaBuilder | ||
| Firely.Fhir.Validation.Compilation.SchemaBuilder.Build(Hl7.Fhir.Specification.Navigation.ElementDefinitionNavigator! nav, Firely.Fhir.Validation.Compilation.ElementConversionMode? conversionMode = Firely.Fhir.Validation.Compilation.ElementConversionMode.Full) -> System.Collections.Generic.IEnumerable<Firely.Fhir.Validation.IAssertion!>! | ||
| Firely.Fhir.Validation.Compilation.SchemaBuilder.SchemaBuilder(Hl7.Fhir.Specification.Source.IAsyncResourceResolver! source, System.Collections.Generic.IEnumerable<Firely.Fhir.Validation.Compilation.ISchemaBuilder!>? schemaBuilders = null) -> void | ||
| Firely.Fhir.Validation.Compilation.StandardBuilders | ||
| Firely.Fhir.Validation.Compilation.StandardBuilders.Build(Hl7.Fhir.Specification.Navigation.ElementDefinitionNavigator! nav, Firely.Fhir.Validation.Compilation.ElementConversionMode? conversionMode = Firely.Fhir.Validation.Compilation.ElementConversionMode.Full) -> System.Collections.Generic.IEnumerable<Firely.Fhir.Validation.IAssertion!>! | ||
| Firely.Fhir.Validation.Compilation.StandardBuilders.StandardBuilders(Hl7.Fhir.Specification.Source.IAsyncResourceResolver! source) -> void | ||
| Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver | ||
| Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.Nested.get -> Hl7.Fhir.Specification.Source.IAsyncResourceResolver! | ||
| Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.ResolveByCanonicalUri(string! uri) -> Hl7.Fhir.Model.Resource? | ||
| Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.ResolveByCanonicalUriAsync(string! uri) -> System.Threading.Tasks.Task<Hl7.Fhir.Model.Resource?>! | ||
| Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.ResolveByUri(string! uri) -> Hl7.Fhir.Model.Resource? | ||
| Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.ResolveByUriAsync(string! uri) -> System.Threading.Tasks.Task<Hl7.Fhir.Model.Resource?>! | ||
| Firely.Fhir.Validation.Compilation.StructureDefinitionCorrectionsResolver.StructureDefinitionCorrectionsResolver(Hl7.Fhir.Specification.Source.ISyncOrAsyncResourceResolver! nested) -> void | ||
| Firely.Fhir.Validation.Compilation.StructureDefinitionToElementSchemaResolver | ||
| Firely.Fhir.Validation.Compilation.StructureDefinitionToElementSchemaResolver.GetSchema(Firely.Fhir.Validation.Canonical! schemaUri) -> Firely.Fhir.Validation.ElementSchema? | ||
| Firely.Fhir.Validation.Compilation.StructureDefinitionToElementSchemaResolver.GetSchema(Hl7.Fhir.Specification.Navigation.ElementDefinitionNavigator! nav) -> Firely.Fhir.Validation.IValidatable! | ||
| Firely.Fhir.Validation.Compilation.StructureDefinitionToElementSchemaResolver.Source.get -> Hl7.Fhir.Specification.Source.IAsyncResourceResolver! | ||
| readonly Firely.Fhir.Validation.Compilation.SchemaBuilder.Source -> Hl7.Fhir.Specification.Source.IAsyncResourceResolver! | ||
| static Firely.Fhir.Validation.Compilation.StructureDefinitionToElementSchemaResolver.Create(Hl7.Fhir.Specification.Source.IAsyncResourceResolver! source, System.Collections.Generic.IEnumerable<Firely.Fhir.Validation.Compilation.ISchemaBuilder!>? extraSchemaBuilders = null) -> Firely.Fhir.Validation.IElementSchemaResolver! | ||
| static Firely.Fhir.Validation.Compilation.StructureDefinitionToElementSchemaResolver.CreatedCached(Hl7.Fhir.Specification.Source.IAsyncResourceResolver! source, System.Collections.Concurrent.ConcurrentDictionary<Firely.Fhir.Validation.Canonical!, Firely.Fhir.Validation.ElementSchema?>! cache) -> Firely.Fhir.Validation.IElementSchemaResolver! | ||
| static Firely.Fhir.Validation.Compilation.StructureDefinitionToElementSchemaResolver.CreatedCached(Hl7.Fhir.Specification.Source.IAsyncResourceResolver! source, System.Collections.Generic.IEnumerable<Firely.Fhir.Validation.Compilation.ISchemaBuilder!>? extraSchemaBuilders = null) -> Firely.Fhir.Validation.IElementSchemaResolver! |
25 changes: 25 additions & 0 deletions
25
src/Firely.Fhir.Validation.Compilation.R5/Firely.Fhir.Validation.Compilation.R5.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Import Project="..\Firely.Fhir.Validation.Compilation.Shared\Firely.Fhir.Validation.Compilation.Shared.projitems" Label="Shared" /> | ||
| <Import Project="../../firely-validator-api.props" /> | ||
|
|
||
| <PropertyGroup> | ||
| <DefineConstants>R5</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <Title>Firely validation R5 compiler</Title> | ||
| <Description>Next-gen Firely validation ElementSchema R5 compiler.</Description> | ||
| <PackageTags>HL7;FHIR;Validation;Utility;</PackageTags> | ||
| <AssemblyName>Firely.Fhir.Validation.Compilation.R5</AssemblyName> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Hl7.Fhir.Base" Version="$(FirelySdkVersion)" /> | ||
| <PackageReference Include="Hl7.Fhir.Conformance" Version="$(FirelySdkVersion)" /> | ||
| <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.24219.2" PrivateAssets="All" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\Firely.Fhir.Validation\Firely.Fhir.Validation.csproj" /> | ||
| </ItemGroup> | ||
| </Project> |
1 change: 1 addition & 0 deletions
1
src/Firely.Fhir.Validation.Compilation.R5/PublicAPI.Shipped.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| | ||
|
ewoutkramer marked this conversation as resolved.
Outdated
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These new projects are SDK-style (
<Project Sdk="Microsoft.NET.Sdk">) but use the legacy C# project type GUID ({FAE04EC0-...}). Most SDK-style projects in the solution use{9A19103F-...}; mixing GUIDs can cause inconsistent behavior in some tooling. Consider updating these entries to the SDK-style project type GUID for consistency and compatibility.