Merge remote-tracking branch 'origin/main' into feature/dotnet-9

Author: brendankowitz

Directory.Packages.props

@@ -3,6 +3,8 @@
   <PropertyGroup>
     <HealthcareSharedPackageVersion>8.0.30</HealthcareSharedPackageVersion>
     <Hl7FhirVersion>4.3.0</Hl7FhirVersion>
+    <Hl7FhirVersion>5.4.0</Hl7FhirVersion>
+    <Hl7FhirLegacyVersion>5.3.0</Hl7FhirLegacyVersion>
   </PropertyGroup>
   <!-- SDK Packages -->
   <Choose>
@@ -27,7 +29,7 @@
     <Otherwise>
       <PropertyGroup>
         <MediatRVersion>12.4.1</MediatRVersion>
-        <LoggingVersion>9.0.0</LoggingVersion>
+        <LoggingVersion>9.0.1</LoggingVersion>
         <SdkPackageVersion>9.0.0</SdkPackageVersion>
         <AspNetPackageVersion>9.0.0</AspNetPackageVersion>
       </PropertyGroup>
@@ -56,17 +58,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="$(MediatRVersion)" />
     <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
@@ -103,8 +111,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)" />

src/Microsoft.Health.Fhir.Api/Microsoft.Health.Fhir.Api.csproj

@@ -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" />