diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 812c1ffbf2..da5432a522 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -1,5 +1,5 @@ # Start from the sdk image -FROM mcr.microsoft.com/dotnet/sdk:5.0.203-alpine3.12@sha256:4fe96d2e0ad763284c5a222efb5e7098c84c1bce8fcb18c2f896c547963de1a5 AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0.300-alpine3.12@sha256:cd03cb780dc61a1ef6e450a9e7025aa34c15a2c03e8a62a5dcfe7f490f7d2905 AS build # Set the working directory to where the source is located WORKDIR /src diff --git a/converter/dicom-cast/build/docker/Dockerfile b/converter/dicom-cast/build/docker/Dockerfile index 00268b6127..ba8c443e61 100644 --- a/converter/dicom-cast/build/docker/Dockerfile +++ b/converter/dicom-cast/build/docker/Dockerfile @@ -1,5 +1,5 @@ # Start from the sdk image -FROM mcr.microsoft.com/dotnet/sdk:5.0.203-alpine3.12@sha256:4fe96d2e0ad763284c5a222efb5e7098c84c1bce8fcb18c2f896c547963de1a5 AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0.300-alpine3.12@sha256:cd03cb780dc61a1ef6e450a9e7025aa34c15a2c03e8a62a5dcfe7f490f7d2905 AS build # Set the working directory to where the source is located WORKDIR /dicom-cast/src diff --git a/global.json b/global.json index 50d490cffa..a601da31bb 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.203" + "version": "5.0.300" } } diff --git a/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/Models/SeriesMetadata.cs b/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/Models/SeriesMetadata.cs index 0ffa14144f..2cbf3c9bfc 100644 --- a/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/Models/SeriesMetadata.cs +++ b/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/Models/SeriesMetadata.cs @@ -27,7 +27,7 @@ public SeriesMetadata(SqlDataReader sqlDataReader) StudyKey = sqlDataReader.GetInt64(1); SeriesInstanceUid = sqlDataReader.GetString(2); Modality = sqlDataReader.GetString(3); - PerformedProcedureStepStartDate = sqlDataReader.IsDBNull(4) ? null : (DateTime?)sqlDataReader.GetDateTime(4); + PerformedProcedureStepStartDate = sqlDataReader.IsDBNull(4) ? null : sqlDataReader.GetDateTime(4); } public long SeriesKey { get; private set; } diff --git a/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/Models/StudyMetadata.cs b/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/Models/StudyMetadata.cs index c723e4ebd6..8a63b8a65e 100644 --- a/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/Models/StudyMetadata.cs +++ b/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/Models/StudyMetadata.cs @@ -39,7 +39,7 @@ public StudyMetadata(SqlDataReader sqlDataReader) PatientID = sqlDataReader.GetString(2); PatientName = sqlDataReader.GetString(3); ReferringPhysicianName = sqlDataReader.GetString(4); - StudyDate = sqlDataReader.IsDBNull(5) ? null : (DateTime?)sqlDataReader.GetDateTime(5); + StudyDate = sqlDataReader.IsDBNull(5) ? null : sqlDataReader.GetDateTime(5); StudyDescription = sqlDataReader.GetString(6); AccessionNumber = sqlDataReader.GetString(7); } diff --git a/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/SqlIndexDataStoreTestHelper.cs b/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/SqlIndexDataStoreTestHelper.cs index 4f59c3dcef..7769c79cf0 100644 --- a/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/SqlIndexDataStoreTestHelper.cs +++ b/test/Microsoft.Health.Dicom.Tests.Integration/Persistence/SqlIndexDataStoreTestHelper.cs @@ -179,8 +179,8 @@ public async Task> GetDeletedInstanceEntriesAsync ORDER BY {VLatest.DeletedInstance.Watermark}"; sqlCommand.Parameters.AddWithValue("@studyInstanceUid", studyInstanceUid); - sqlCommand.Parameters.AddWithValue("@seriesInstanceUid", string.IsNullOrEmpty(seriesInstanceUid) ? DBNull.Value : (object)seriesInstanceUid); - sqlCommand.Parameters.AddWithValue("@sopInstanceUid", string.IsNullOrEmpty(sopInstanceUid) ? DBNull.Value : (object)sopInstanceUid); + sqlCommand.Parameters.AddWithValue("@seriesInstanceUid", string.IsNullOrEmpty(seriesInstanceUid) ? DBNull.Value : seriesInstanceUid); + sqlCommand.Parameters.AddWithValue("@sopInstanceUid", string.IsNullOrEmpty(sopInstanceUid) ? DBNull.Value : sopInstanceUid); using (SqlDataReader sqlDataReader = await sqlCommand.ExecuteReaderAsync()) {