use .net10 sdk with 9 targets

Author: brendankowitz

Directory.Packages.props

@@ -22,6 +22,7 @@
   </Choose>
   <ItemGroup Label="CVE Mitigation">
     <!--Please include the CGA id if possible-->
+    <PackageVersion Include="Medino.Extensions.DependencyInjection" Version="3.0.2" />
     <PackageVersion Include="System.Security.Cryptography.Xml" Version="$(DotNetSdkPackageVersion)" />
     <!--CVE-2023-29331-->
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="$(DotNetSdkPackageVersion)" />
@@ -140,4 +141,4 @@
     <PackageVersion Include="Moq" Version="4.20.69" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
-</Project>
+</Project>

build/build-variables.yml

@@ -5,6 +5,7 @@ variables:
   buildConfiguration: 'Release' 
   publicDockerImagePlatforms: 'linux/amd64,linux/arm64'
   testDockerImagePlatforms: 'linux/amd64'
+  # Use .NET 10 SDK to support SQL script generation tool, target net9.0 (temporary until upgrading to .net10)
   defaultBuildFramework: 'net9.0' 
   azureSubscriptionEndpoint: 'docker-build'
   azureContainerRegistryName: 'healthplatformregistry'

build/docker/Dockerfile

@@ -1,5 +1,6 @@
 # --platform tells docker to always use the host platform for the build not the target platform. Runtime container will use target platform.
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0.307-azurelinux3.0 AS build
+# Use .NET 10 SDK to support SQL script generation tool, but target net9.0 in builds (temporary until upgrading to .net10)
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0.100-azurelinux3.0 AS build
 ARG TARGETARCH
 ARG FHIR_VERSION
 ARG ASSEMBLY_VER

build/dotnet9-compat/global.json

@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "9.0.307"
+    }
+}

global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.307"
+        "version": "10.0.100"
     }
 }

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

@@ -15,6 +15,7 @@
     <PackageReference Include="Hl7.Fhir.R4" />
     <PackageReference Include="Hl7.Fhir.Specification.Data.R4" PrivateAssets="build;analyzers" />
     <PackageReference Include="Medino" />
+    <PackageReference Include="Medino.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" />
   </ItemGroup>

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

@@ -12,6 +12,7 @@
     <PackageReference Include="Hl7.Fhir.R4B" />
     <PackageReference Include="Hl7.Fhir.Specification.Data.R4B" PrivateAssets="build;analyzers" />
     <PackageReference Include="Medino" />
+    <PackageReference Include="Medino.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" />
   </ItemGroup>

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

@@ -12,6 +12,7 @@
     <PackageReference Include="Hl7.Fhir.R5" />
     <PackageReference Include="Hl7.Fhir.Specification.Data.R5" PrivateAssets="build;analyzers" />
     <PackageReference Include="Medino" />
+    <PackageReference Include="Medino.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" />
   </ItemGroup>

src/Microsoft.Health.Fhir.Shared.Api/Modules/MediationModule.cs

@@ -3,10 +3,10 @@
 // Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // -------------------------------------------------------------------------------------------------
 
-using System;
 using System.Linq;
 using EnsureThat;
 using Medino;
+using Medino.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Health.Extensions.DependencyInjection;
 using Microsoft.Health.Fhir.Core.Features.Conformance;
@@ -26,12 +26,10 @@ public void Load(IServiceCollection services)
             EnsureArg.IsNotNull(services, nameof(services));
 
             // TODO: AddMedino extension method not available in Medino 3.0.2 - may need alternative registration
-            // services.AddMedino(cfg =>
-            // {
-            //     cfg.RegisterServicesFromAssemblies(KnownAssemblies.All);
-            //     cfg.AddBehavior(typeof(IPipelineBehavior<,>), typeof(RequestExceptionActionProcessorBehavior<,>));
-            //     cfg.AddBehavior(typeof(IPipelineBehavior<,>), typeof(RequestExceptionProcessorBehavior<,>));
-            // });
+            services.AddMedino(cfg =>
+            {
+               cfg.RegisterServicesFromAssemblies(KnownAssemblies.All);
+            });
 
             // Register ValidateBundlePreProcessor as a pipeline behavior
             // (Converted from IRequestPreProcessor which was removed in newer Medino versions)

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

@@ -18,6 +18,7 @@
     <PackageReference Include="Hl7.Fhir.STU3" />
     <PackageReference Include="Hl7.Fhir.Specification.Data.Stu3" PrivateAssets="build;analyzers" />
     <PackageReference Include="Medino" />
+    <PackageReference Include="Medino.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" />
   </ItemGroup>