Min .net10 upgrade

Author: brendankowitz

CustomAnalysisRules.ruleset

@@ -24,6 +24,13 @@
     <Rule Id="CA1805" Action="Info" />
     <Rule Id="CA1860" Action="Info" />
     <Rule Id="CA1863" Action="Info" />
+    <Rule Id="CA1873" Action="None" />
+    <Rule Id="CA2024" Action="None" />
+    <Rule Id="CA2025" Action="None" />
+    <Rule Id="ASPDEPR008" Action="None" />
+    <Rule Id="ASPDEPR006" Action="None" />
+    <Rule Id="ASPDEPR003" Action="None" />
+    <Rule Id="ASPDEPR005" Action="None" />
   </Rules>
   <Rules AnalyzerId="Microsoft.CodeQuality.Analyzers" RuleNamespace="Microsoft.CodeQuality.Analyzers">
     <Rule Id="CA1054" Action="Info" />

Directory.Build.props

@@ -13,13 +13,13 @@
     <HighEntropyVA>true</HighEntropyVA>
     <LangVersion>latest</LangVersion>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <NoWarn>$(NoWarn);NU5104;CS1574;IDE0005</NoWarn>
+    <NoWarn>$(NoWarn);NU5104;NU1510;CS1574;IDE0005;ASPDEPR008;ASPDEPR006;ASPDEPR003;ASPDEPR005;CA2024</NoWarn>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Product>Microsoft FHIR Server for Azure</Product>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryUrl>https://github.com/microsoft/fhir-server</RepositoryUrl>
     <RunSettingsFilePath>$(MSBuildThisFileDirectory)\CodeCoverage.runsettings</RunSettingsFilePath>
-    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />

Directory.Packages.props

@@ -4,7 +4,7 @@
     <HealthcareSharedPackageVersion>11.0.3</HealthcareSharedPackageVersion>
     <Hl7FhirVersion>5.11.4</Hl7FhirVersion>
     <Hl7FhirLegacyVersion>5.11.0</Hl7FhirLegacyVersion>
-    <DotNetSdkPackageVersion>9.0.11</DotNetSdkPackageVersion>
+    <DotNetSdkPackageVersion>10.0.0</DotNetSdkPackageVersion>
     <OpenIddictPackageVersion>6.2.0</OpenIddictPackageVersion>
   </PropertyGroup>
   <!-- SDK Packages -->
@@ -19,6 +19,11 @@
         <AspNetPackageVersion>9.0.3</AspNetPackageVersion>
       </PropertyGroup>
     </When>
+    <When Condition="'$(TargetFramework)' == 'net10.0'">
+      <PropertyGroup>
+        <AspNetPackageVersion>10.0.0</AspNetPackageVersion>
+      </PropertyGroup>
+    </When>
   </Choose>
   <ItemGroup Label="CVE Mitigation">
     <!--Please include the CGA id if possible-->

build/build-variables.yml

@@ -5,8 +5,8 @@ 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' 
+  # Use .NET 10 SDK to support SQL script generation tool, target net10.0
+  defaultBuildFramework: 'net10.0' 
   azureSubscriptionEndpoint: 'docker-build'
   azureContainerRegistryName: 'healthplatformregistry'
   azureContainerRegistry: '$(azureContainerRegistryName).azurecr.io'

build/ci-pipeline.yml

@@ -65,7 +65,7 @@ stages:
     majorMinorPatch: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.majorMinorPatch']]
     nuGetVersion: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.nuGetVersion']]
   jobs:
-  - job: Windows_dotnet9
+  - job: Windows_dotnet10
     pool:
       name: '$(DefaultWindowsPool)'
       demands:

build/docker/Dockerfile

@@ -1,5 +1,5 @@
 # --platform tells docker to always use the host platform for the build not the target platform. Runtime container will use target platform.
-# Use .NET 10 SDK to support SQL script generation tool, but target net9.0 in builds (temporary until upgrading to .net10)
+# Use .NET 10 SDK to support SQL script generation tool, targeting net10.0 and net8.0 in builds
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0.100-azurelinux3.0 AS build
 ARG TARGETARCH
 ARG FHIR_VERSION
@@ -78,10 +78,10 @@ RUN dotnet restore ./src/Microsoft.Health.Fhir.${FHIR_VERSION}.Web/Microsoft.Hea
 
 COPY . .
 
-RUN dotnet publish /repo/src/Microsoft.Health.Fhir.${FHIR_VERSION}.Web/Microsoft.Health.Fhir.${FHIR_VERSION}.Web.csproj -o "/build" --no-restore -p:AssemblyVersion="${ASSEMBLY_VER}" -p:FileVersion="${ASSEMBLY_VER}" -p:Version="${ASSEMBLY_VER}" -f net9.0 -a $TARGETARCH
+RUN dotnet publish /repo/src/Microsoft.Health.Fhir.${FHIR_VERSION}.Web/Microsoft.Health.Fhir.${FHIR_VERSION}.Web.csproj -o "/build" --no-restore -p:AssemblyVersion="${ASSEMBLY_VER}" -p:FileVersion="${ASSEMBLY_VER}" -p:Version="${ASSEMBLY_VER}" -f net10.0 -a $TARGETARCH
 
 # Implicitly uses the target platform for the runtime image.
-FROM mcr.microsoft.com/dotnet/aspnet:9.0.10-azurelinux3.0 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:10.0.0-azurelinux3.0 AS runtime
 
 ARG FHIR_VERSION
 

build/jobs/analyze.yml

@@ -110,7 +110,7 @@ steps:
   inputs:
     userProvideBuildInfo: 'msBuildInfo'
     msBuildArchitecture: 'DotNetCore'
-    msBuildCommandline: 'dotnet build $(Build.SourcesDirectory)/Microsoft.Health.Fhir.sln --configuration $(buildConfiguration) -p:ContinuousIntegrationBuild=true -f net9.0'
+    msBuildCommandline: 'dotnet build $(Build.SourcesDirectory)/Microsoft.Health.Fhir.sln --configuration $(buildConfiguration) -p:ContinuousIntegrationBuild=true -f net10.0'
 
 - task: BinSkim@4
   inputs:

build/pr-pipeline.yml

@@ -37,7 +37,7 @@ stages:
     majorMinorPatch: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.majorMinorPatch']]
     nuGetVersion: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.nuGetVersion']]
   jobs:
-  - job: Windows_dotnet9
+  - job: Windows_dotnet10
     pool:
       name: '$(DefaultWindowsPool)'
       demands:

src/Microsoft.Health.Fhir.CosmosDb.Initialization/Features/Storage/ResourceManagerCollectionSetup.cs

@@ -186,9 +186,11 @@ public async Task InstallStoredProcs(CancellationToken cancellationToken)
         CosmosDBSqlContainerResource containerResponse = await Database.GetCosmosDBSqlContainers().GetAsync(CollectionId, cancellationToken);
         CosmosDBSqlStoredProcedureCollection cosmosDbSqlStoredProcedures = containerResponse.GetCosmosDBSqlStoredProcedures();
 
-        var existing = cosmosDbSqlStoredProcedures
-            .Select(x => x.Data.Resource.StoredProcedureName)
-            .ToList();
+        var existing = new List<string>();
+        await foreach (var item in cosmosDbSqlStoredProcedures.WithCancellation(cancellationToken))
+        {
+            existing.Add(item.Data.Resource.StoredProcedureName);
+        }
 
         var storedProcsNeedingInstall = _storeProceduresMetadata
             .Where(storedProc => !existing.Contains(storedProc.FullName))