Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to .NET 8 and all NuGet #749

Merged
merged 6 commits into from
Feb 13, 2024
Merged

Update to .NET 8 and all NuGet #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11f5a5c
net8
MattMcL4475 Feb 12, 2024
30e1ecb
update dockerfile
MattMcL4475 Feb 12, 2024
d0aede9
update dockerfile
MattMcL4475 Feb 12, 2024
2c99c74
update nuget
MattMcL4475 Feb 13, 2024
1330b3a
nuget
MattMcL4475 Feb 13, 2024
7481425
Fix project into which package is added
BMurri Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Common.Tests/Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions src/Common/Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/CromwellApiClient/CromwellApiClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Dockerfile-TriggerService
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/TriggerService.Tests/TriggerService.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -15,13 +15,13 @@
</ItemGroup>

<ItemGroup>
MattMcL4475 marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Azure.Identity" Version="1.10.2" />
<PackageReference Include="Microsoft.Azure.Batch" Version="15.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Microsoft.Azure.Batch" Version="16.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/TriggerService/Dockerfile_PackagePublishedFiles-TriggerService
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 11 additions & 10 deletions src/TriggerService/TriggerService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>


<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" Version="12.15.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.38.1" />
<PackageReference Include="Microsoft.Azure.Management.ResourceManager.Fluent" Version="1.38.1" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.21.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
</ItemGroup>


Expand Down
8 changes: 4 additions & 4 deletions src/deploy-cromwell-on-azure.Tests/deploy-cromwell-on-azure.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/deploy-cromwell-on-azure/Deployer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ public async Task<int> DeployAsync()
{
var blob = new byte[5];
RandomNumberGenerator.Fill(blob);
configuration.BatchPrefix = CommonUtilities.Base32.ConvertToBase32(blob).TrimEnd('=');
configuration.BatchPrefix = blob.ConvertToBase32().TrimEnd('=');
}

ValidateRegionName(configuration.RegionName);
Expand Down
36 changes: 18 additions & 18 deletions src/deploy-cromwell-on-azure/deploy-cromwell-on-azure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<!-- Avoids "Couldn't find a valid ICU package installed on the system." error. -->
<InvariantGlobalization Condition="'$(Configuration)' == 'linux'">true</InvariantGlobalization>
<PublishSingleFile>true</PublishSingleFile>
Expand All @@ -25,33 +25,33 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.3" />
<PackageReference Include="Azure.ResourceManager.Network" Version="1.2.0" />
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.4.0" />
<PackageReference Include="KubernetesClient" Version="10.1.4" />
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Azure.ResourceManager.Network" Version="1.7.0" />
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.5.0" />
<PackageReference Include="KubernetesClient" Version="13.0.11" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="4.0.0-preview.1" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.15.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="15.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.38.1" />
<PackageReference Include="Microsoft.Azure.Management.PostgreSQL" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.Management.ContainerService" Version="1.2.0" />
<PackageReference Include="Microsoft.Azure.Management.ResourceGraph" Version="2.1.0" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
<!--Mitigate reported security issues-->
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="SSH.NET" Version="2020.0.2" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.27.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Polly" Version="7.2.4" />
<PackageReference Include="SSH.NET" Version="2023.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ga4gh-tes
Open in desktop
Submodule ga4gh-tes updated 94 files
+1 −1 .github/workflows/dotnet-restore-build-test-with-root.yml
+1 −1 .github/workflows/dotnet-restore-build-test.yml
+1 −1 .github/workflows/update-batch-vms.yml
+2 −1 .gitignore
+1 −1 src/CommonUtilities.Tests/Base32Tests.cs
+5 −5 src/CommonUtilities.Tests/CommonUtilities.Tests.csproj
+12 −9 src/CommonUtilities/CommonUtilities.csproj
+1 −1 src/CommonUtilities/Options/RetryPolicyOptions.cs
+109 −52 src/CommonUtilities/PagedInterfaceExtensions.cs
+282 −0 src/CommonUtilities/RetryHandler.cs
+647 −0 src/CommonUtilities/RetryPolicyBuilder.cs
+18 −15 src/CommonUtilities/UtilityExtensions.cs
+2 −2 src/Dockerfile-Tes
+12 −13 src/GenerateBatchVmSkus/GenerateBatchVmSkus.csproj
+0 −9 src/GenerateBatchVmSkus/GenerateBatchVmSkus.csproj.user
+2 −2 src/GenerateBatchVmSkus/Program.cs
+71 −58 src/Tes.ApiClients.Tests/CacheAndRetryHandlerTest.cs
+5 −5 src/Tes.ApiClients.Tests/PriceApiClientTests.cs
+2 −2 src/Tes.ApiClients.Tests/TerraIntegration/TerraWsmApiClientIntegrationTests.cs
+19 −28 src/Tes.ApiClients.Tests/TerraWsmApiClientTests.cs
+8 −8 src/Tes.ApiClients.Tests/Tes.ApiClients.Tests.csproj
+75 −0 src/Tes.ApiClients.Tests/TestServices/RetryHandlersHelpers.cs
+183 −57 src/Tes.ApiClients/CachingRetryHandler.cs
+158 −0 src/Tes.ApiClients/CachingRetryPolicyBuilder.cs
+96 −51 src/Tes.ApiClients/HttpApiClient.cs
+2 −2 src/Tes.ApiClients/PriceApiClient.cs
+0 −134 src/Tes.ApiClients/RetryHandler.cs
+2 −5 src/Tes.ApiClients/TerraApiClient.cs
+14 −17 src/Tes.ApiClients/TerraWsmApiClient.cs
+19 −11 src/Tes.ApiClients/Tes.ApiClients.csproj
+0 −13 src/Tes.Runner.Test/Properties/serviceDependencies.local.json.user
+8 −8 src/Tes.Runner.Test/Tes.Runner.Test.csproj
+0 −6 src/Tes.Runner.Test/Tes.Runner.Test.csproj.user
+1 −1 src/Tes.Runner/Docker/ContainerRegistryAuthorizationManager.cs
+57 −18 src/Tes.Runner/Docker/DockerExecutor.cs
+10 −10 src/Tes.Runner/Tes.Runner.csproj
+1 −1 src/Tes.RunnerCLI/Tes.RunnerCLI.csproj
+8 −5 src/Tes/Repository/PostgreSqlCachingRepository.cs
+10 −5 src/Tes/Repository/TesDbContext.cs
+20 −7 src/Tes/Repository/TesTaskPostgreSqlRepository.cs
+10 −11 src/Tes/Tes.csproj
+5 −5 src/Tes/Utilities/PostgresConnectionStringUtility.cs
+7 −7 src/TesApi.Tests/BatchPoolTests.cs
+2 −2 src/TesApi.Tests/BatchQuotaVerifierTests.cs
+80 −366 src/TesApi.Tests/BatchSchedulerTests.cs
+0 −111 src/TesApi.Tests/DeleteCompletedBatchJobsHostedServiceTests.cs
+0 −113 src/TesApi.Tests/DeleteOrphanedBatchJobsHostedServiceTests.cs
+0 −43 src/TesApi.Tests/DeleteOrphanedBatchPoolsHostedServiceTests.cs
+3 −3 src/TesApi.Tests/PriceApiBatchSkuInformationProviderTests.cs
+110 −39 src/TesApi.Tests/Repository/TesTaskPostgreSqlRepositoryIntegrationTests.cs
+1 −1 src/TesApi.Tests/StartupTests.cs
+3 −3 src/TesApi.Tests/TerraBatchPoolManagerTests.cs
+13 −8 src/TesApi.Tests/TesApi.Tests.csproj
+2 −2 src/TesApi.Tests/TestServices/TestServiceProvider.cs
+1 −1 src/TesApi.Web/AzureBatchJobAndTaskState.cs
+114 −237 src/TesApi.Web/AzureProxy.cs
+28 −27 src/TesApi.Web/BatchPool.cs
+2 −8 src/TesApi.Web/BatchPoolService.cs
+32 −40 src/TesApi.Web/BatchScheduler.BatchPools.cs
+175 −370 src/TesApi.Web/BatchScheduler.cs
+97 −80 src/TesApi.Web/CachingWithRetriesAzureProxy.cs
+0 −1 src/TesApi.Web/ConfigurationUtils.cs
+1 −1 src/TesApi.Web/Controllers/TaskServiceApi.cs
+0 −143 src/TesApi.Web/CwlDocument.cs
+0 −132 src/TesApi.Web/DeleteCompletedBatchJobsHostedService.cs
+0 −102 src/TesApi.Web/DeleteOrphanedAutoPoolsHostedService.cs
+0 −120 src/TesApi.Web/DeleteOrphanedBatchJobsHostedService.cs
+1 −1 src/TesApi.Web/Dockerfile_PackagePublishedFiles
+0 −6 src/TesApi.Web/Exceptions/AzureBatchLowQuotaException.cs
+0 −18 src/TesApi.Web/Exceptions/AzureBatchPoolCreationException.cs
+0 −6 src/TesApi.Web/Exceptions/AzureBatchQuotaMaxedOutException.cs
+0 −6 src/TesApi.Web/Exceptions/AzureBatchVirtualMachineAvailabilityException.cs
+8 −9 src/TesApi.Web/Extensions/PagedInterfaceExtensions.cs
+14 −59 src/TesApi.Web/IAzureProxy.cs
+2 −2 src/TesApi.Web/IBatchPool.cs
+1 −0 src/TesApi.Web/Management/ArmResourceInformationFinder.cs
+10 −10 src/TesApi.Web/Management/Batch/ArmBatchPoolManager.cs
+3 −3 src/TesApi.Web/Management/Batch/IBatchPoolManager.cs
+2 −1 src/TesApi.Web/Management/Batch/MappingProfilePoolToWsmRequest.cs
+6 −6 src/TesApi.Web/Management/Batch/TerraBatchPoolManager.cs
+1 −15 src/TesApi.Web/Management/BatchQuotaVerifier.cs
+1 −2 src/TesApi.Web/Management/IBatchQuotaVerifier.cs
+2 −12 src/TesApi.Web/Options/BatchSchedulingOptions.cs
+1 −1 src/TesApi.Web/RepositoryRetryHandler.cs
+2 −2 src/TesApi.Web/Scheduler.cs
+5 −6 src/TesApi.Web/Startup.cs
+17 −17 src/TesApi.Web/TesApi.Web.csproj
+0 −9 src/TesApi.Web/TesApi.Web.csproj.user
+0 −1 src/TesApi.Web/appsettings.json
+4 −4 src/deploy-tes-on-azure.Tests/deploy-tes-on-azure.Tests.csproj
+2 −1 src/deploy-tes-on-azure/Deployer.cs
+19 −20 src/deploy-tes-on-azure/deploy-tes-on-azure.csproj
+0 −2 src/deploy-tes-on-azure/scripts/helm/templates/tes-deployment.yaml
+0 −1 src/deploy-tes-on-azure/scripts/helm/values-template.yaml
Loading