Skip to content

Commit e96c355

Browse files
normjnormj
authored
Merge pull request #240 from aws/normj/update-targets3
Update tests and samples to modern .NET versions and clean up all warnings
2 parents ee0b0e7 + ca48757 commit e96c355

File tree

18 files changed

+92
-121
lines changed

18 files changed

+92
-121
lines changed

‎samples/AspNetCore/ConsoleSample/ConsoleSample.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>ConsoleSample</AssemblyName>
66
<OutputType>Exe</OutputType>
77
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
17+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
1818
</ItemGroup>
1919

2020
</Project>

‎samples/AspNetCore/WebSample/Startup.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void ConfigureServices(IServiceCollection services)
3333
}
3434

3535
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
36-
public void Configure(IApplicationBuilder app, IHostEnvironment env)
36+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
3737
{
3838
// Example Logging
3939
_logger.LogInformation("Check the AWS Console CloudWatch Logs console in us-east-1");

‎samples/AspNetCore/WebSample/WebSample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎samples/Serilog/SerilogTestCode/SerilogTestCode.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="AWS.Logger.SeriLog" Version="1.4.0" />
10-
<PackageReference Include="Serilog" Version="2.8.0" />
9+
<PackageReference Include="AWS.Logger.SeriLog" Version="3.3.0" />
10+
<PackageReference Include="Serilog" Version="3.1.1" />
1111
</ItemGroup>
1212

1313
</Project>

‎samples/Serilog/SerilogTestCodeFromConfig/SerilogTestCodeFromConfig.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="AWS.Logger.SeriLog" Version="1.4.0" />
10-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
11-
<PackageReference Include="Serilog" Version="2.8.0" />
12-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
9+
<PackageReference Include="AWS.Logger.SeriLog" Version="3.3.0" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
11+
<PackageReference Include="Serilog" Version="3.1.1" />
12+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎samples/Serilog/SerilogTestCodeFromConfigRestrictedToMinimumLevel/SerilogTestCodeFromConfigRestrictedToMinimumLevel.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="AWS.Logger.SeriLog" Version="3.1.1" />
10-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
11-
<PackageReference Include="Serilog" Version="2.10.0" />
12-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
9+
<PackageReference Include="AWS.Logger.SeriLog" Version="3.3.0" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
11+
<PackageReference Include="Serilog" Version="3.1.1" />
12+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎test/AWS.Logger.AspNetCore.Tests/AWS.Logger.AspNetCore.Tests.csproj

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>AWS.Logger.AspNetCore.Tests</AssemblyName>
66
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
77
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
88
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
9+
<IsTestProject>true</IsTestProject>
10+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
911
</PropertyGroup>
1012

1113
<ItemGroup>
@@ -14,17 +16,17 @@
1416
</ItemGroup>
1517

1618
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
</PackageReference>
19+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
2228
<!-- This needs to be referenced to allow testing via AssumeRole credentials -->
23-
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.0.5" />
24-
</ItemGroup>
25-
26-
<ItemGroup>
27-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
29+
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.300.66" />
2830
</ItemGroup>
2931

3032
</Project>

‎test/AWS.Logger.AspNetCore.Tests/TestClass.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void ExceptionMockTest()
103103
/// onto the FakeCoreLogger. The results are then verified.
104104
/// </summary>
105105
[Fact]
106-
public void MultiThreadTestMock()
106+
public async Task MultiThreadTestMock()
107107
{
108108
var categoryName = "testlogging";
109109
var coreLogger = new FakeCoreLogger();
@@ -118,7 +118,7 @@ public void MultiThreadTestMock()
118118
tasks.Add(Task.Factory.StartNew(() => LogMessages(logMessageCount)));
119119
actualCount = actualCount + logMessageCount;
120120
}
121-
Task.WaitAll(tasks.ToArray());
121+
await Task.WhenAll(tasks.ToArray());
122122

123123
Assert.Equal(actualCount, coreLogger.ReceivedMessages.Count);
124124
}

‎test/AWS.Logger.AspNetCore.Tests/TestFilter.cs

-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
using Microsoft.Extensions.Configuration;
22
using Microsoft.Extensions.Logging;
3-
using Microsoft.AspNetCore.Hosting;
43
using Xunit;
54
using System;
6-
using Microsoft.Extensions.DependencyInjection;
7-
using System.IO;
85
using System.Reflection;
96
using System.Linq;
107

‎test/AWS.Logger.Log4Net.FilterTests/AWS.Logger.Log4Net.FilterTests.csproj

+8-13
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net462</TargetFrameworks>
55
<AssemblyName>AWS.Logger.Log4Net.FilterTests</AssemblyName>
66
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
77
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
88
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
9-
<DebugType Condition=" '$(TargetFramework)' == 'net452' ">Full</DebugType>
9+
<DebugType Condition=" '$(TargetFramework)' == 'net462' ">Full</DebugType>
10+
<IsTestProject>true</IsTestProject>
11+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1012
</PropertyGroup>
1113

1214
<ItemGroup>
@@ -15,19 +17,12 @@
1517
</ItemGroup>
1618

1719
<ItemGroup>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
20-
<PrivateAssets>all</PrivateAssets>
21-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22-
</PackageReference>
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
2322
<!-- This needs to be referenced to allow testing via AssumeRole credentials -->
24-
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.0.5" />
23+
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.300.66" />
2524
</ItemGroup>
26-
27-
<ItemGroup>
28-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
29-
</ItemGroup>
30-
25+
3126
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
3227
<PackageReference Include="log4net" Version="2.0.15" />
3328
</ItemGroup>

‎test/AWS.Logger.Log4Net.Tests/AWS.Logger.Log4Net.Tests.csproj

+7-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net462</TargetFrameworks>
55
<AssemblyName>AWS.Logger.Log4Net.Tests</AssemblyName>
66
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
77
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
88
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
9-
<DebugType Condition=" '$(TargetFramework)' == 'net452' ">Full</DebugType>
9+
<DebugType Condition=" '$(TargetFramework)' == 'net462' ">Full</DebugType>
10+
<IsTestProject>true</IsTestProject>
11+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1012
</PropertyGroup>
1113

1214
<ItemGroup>
@@ -29,17 +31,10 @@
2931
</ItemGroup>
3032

3133
<ItemGroup>
32-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
33-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
34-
<PrivateAssets>all</PrivateAssets>
35-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
36-
</PackageReference>
34+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
35+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
3736
<!-- This needs to be referenced to allow testing via AssumeRole credentials -->
38-
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.0.5" />
39-
</ItemGroup>
40-
41-
<ItemGroup>
42-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
37+
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.300.66" />
4338
</ItemGroup>
4439

4540
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">

‎test/AWS.Logger.NLog.FilterTests/AWS.Logger.NLog.FilterTests.csproj

+7-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net462</TargetFrameworks>
55
<AssemblyName>AWS.Logger.NLog.FilterTests</AssemblyName>
66
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
77
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
88
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
9-
<DebugType Condition=" '$(TargetFramework)' == 'net452' ">Full</DebugType>
9+
<DebugType Condition=" '$(TargetFramework)' == 'net462' ">Full</DebugType>
10+
<IsTestProject>true</IsTestProject>
11+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1012
</PropertyGroup>
1113

1214
<ItemGroup>
@@ -21,17 +23,10 @@
2123
</ItemGroup>
2224

2325
<ItemGroup>
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
25-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
26-
<PrivateAssets>all</PrivateAssets>
27-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28-
</PackageReference>
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
2928
<!-- This needs to be referenced to allow testing via AssumeRole credentials -->
30-
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.0.5" />
29+
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.300.66" />
3130
</ItemGroup>
3231

33-
<ItemGroup>
34-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
35-
</ItemGroup>
36-
3732
</Project>

‎test/AWS.Logger.NLog.Tests/AWS.Logger.NLog.Tests.csproj

+7-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net462</TargetFrameworks>
55
<AssemblyName>AWS.Logger.NLog.Tests</AssemblyName>
66
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
77
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
88
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
9-
<DebugType Condition=" '$(TargetFramework)' == 'net452' ">Full</DebugType>
9+
<DebugType Condition=" '$(TargetFramework)' == 'net462' ">Full</DebugType>
10+
<IsTestProject>true</IsTestProject>
11+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1012
</PropertyGroup>
1113

1214
<ItemGroup>
@@ -33,17 +35,10 @@
3335
</ItemGroup>
3436

3537
<ItemGroup>
36-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
37-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
38-
<PrivateAssets>all</PrivateAssets>
39-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
40-
</PackageReference>
38+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
39+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
4140
<!-- This needs to be referenced to allow testing via AssumeRole credentials -->
42-
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.0.5" />
41+
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.300.66" />
4342
</ItemGroup>
4443

45-
<ItemGroup>
46-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
47-
</ItemGroup>
48-
4944
</Project>

‎test/AWS.Logger.NLog.Tests/TestClass.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Threading;
3+
using System.Threading.Tasks;
34
using Amazon.CloudWatchLogs.Model;
45
using AWS.Logger.TestUtils;
56
using NLog;
@@ -49,7 +50,7 @@ public void MultiThreadBufferFullTest()
4950
}
5051

5152
[Fact]
52-
public void MessageHasToBeBrokenUp()
53+
public async Task MessageHasToBeBrokenUp()
5354
{
5455
string logGroupName = "AWSNLogGroupEventSizeExceededTest";
5556

@@ -64,20 +65,20 @@ public void MessageHasToBeBrokenUp()
6465
if (NotifyLoggingCompleted(logGroupName, "LASTMESSAGE"))
6566
{
6667
DescribeLogStreamsResponse describeLogstreamsResponse =
67-
Client.DescribeLogStreamsAsync(new DescribeLogStreamsRequest
68+
await Client.DescribeLogStreamsAsync(new DescribeLogStreamsRequest
6869
{
6970
Descending = true,
7071
LogGroupName = logGroupName,
7172
OrderBy = "LastEventTime"
72-
}).Result;
73+
});
7374

7475
// Wait for the large messages to propagate
7576
Thread.Sleep(5000);
76-
getLogEventsResponse = Client.GetLogEventsAsync(new GetLogEventsRequest
77+
getLogEventsResponse = await Client.GetLogEventsAsync(new GetLogEventsRequest
7778
{
7879
LogGroupName = logGroupName,
7980
LogStreamName = describeLogstreamsResponse.LogStreams[0].LogStreamName
80-
}).Result;
81+
});
8182
}
8283
_testFixture.LogGroupNameList.Add(logGroupName);
8384
Assert.Equal(4, getLogEventsResponse.Events.Count);

‎test/AWS.Logger.SeriLog.Tests/AWS.Logger.SeriLog.Tests.csproj

+8-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>AWS.Logger.SeriLog.Tests</AssemblyName>
66
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
77
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
88
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
9+
<IsTestProject>true</IsTestProject>
10+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
911
</PropertyGroup>
1012

1113
<ItemGroup>
@@ -35,19 +37,12 @@
3537
</ItemGroup>
3638

3739
<ItemGroup>
38-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
39-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
40-
<PrivateAssets>all</PrivateAssets>
41-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
42-
</PackageReference>
43-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
44-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
40+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
41+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
42+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
43+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
4544
<!-- This needs to be referenced to allow testing via AssumeRole credentials -->
46-
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.0.5" />
47-
</ItemGroup>
48-
49-
<ItemGroup>
50-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
45+
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.300.66" />
5146
</ItemGroup>
5247

5348
</Project>

0 commit comments

Comments
 (0)