diff --git a/Directory.Packages.props b/Directory.Packages.props index aa63c7acb5..8a669b1dbf 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,39 +1,59 @@ - 7.1.183 + 8.0.18 4.3.0 - - - - - - - - - - - - - + - 9.0.0 + 8.0.2 + 8.0.2 + 8.0.2 + + 12.4.1 + 8.0.2 + 8.0.0 + 6.0.0 + 8.0.2 + 8.0.2 + 8.0.2 + + 12.4.1 + 8.0.2 + 8.0.0 8.0.0 - 6.0.23 + 9.0.0 + 9.0.0 + 9.0.0 + 12.4.1 + 9.0.0 + 9.0.0 + 9.0.0 + + + + + + + + + + + + @@ -57,7 +77,7 @@ - + @@ -68,22 +88,23 @@ - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + @@ -102,8 +123,8 @@ - - + + @@ -115,9 +136,8 @@ - - - + + diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 7022e15796..f0d54688a0 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -4,8 +4,6 @@ ARG TARGETARCH ARG FHIR_VERSION ARG ASSEMBLY_VER -RUN groupadd nonroot -g 1000 && useradd -r -M -s /sbin/nologin -g nonroot -c nonroot nonroot -u 998 - WORKDIR /repo COPY .editorconfig \ @@ -79,7 +77,7 @@ 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 # Implicitly uses the target platform for the runtime image. -FROM mcr.microsoft.com/dotnet/aspnet:9.0.0-azurelinux3.0-distroless AS runtime +FROM mcr.microsoft.com/dotnet/aspnet:9.0.0-azurelinux3.0 AS runtime ARG FHIR_VERSION @@ -90,9 +88,6 @@ RUN tdnf clean all && tdnf repolist --refresh && tdnf update -y && tdnf clean al RUN tdnf install icu -y && \ tdnf clean all -COPY --from=build /etc/group /etc/group -COPY --from=build /etc/passwd /etc/passwd - ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ ASPNETCORE_URLS=http://+:8080 diff --git a/build/dotnet6-compat/global.json b/build/dotnet6-compat/global.json index 6e6e5445c2..2b6994f451 100644 --- a/build/dotnet6-compat/global.json +++ b/build/dotnet6-compat/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.427" + "version": "6.0.428" } } diff --git a/build/jobs/run-tests.yml b/build/jobs/run-tests.yml index d078ac0ff6..1b90ee4be3 100644 --- a/build/jobs/run-tests.yml +++ b/build/jobs/run-tests.yml @@ -119,7 +119,7 @@ jobs: workingDirectory: "$(System.ArtifactsDirectory)" testRunTitle: '${{ parameters.version }} Integration' env: - 'SqlServer:ConnectionString': 'Server=tcp:${{ parameters.integrationSqlServerName }}.database.windows.net,1433;Initial Catalog=master;Persist Security Info=False;Authentication=Active Directory Workload Identity;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;User Id=$(AZURESUBSCRIPTION_CLIENT_ID);' + 'SqlServer:ConnectionString': 'Server=tcp:${{ parameters.integrationSqlServerName }}.database.windows.net,1433;Initial Catalog=master;Persist Security Info=False;Authentication=ActiveDirectoryWorkloadIdentity;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;User Id=$(AZURESUBSCRIPTION_CLIENT_ID);' 'AZURESUBSCRIPTION_CLIENT_ID': '$(AZURESUBSCRIPTION_CLIENT_ID)' 'AZURESUBSCRIPTION_TENANT_ID': '$(AZURESUBSCRIPTION_TENANT_ID)' 'AZURESUBSCRIPTION_SERVICE_CONNECTION_ID': '$(AZURESUBSCRIPTION_SERVICE_CONNECTION_ID)' diff --git a/samples/templates/default-azuredeploy-docker.json b/samples/templates/default-azuredeploy-docker.json index d14ca1c9d1..a7589597de 100644 --- a/samples/templates/default-azuredeploy-docker.json +++ b/samples/templates/default-azuredeploy-docker.json @@ -700,7 +700,7 @@ "apiVersion": "2015-06-01", "properties": { "contentType": "text/plain", - "value": "[concat('Server=tcp:', if(equals(parameters('solutionType'),'FhirServerSqlServer'), reference(variables('computedSqlServerReference'), '2015-05-01-preview').fullyQualifiedDomainName, ''),',1433;Initial Catalog=',variables('sqlDatabaseName'),';Persist Security Info=False;Authentication=ActiveDirectoryMsi;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;User Id=', reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', variables('managedIdentityName')), '2018-11-30').clientId, ';')]" + "value": "[concat('Server=tcp:', if(equals(parameters('solutionType'),'FhirServerSqlServer'), reference(variables('computedSqlServerReference'), '2015-05-01-preview').fullyQualifiedDomainName, ''),',1433;Initial Catalog=',variables('sqlDatabaseName'),';Persist Security Info=False;Authentication=ActiveDirectoryMSI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;User Id=', reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', variables('managedIdentityName')), '2018-11-30').clientId, ';')]" }, "dependsOn": [ "[resourceId('Microsoft.KeyVault/vaults', variables('serviceName'))]", diff --git a/tools/Exporter/Exporter.csproj b/tools/Exporter/Exporter.csproj index 99a406015a..35da8f124f 100644 --- a/tools/Exporter/Exporter.csproj +++ b/tools/Exporter/Exporter.csproj @@ -15,7 +15,7 @@ - + diff --git a/tools/Exporter/Program.cs b/tools/Exporter/Program.cs index 768fb88a2c..acd0aaa0b6 100644 --- a/tools/Exporter/Program.cs +++ b/tools/Exporter/Program.cs @@ -6,7 +6,6 @@ using System; using System.Collections.Generic; using System.Configuration; -using System.Data.SqlClient; using System.Diagnostics; using System.IO; using System.Linq; @@ -14,6 +13,8 @@ using System.Threading.Tasks; using Azure.Storage.Blobs; using Azure.Storage.Blobs.Specialized; +using Microsoft.Data.SqlClient; +using Microsoft.Data.SqlClient.Server; using Microsoft.Health.Fhir.SqlServer.Features; using Microsoft.Health.Fhir.Store.Export; using Microsoft.Health.Fhir.Store.Utils; diff --git a/tools/Exporter/SqlParamaterStringExtension.cs b/tools/Exporter/SqlParamaterStringExtension.cs index d67f6dc869..6e0d7e1cdc 100644 --- a/tools/Exporter/SqlParamaterStringExtension.cs +++ b/tools/Exporter/SqlParamaterStringExtension.cs @@ -5,7 +5,8 @@ using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; +using Microsoft.Data.SqlClient.Server; using Microsoft.SqlServer.Server; namespace Microsoft.Health.Fhir.Store.Export diff --git a/tools/Exporter/SqlService.cs b/tools/Exporter/SqlService.cs index c829a783fa..547dfb3b62 100644 --- a/tools/Exporter/SqlService.cs +++ b/tools/Exporter/SqlService.cs @@ -4,9 +4,10 @@ // ------------------------------------------------------------------------------------------------- using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; using System.IO; using System.Threading; +using Microsoft.Data.SqlClient; +using Microsoft.Data.SqlClient.Server; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Health.Fhir.Core.Features.Operations; using Microsoft.Health.Fhir.SqlServer.Features.Storage; diff --git a/tools/IndexRebuilder/IndexRebuilder.cs b/tools/IndexRebuilder/IndexRebuilder.cs index 4cc68f7a6b..7244fadf54 100644 --- a/tools/IndexRebuilder/IndexRebuilder.cs +++ b/tools/IndexRebuilder/IndexRebuilder.cs @@ -6,8 +6,9 @@ using System; using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; using System.Linq; +using Microsoft.Data.SqlClient; +using Microsoft.Data.SqlClient.Server; using Microsoft.Health.Fhir.Store.Utils; namespace Microsoft.Health.Internal.IndexRebuilder diff --git a/tools/IndexRebuilder/IndexRebuilder.csproj b/tools/IndexRebuilder/IndexRebuilder.csproj index 049c51ab74..77a0c7817c 100644 --- a/tools/IndexRebuilder/IndexRebuilder.csproj +++ b/tools/IndexRebuilder/IndexRebuilder.csproj @@ -8,7 +8,7 @@ - + diff --git a/tools/IndexRebuilder/Program.cs b/tools/IndexRebuilder/Program.cs index c34f4661eb..fc95b3afc5 100644 --- a/tools/IndexRebuilder/Program.cs +++ b/tools/IndexRebuilder/Program.cs @@ -5,8 +5,9 @@ using System; using System.Configuration; -using System.Data.SqlClient; using System.Diagnostics; +using Microsoft.Data.SqlClient; +using Microsoft.Data.SqlClient.Server; namespace Microsoft.Health.Internal.IndexRebuilder {