Skip to content

Commit ac28a30

Browse files
dhelperdhelper
committed
Upgraded projects to dotnet8
1 parent 2e43bae commit ac28a30

File tree

39 files changed

+241
-236
lines changed

39 files changed

+241
-236
lines changed

‎dotnet-test-samples/apigw-lambda-list-s3-buckets/src/ServerlessTestSamples.Core/ServerlessTestSamples.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
1111
</ItemGroup>
1212

1313
</Project>

‎dotnet-test-samples/apigw-lambda-list-s3-buckets/src/ServerlessTestSamples.Integrations/ServerlessTestSamples.Integrations.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
</ItemGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="AWSSDK.S3" Version="3.7.9.18" />
9-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
10-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
11-
<PackageReference Include="Serilog" Version="2.11.0" />
12-
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
13-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
8+
<PackageReference Include="AWSSDK.S3" Version="3.7.400.2" />
9+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
11+
<PackageReference Include="Serilog" Version="4.0.1" />
12+
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
13+
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
1414
</ItemGroup>
1515

1616
<PropertyGroup>
17-
<TargetFramework>net6.0</TargetFramework>
17+
<TargetFramework>net8.0</TargetFramework>
1818
<ImplicitUsings>enable</ImplicitUsings>
1919
<Nullable>enable</Nullable>
2020
</PropertyGroup>

‎dotnet-test-samples/apigw-lambda-list-s3-buckets/src/ServerlessTestSamples/ServerlessTestSamples.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
66
<AWSProjectType>Lambda</AWSProjectType>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
11-
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.2.0" />
12-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.4.0" />
13-
<PackageReference Include="AWSSDK.S3" Version="3.7.9.18" />
14-
<PackageReference Include="AWSXRayRecorder.Core" Version="2.10.1" />
15-
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.8.3" />
16-
<PackageReference Include="AWSXRayRecorder.Handlers.System.Net" Version="2.7.3" />
10+
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
11+
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.3" />
12+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
13+
<PackageReference Include="AWSSDK.S3" Version="3.7.400.2" />
14+
<PackageReference Include="AWSXRayRecorder.Core" Version="2.15.0" />
15+
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.13.0" />
16+
<PackageReference Include="AWSXRayRecorder.Handlers.System.Net" Version="2.12.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎dotnet-test-samples/apigw-lambda-list-s3-buckets/template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Globals:
88
Function:
99
Tracing: PassThrough
1010
Timeout: 10
11-
Runtime: dotnet6
11+
Runtime: dotnet8
1212
Architectures:
1313
- arm64
1414
Environment:

‎dotnet-test-samples/apigw-lambda-list-s3-buckets/tests/ServerlessTestSamples.IntegrationTest/ServerlessTestSamples.IntegrationTest.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
@@ -12,17 +12,17 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="AWSSDK.CloudFormation" Version="3.7.10.11" />
16-
<PackageReference Include="AWSSDK.SQS" Version="3.7.2.90" />
17-
<PackageReference Include="FluentAssertions" Version="6.7.0" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
19-
<PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
20-
<PackageReference Include="xunit" Version="2.4.1" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
15+
<PackageReference Include="AWSSDK.CloudFormation" Version="3.7.400.2" />
16+
<PackageReference Include="AWSSDK.SQS" Version="3.7.400.2" />
17+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
19+
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
20+
<PackageReference Include="xunit" Version="2.9.0" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>
2424
</PackageReference>
25-
<PackageReference Include="coverlet.collector" Version="3.1.2">
25+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
<PrivateAssets>all</PrivateAssets>
2828
</PackageReference>

‎dotnet-test-samples/apigw-lambda-list-s3-buckets/tests/ServerlessTestSamples.UnitTest/ServerlessTestSamples.UnitTest.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
@@ -13,17 +13,17 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
16-
<PackageReference Include="AWSSDK.Lambda" Version="3.7.13.16" />
17-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.4.0" />
18-
<PackageReference Include="FakeItEasy" Version="7.4.0" />
19-
<PackageReference Include="FluentAssertions" Version="6.7.0" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
21-
<PackageReference Include="xunit" Version="2.4.1" />
22-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
16+
<PackageReference Include="AWSSDK.Lambda" Version="3.7.400.2" />
17+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
18+
<PackageReference Include="FakeItEasy" Version="8.3.0" />
19+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
21+
<PackageReference Include="xunit" Version="2.9.0" />
22+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
<PrivateAssets>all</PrivateAssets>
2525
</PackageReference>
26-
<PackageReference Include="coverlet.collector" Version="3.1.2">
26+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
<PrivateAssets>all</PrivateAssets>
2929
</PackageReference>

‎dotnet-test-samples/async-lambda-dynamodb/src/AsyncTesting.S3EventHandler/AsyncTesting.S3EventHandler.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -11,12 +11,12 @@
1111
<PublishReadyToRun>true</PublishReadyToRun>
1212
</PropertyGroup>
1313
<ItemGroup>
14-
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
15-
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.0" />
16-
<PackageReference Include="Amazon.Lambda.S3Events" Version="3.0.0" />
17-
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.0.1" />
18-
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="1.0.1" />
19-
<PackageReference Include="AWSSDK.S3" Version="3.7.101.32" />
20-
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
14+
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
15+
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.3" />
16+
<PackageReference Include="Amazon.Lambda.S3Events" Version="3.1.0" />
17+
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.5.1" />
18+
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="1.5.0" />
19+
<PackageReference Include="AWSSDK.S3" Version="3.7.400.2" />
20+
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.13.0" />
2121
</ItemGroup>
2222
</Project>

‎dotnet-test-samples/async-lambda-dynamodb/template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Globals: # https://docs.aws.amazon.com/serverless-application-model/latest/devel
2525
Function:
2626
Timeout: 15
2727
MemorySize: 256
28-
Runtime: dotnet6
28+
Runtime: dotnet8
2929
Tracing: Active # https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html
3030
Environment:
3131
Variables:

‎dotnet-test-samples/async-lambda-dynamodb/tests/AsyncTesting.IntegrationTest/AsyncTesting.IntegrationTest.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="AWSSDK.CloudFormation" Version="3.7.105.6" />
13-
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.102.27" />
14-
<PackageReference Include="AWSSDK.S3" Version="3.7.103.50" />
15-
<PackageReference Include="FluentAssertions" Version="6.10.0" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
17-
<PackageReference Include="xunit" Version="2.4.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
12+
<PackageReference Include="AWSSDK.CloudFormation" Version="3.7.400.2" />
13+
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.400.2" />
14+
<PackageReference Include="AWSSDK.S3" Version="3.7.400.2" />
15+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
17+
<PackageReference Include="xunit" Version="2.9.0" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>
22-
<PackageReference Include="coverlet.collector" Version="3.1.2">
22+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
<PrivateAssets>all</PrivateAssets>
2525
</PackageReference>

‎dotnet-test-samples/async-lambda-dynamodb/tests/AsyncTesting.IntegrationTest/Setup.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@
1010

1111
public class Setup : IAsyncLifetime
1212
{
13-
private string? _tableName;
1413
public IAmazonDynamoDB? DynamoDbClient { get; set; }
1514

16-
public IAmazonS3 S3Client { get; set; }
15+
public IAmazonS3 S3Client { get; set; } = null!;
1716

18-
public string SourceBucketName { get; set; }
17+
public string SourceBucketName { get; set; }= null!;
1918

20-
public string DestinationBucketName { get; set; }
19+
public string DestinationBucketName { get; set; }= null!;
2120

22-
public string DestinationTableName { get; set; }
21+
public string DestinationTableName { get; set; }= null!;
2322

24-
public List<string> CreatedFiles { get; set; } = new();
23+
public List<string> CreatedFiles { get; } = new();
2524

2625
public async Task InitializeAsync()
2726
{
@@ -64,8 +63,8 @@ await this.S3Client.DeleteObjectAsync(
6463

6564
try
6665
{
67-
await this.DynamoDbClient.DeleteItemAsync(
68-
this.DestinationTableName,
66+
await this.DynamoDbClient!.DeleteItemAsync(
67+
DestinationTableName,
6968
new Dictionary<string, AttributeValue>(1)
7069
{
7170
{ "id", new AttributeValue(file) }

0 commit comments

Comments
 (0)