Skip to content

Commit

Permalink
Upgrading Firely packages to v5. (#4760)
Browse files Browse the repository at this point in the history
* Upgrading Firely packages to v5.

* Fixing some build issues due to a version of System.Text.Encoding.Web

* Fixing more test failures for R5

* Updates R5 ResourcePath/CodeSystem mappings

* fixing more test failures.

* Fixing more test failures

* More bug Fixes

* Updating search parameter definition urls in unsupported-search-parameters.json.

* Changing from #if R5 to #if Stu3 || R4 || R4B

* Fixing more test failures

* Fixing more bugs

* Removed lines from unsupported-search-parameters.json

* Addressing Reviewer's Comments

* Addressing reviewers comments 2

* Deleting 84.sql

* Undoing a change in 84.sql

* Addressing copliot reccommendation.

---------

Co-authored-by: Brendan Kowitz <bkowitz@microsoft.com>
  • Loading branch information
tarunmathew12 and brendankowitz authored Jan 23, 2025
1 parent 559b114 commit 09128a7
Show file tree
Hide file tree
Showing 108 changed files with 97,707 additions and 72,064 deletions.
23 changes: 15 additions & 8 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<!-- Shared dependencies versions.-->
<PropertyGroup>
<HealthcareSharedPackageVersion>7.1.183</HealthcareSharedPackageVersion>
<Hl7FhirVersion>4.3.0</Hl7FhirVersion>
<Hl7FhirVersion>5.4.0</Hl7FhirVersion>
<Hl7FhirLegacyVersion>5.3.0</Hl7FhirLegacyVersion>
</PropertyGroup>
<ItemGroup Label="CVE Mitigation">
<!--Please include the CGA id if possible-->
Expand Down Expand Up @@ -40,17 +41,23 @@
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
<PackageVersion Include="Ensure.That" Version="10.1.0" />
<PackageVersion Include="FluentValidation" Version="11.11.0" />
<PackageVersion Include="Hl7.Fhir.Base" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.STU3" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.R4" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.R4B" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.R5" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.Serialization" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.Validation.Legacy.STU3" Version="$(Hl7FhirLegacyVersion)" />
<PackageVersion Include="Hl7.Fhir.Validation.Legacy.R4" Version="$(Hl7FhirLegacyVersion)" />
<PackageVersion Include="Hl7.Fhir.Validation.Legacy.R4B" Version="$(Hl7FhirLegacyVersion)" />
<PackageVersion Include="Hl7.Fhir.Validation.Legacy.R5" Version="$(Hl7FhirLegacyVersion)" />
<PackageVersion Include="Hl7.Fhir.Specification.Data.STU3" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.Specification.Data.R4" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.Specification.Data.R4B" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.Specification.Data.R5" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.Specification.STU3" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.Specification.R4" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.Specification.R4B" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.Specification.R5" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.Specification.STU3" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.STU3" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.Fhir.Support.Poco" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="Hl7.FhirPath" Version="$(Hl7FhirVersion)" />
<PackageVersion Include="IdentityServer4" Version="4.1.2" />
<PackageVersion Include="MediatR" Version="12.4.1" />
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
Expand Down Expand Up @@ -86,8 +93,8 @@
<PackageVersion Include="Microsoft.Health.Encryption" Version="$(HealthcareSharedPackageVersion)" />
<PackageVersion Include="Microsoft.Health.Extensions.BuildTimeCodeGenerator" Version="$(HealthcareSharedPackageVersion)" />
<PackageVersion Include="Microsoft.Health.Extensions.DependencyInjection" Version="$(HealthcareSharedPackageVersion)" />
<PackageVersion Include="Microsoft.Health.Fhir.Anonymizer.R4.Core" Version="3.1.0.62" />
<PackageVersion Include="Microsoft.Health.Fhir.Anonymizer.Stu3.Core" Version="3.1.0.62" />
<PackageVersion Include="Microsoft.Health.Fhir.Anonymizer.R4.Core" Version="3.1.0.90" />
<PackageVersion Include="Microsoft.Health.Fhir.Anonymizer.Stu3.Core" Version="3.1.0.90" />
<PackageVersion Include="Microsoft.Health.Fhir.Liquid.Converter" Version="7.0.1" />
<PackageVersion Include="Microsoft.Health.SqlServer.Api" Version="$(HealthcareSharedPackageVersion)" />
<PackageVersion Include="Microsoft.Health.SqlServer" Version="$(HealthcareSharedPackageVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="Ensure.That" />
<PackageReference Include="FluentValidation" />
<PackageReference Include="Hl7.Fhir.Serialization" />
<PackageReference Include="Hl7.Fhir.Base" />
<PackageReference Include="MediatR" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" />
Expand Down
967 changes: 363 additions & 604 deletions src/Microsoft.Health.Fhir.Core/Data/R5/compartment.json

Large diffs are not rendered by default.

Binary file not shown.
Loading

0 comments on commit 09128a7

Please # to comment.