Skip to content

Commit e591b21

Browse files
normjnormj
authored
Merge pull request #241 from aws/master
Sync dev from master
2 parents ee3b592 + e96c355 commit e591b21

File tree

27 files changed

+99
-129
lines changed

27 files changed

+99
-129
lines changed

‎.github/workflows/closed-issue-message.yml

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ jobs:
1111
# These inputs are both required
1212
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1313
message: |
14-
### ⚠️COMMENT VISIBILITY WARNING⚠️
1514
Comments on closed issues are hard for our team to see.
1615
If you need more assistance, please either tag a team member or open a new issue that references this one.
1716
If you wish to keep having a conversation with other community members under this issue feel free to do so.

‎.github/workflows/stale_issues.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
closed-for-staleness-label: closed-for-staleness
3030

3131
# Issue timing
32-
days-before-stale: 5
33-
days-before-close: 2
32+
days-before-stale: 10
33+
days-before-close: 4
3434
days-before-ancient: 36500
3535

3636
# If you don't want to mark a issue as being ancient based on a

‎awssdk.dll.snk

-596 Bytes
Binary file not shown.

‎public.snk

596 Bytes
Binary file not shown.

‎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>

‎src/AWS.Logger.AspNetCore/AWS.Logger.AspNetCore.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2121

2222
<SignAssembly>True</SignAssembly>
23-
<AssemblyOriginatorKeyFile>..\..\awssdk.dll.snk</AssemblyOriginatorKeyFile>
23+
<AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
2424
<Version>3.4.1</Version>
2525
</PropertyGroup>
2626

‎src/AWS.Logger.Core/AWS.Logger.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<SignAssembly>True</SignAssembly>
2323
<DelaySign>False</DelaySign>
24-
<AssemblyOriginatorKeyFile>..\..\awssdk.dll.snk</AssemblyOriginatorKeyFile>
24+
<AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
2525
<Version>3.2.1</Version>
2626
</PropertyGroup>
2727

‎src/AWS.Logger.Log4net/AWS.Logger.Log4net.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2121

2222
<SignAssembly>True</SignAssembly>
23-
<AssemblyOriginatorKeyFile>..\..\awssdk.dll.snk</AssemblyOriginatorKeyFile>
23+
<AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
2424
<Version>3.4.1</Version>
2525
</PropertyGroup>
2626

‎src/AWS.Logger.SeriLog/AWS.Logger.SeriLog.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2121

2222
<SignAssembly>True</SignAssembly>
23-
<AssemblyOriginatorKeyFile>..\..\awssdk.dll.snk</AssemblyOriginatorKeyFile>
23+
<AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
2424
<Version>3.3.0</Version>
2525
</PropertyGroup>
2626

‎src/NLog.AWS.Logger/NLog.AWS.Logger.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2222

2323
<SignAssembly>True</SignAssembly>
24-
<AssemblyOriginatorKeyFile>..\..\awssdk.dll.snk</AssemblyOriginatorKeyFile>
24+
<AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
2525
<Version>3.2.1</Version>
2626
</PropertyGroup>
2727

‎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>

0 commit comments

Comments
 (0)