From 11f5a5cec702d687f84a1e837b21c1e3275daf6b Mon Sep 17 00:00:00 2001 From: Matt McLoughlin Date: Mon, 12 Feb 2024 15:33:37 -0800 Subject: [PATCH 1/6] net8 --- src/Common.Tests/Common.Tests.csproj | 2 +- src/Common/Common.csproj | 4 ++-- .../CromwellApiClient.csproj | 6 +++--- .../TriggerService.Tests.csproj | 16 +++++++-------- src/TriggerService/TriggerService.csproj | 20 +++++++++---------- .../deploy-cromwell-on-azure.Tests.csproj | 2 +- src/deploy-cromwell-on-azure/Deployer.cs | 2 +- .../deploy-cromwell-on-azure.csproj | 6 +++--- src/ga4gh-tes | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/Common.Tests/Common.Tests.csproj b/src/Common.Tests/Common.Tests.csproj index c1d3b7f8e..db49c5339 100644 --- a/src/Common.Tests/Common.Tests.csproj +++ b/src/Common.Tests/Common.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 false 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/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/TriggerService.csproj b/src/TriggerService/TriggerService.csproj index e1fdcafc9..559cf8c58 100644 --- a/src/TriggerService/TriggerService.csproj +++ b/src/TriggerService/TriggerService.csproj @@ -2,24 +2,24 @@ 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..71cc9203c 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,7 +1,7 @@ - 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 @@ public async Task DeployAsync() { 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..1208a936a 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 @@ -48,8 +48,8 @@ - - + + 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 From 30e1ecb874609a495df3212222ee330c00d15685 Mon Sep 17 00:00:00 2001 From: Matt McLoughlin Date: Mon, 12 Feb 2024 15:35:21 -0800 Subject: [PATCH 2/6] update dockerfile --- .../Dockerfile_PackagePublishedFiles-TriggerService | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From d0aede95d23becd22b80089926d601f6de5e8743 Mon Sep 17 00:00:00 2001 From: Matt McLoughlin Date: Mon, 12 Feb 2024 15:36:02 -0800 Subject: [PATCH 3/6] update dockerfile --- src/Dockerfile-TriggerService | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 2c99c74f04e30a604cf0f577d7c566258fb00ba4 Mon Sep 17 00:00:00 2001 From: Matt McLoughlin Date: Mon, 12 Feb 2024 16:01:14 -0800 Subject: [PATCH 4/6] update nuget --- src/Common.Tests/Common.Tests.csproj | 8 ++--- .../deploy-cromwell-on-azure.Tests.csproj | 6 ++-- .../deploy-cromwell-on-azure.csproj | 30 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Common.Tests/Common.Tests.csproj b/src/Common.Tests/Common.Tests.csproj index db49c5339..55ef4a8d5 100644 --- a/src/Common.Tests/Common.Tests.csproj +++ b/src/Common.Tests/Common.Tests.csproj @@ -7,10 +7,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 71cc9203c..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 @@ -6,9 +6,9 @@ - - - + + + 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 1208a936a..2e89839a5 100644 --- a/src/deploy-cromwell-on-azure/deploy-cromwell-on-azure.csproj +++ b/src/deploy-cromwell-on-azure/deploy-cromwell-on-azure.csproj @@ -25,12 +25,12 @@ - - - - + + + + - + @@ -38,20 +38,20 @@ - - - - - - - + + + + + + + - + - - + + From 1330b3af8d39083c8e77ff165b2e6ffdda10d738 Mon Sep 17 00:00:00 2001 From: Matt McLoughlin Date: Mon, 12 Feb 2024 16:02:56 -0800 Subject: [PATCH 5/6] nuget --- src/TriggerService.Tests/TriggerService.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/TriggerService.Tests/TriggerService.Tests.csproj b/src/TriggerService.Tests/TriggerService.Tests.csproj index ecb868919..c6a843741 100644 --- a/src/TriggerService.Tests/TriggerService.Tests.csproj +++ b/src/TriggerService.Tests/TriggerService.Tests.csproj @@ -15,6 +15,7 @@ + From 74814255407681807b1c1dd1ace8724a9c9af504 Mon Sep 17 00:00:00 2001 From: Blair L Murri Date: Tue, 13 Feb 2024 10:41:50 -0800 Subject: [PATCH 6/6] Fix project into which package is added --- src/TriggerService.Tests/TriggerService.Tests.csproj | 1 - src/TriggerService/TriggerService.csproj | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TriggerService.Tests/TriggerService.Tests.csproj b/src/TriggerService.Tests/TriggerService.Tests.csproj index c6a843741..ecb868919 100644 --- a/src/TriggerService.Tests/TriggerService.Tests.csproj +++ b/src/TriggerService.Tests/TriggerService.Tests.csproj @@ -15,7 +15,6 @@ - diff --git a/src/TriggerService/TriggerService.csproj b/src/TriggerService/TriggerService.csproj index 559cf8c58..c34cae40c 100644 --- a/src/TriggerService/TriggerService.csproj +++ b/src/TriggerService/TriggerService.csproj @@ -14,6 +14,7 @@ +