Skip to content

chore(ci): merging dev to main #204

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.

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

Merged
merged 7 commits into from
Feb 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
**Issue number:**
> Please provide the issue number

Issue number:

## Summary

Expand Down Expand Up @@ -37,4 +39,4 @@ Checklist:

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

**Disclaimer**: We value your time and bandwidth. As such, any pull requests created on non-triaged issues might not be successful.
**Disclaimer**: We value your time and bandwidth. As such, any pull requests created on non-triaged issues might not be successful.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup .NET 6.0
uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a
with:
dotnet-version: 6.0.302
dotnet-version: 6.0.405
- name: Install solution dependencies
run: dotnet restore
- name: Build
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,14 @@ jobs:
- name: Setup .NET 6.0
uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a
with:
dotnet-version: 6.0.302
dotnet-version: 6.0.405
- name: Install solution dependencies
run: |
dotnet tool install -g docfx
dotnet new tool-manifest
dotnet tool install docfx
- name: Create API docs
run: |
docfx apidocs/docfx.json
dotnet docfx apidocs/docfx.json
- name: Release API docs to latest
uses: peaceiris/actions-gh-pages@bd8c6b06eba6b3d25d72b7a1767993c0aeee42e7 # v3.9.2
with:
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.302"
"version": "6.0.405"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ namespace AWS.Lambda.Powertools.Logging.Internal;

/// <summary>
/// Class LoggerProvider. This class cannot be inherited.
/// Implements the <see cref="Microsoft.Extensions.Logging.ILoggerProvider" />
/// Implements the <see cref="T:Microsoft.Extensions.Logging.ILoggerProvider" />
/// </summary>
/// <seealso cref="Microsoft.Extensions.Logging.ILoggerProvider" />
/// <seealso cref="T:Microsoft.Extensions.Logging.ILoggerProvider" />
public sealed class LoggerProvider : ILoggerProvider
{
/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ namespace AWS.Lambda.Powertools.Logging;
/// <summary>
/// Class LoggerConfiguration.
/// Implements the
/// <see cref="Microsoft.Extensions.Options.IOptions{LoggerConfiguration}" />
/// <see cref="T:Microsoft.Extensions.Options.IOptions{LoggerConfiguration}" />
/// </summary>
/// <seealso cref="Microsoft.Extensions.Options.IOptions{LoggerConfiguration}" />
/// <seealso cref="T:Microsoft.Extensions.Options.IOptions{LoggerConfiguration}" />
public class LoggerConfiguration : IOptions<LoggerConfiguration>
{
/// <summary>
Expand Down
84 changes: 42 additions & 42 deletions libraries/src/AWS.Lambda.Powertools.Logging/LoggerExtensions.cs

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ protected JsonNamingPolicyDecorator(JsonNamingPolicy underlyingNamingPolicy)
_underlyingNamingPolicy = underlyingNamingPolicy;
}

/// <inheritdoc />
/// <summary>
/// When overridden in a derived class, converts the specified name according to the policy.
/// </summary>
/// <param name="name">The name to convert.</param>
/// <returns>The converted name.</returns>
public override string ConvertName(string name)
{
return _underlyingNamingPolicy == null ? name : _underlyingNamingPolicy.ConvertName(name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221221-03" />
<PackageReference Include="Moq" Version="4.18.3" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
Expand Down