diff --git a/src/Common.Tests/Common.Tests.csproj b/src/Common.Tests/Common.Tests.csproj index c1d3b7f8e..55ef4a8d5 100644 --- a/src/Common.Tests/Common.Tests.csproj +++ b/src/Common.Tests/Common.Tests.csproj @@ -1,16 +1,16 @@ - net7.0 + net8.0 false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Common/Common.csproj b/src/Common/Common.csproj index 76a03a90f..3ad4f9958 100644 --- a/src/Common/Common.csproj +++ b/src/Common/Common.csproj @@ -1,11 +1,11 @@  - net7.0 + net8.0 - + diff --git a/src/CromwellApiClient/CromwellApiClient.csproj b/src/CromwellApiClient/CromwellApiClient.csproj index 756663e81..936bc3a30 100644 --- a/src/CromwellApiClient/CromwellApiClient.csproj +++ b/src/CromwellApiClient/CromwellApiClient.csproj @@ -1,12 +1,12 @@  - net7.0 + net8.0 - - + + diff --git a/src/Dockerfile-TriggerService b/src/Dockerfile-TriggerService index cfaea423b..9a27f953d 100644 --- a/src/Dockerfile-TriggerService +++ b/src/Dockerfile-TriggerService @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env WORKDIR /app # Restore packages in separate layer @@ -16,7 +16,7 @@ COPY . ./ RUN dotnet publish -c Release -o out --no-restore TriggerService/TriggerService.csproj # Build runtime image -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 WORKDIR /app COPY --from=build-env /app/out . RUN apt update && apt full-upgrade -y && apt autoremove -y diff --git a/src/TriggerService.Tests/TriggerService.Tests.csproj b/src/TriggerService.Tests/TriggerService.Tests.csproj index c9a2ca480..ecb868919 100644 --- a/src/TriggerService.Tests/TriggerService.Tests.csproj +++ b/src/TriggerService.Tests/TriggerService.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 false @@ -15,13 +15,13 @@ - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/TriggerService/Dockerfile_PackagePublishedFiles-TriggerService b/src/TriggerService/Dockerfile_PackagePublishedFiles-TriggerService index 13d7e9acf..8ca596dec 100644 --- a/src/TriggerService/Dockerfile_PackagePublishedFiles-TriggerService +++ b/src/TriggerService/Dockerfile_PackagePublishedFiles-TriggerService @@ -2,7 +2,7 @@ # Licensed under the MIT License. # build runtime image -FROM mcr.microsoft.com/dotnet/runtime:7.0 +FROM mcr.microsoft.com/dotnet/runtime:8.0 WORKDIR /app COPY . ./ RUN apt update && apt full-upgrade -y && apt autoremove -y diff --git a/src/TriggerService/TriggerService.csproj b/src/TriggerService/TriggerService.csproj index e1fdcafc9..c34cae40c 100644 --- a/src/TriggerService/TriggerService.csproj +++ b/src/TriggerService/TriggerService.csproj @@ -2,24 +2,25 @@ Exe - net7.0 + net8.0 - + - - - - - - - - + + + + + + + + + diff --git a/src/deploy-cromwell-on-azure.Tests/deploy-cromwell-on-azure.Tests.csproj b/src/deploy-cromwell-on-azure.Tests/deploy-cromwell-on-azure.Tests.csproj index c8137c04b..dac9c5f2f 100644 --- a/src/deploy-cromwell-on-azure.Tests/deploy-cromwell-on-azure.Tests.csproj +++ b/src/deploy-cromwell-on-azure.Tests/deploy-cromwell-on-azure.Tests.csproj @@ -1,14 +1,14 @@ - net7.0 + net8.0 false - - - + + + diff --git a/src/deploy-cromwell-on-azure/Deployer.cs b/src/deploy-cromwell-on-azure/Deployer.cs index cfdda18ab..01ea8f81b 100644 --- a/src/deploy-cromwell-on-azure/Deployer.cs +++ b/src/deploy-cromwell-on-azure/Deployer.cs @@ -330,7 +330,7 @@ await Execute("Connecting to Azure Services...", async () => { var blob = new byte[5]; RandomNumberGenerator.Fill(blob); - configuration.BatchPrefix = CommonUtilities.Base32.ConvertToBase32(blob).TrimEnd('='); + configuration.BatchPrefix = blob.ConvertToBase32().TrimEnd('='); } ValidateRegionName(configuration.RegionName); diff --git a/src/deploy-cromwell-on-azure/deploy-cromwell-on-azure.csproj b/src/deploy-cromwell-on-azure/deploy-cromwell-on-azure.csproj index 1e41f77f5..2e89839a5 100644 --- a/src/deploy-cromwell-on-azure/deploy-cromwell-on-azure.csproj +++ b/src/deploy-cromwell-on-azure/deploy-cromwell-on-azure.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 true true @@ -25,12 +25,12 @@ - - - - + + + + - + @@ -38,20 +38,20 @@ - - - - - - - + + + + + + + - - - - - + + + + + diff --git a/src/ga4gh-tes b/src/ga4gh-tes index 6e120d33f..e8a72a662 160000 --- a/src/ga4gh-tes +++ b/src/ga4gh-tes @@ -1 +1 @@ -Subproject commit 6e120d33f78c7a36cffe953c74b55cba7cfbf7fc +Subproject commit e8a72a66242c29b8165f3093064571d831c5d531