Skip to content

Commit ce474a6

Browse files
jonsagarajonsagara
committed
Fix Sagara.Core.Google project references
2 parents 75b27ea + e74bdd0 commit ce474a6

29 files changed

Lines changed: 1594 additions & 20 deletions

‎.editorconfig‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,16 @@ dotnet_style_prefer_inferred_tuple_names = true:suggestion
239239
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
240240
dotnet_style_prefer_compound_assignment = true:suggestion
241241
dotnet_style_prefer_simplified_interpolation = true:suggestion
242-
dotnet_style_namespace_match_folder = true:suggestion
242+
dotnet_style_namespace_match_folder = true:suggestion
243+
244+
# Sagara.Core.Google: webhook calls must not throw; failures are logged and swallowed instead.
245+
[src/Sagara.Core.Google/**.cs]
246+
dotnet_diagnostic.CA1031.severity = none
247+
248+
# Sagara.Core.Google: don't make callers wrap webhook URLs in a Uri object just to call these methods.
249+
dotnet_diagnostic.CA1054.severity = none
250+
dotnet_diagnostic.CA1056.severity = none
251+
252+
# Sagara.Core.Caching: cache server unavailability must not bring down the application; failures are logged and swallowed instead.
253+
[src/Sagara.Core.Caching/**.cs]
254+
dotnet_diagnostic.CA1031.severity = none

‎.github/workflows/actions-security-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Harden Runner
21-
uses: step-security/harden-runner@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
21+
uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
2222
with:
2323
egress-policy: audit
2424

‎.github/workflows/build-and-publish.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
# Checkout the source code
3232
steps:
3333
- name: Harden Runner
34-
uses: step-security/harden-runner@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
34+
uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
3535
with:
3636
egress-policy: audit
3737

@@ -57,6 +57,9 @@ jobs:
5757
- name: dotnet pack Sagara.Core.Data
5858
run: dotnet pack ./src/Sagara.Core.Data/Sagara.Core.Data.csproj --configuration Release --output ${{ env.NuGetDirectory }}
5959

60+
- name: dotnet pack Sagara.Core.Google
61+
run: dotnet pack ./src/Sagara.Core.Google/Sagara.Core.Google.csproj --configuration Release --output ${{ env.NuGetDirectory }}
62+
6063
- name: dotnet pack Sagara.Core.Logging.Serilog
6164
run: dotnet pack ./src/Sagara.Core.Logging.Serilog/Sagara.Core.Logging.Serilog.csproj --configuration Release --output ${{ env.NuGetDirectory }}
6265

@@ -100,6 +103,9 @@ jobs:
100103
- name: Run unit tests
101104
run: dotnet test src/Sagara.Core.Tests/Sagara.Core.Tests.csproj --configuration Release
102105

106+
- name: Run unit tests (Sagara.Core.Google)
107+
run: dotnet test src/Sagara.Core.Google.Tests/Sagara.Core.Google.Tests.csproj --configuration Release
108+
103109
run_integration_tests:
104110
runs-on: ubuntu-latest
105111
services:

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net10.0;net11.0</TargetFrameworks>
55

66
<!-- NuGet -->
7-
<Version>6.0.0-preview1</Version>
7+
<Version>6.0.0-preview2</Version>
88
<AssemblyVersion>6.0.0</AssemblyVersion>
99
<FileVersion>6.0.0</FileVersion>
1010
<Authors>Jon Sagara</Authors>

‎Directory.Packages.props‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,35 @@
55
<!-- Packages with the same version across all target frameworks -->
66
<ItemGroup>
77
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
8+
<PackageVersion Include="Markdig" Version="1.3.2" />
89
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.7.26381.103 " />
910
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="11.0.0-preview.7.26381.103 " />
1011
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="11.0.0-preview.7.26381.103 " />
1112
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
1213
<PackageVersion Include="NodaTime" Version="3.3.3" />
1314
<PackageVersion Include="Serilog" Version="4.4.0" />
14-
<PackageVersion Include="StackExchange.Redis" Version="3.1.13" />
15-
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
15+
<PackageVersion Include="StackExchange.Redis" Version="3.1.31" />
16+
<PackageVersion Include="xunit.v3.mtp-v2" Version="4.0.0" />
1617
</ItemGroup>
1718
<!-- net10.0 -->
1819
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
1920
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.11" />
2021
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.11" />
22+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.11" />
2123
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
2224
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.11" />
25+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.11" />
2326
<PackageVersion Include="Serilog.Extensions.Hosting" Version="10.0.0" />
2427
<PackageVersion Include="System.Text.Json" Version="10.0.11" />
2528
</ItemGroup>
2629
<!-- net11.0 -->
2730
<ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
2831
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="11.0.0-preview.7.26381.103" />
2932
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.7.26381.103" />
33+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.7.26381.103" />
3034
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="11.0.0-preview.7.26381.103" />
3135
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="11.0.0-preview.7.26381.103" />
36+
<PackageVersion Include="Microsoft.Extensions.Http" Version="11.0.0-preview.7.26381.103" />
3237
<PackageVersion Include="Serilog.Extensions.Hosting" Version="10.0.0" />
3338
<PackageVersion Include="System.Text.Json" Version="11.0.0-preview.7.26381.103" />
3439
</ItemGroup>

‎README.md‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
These assemblies contain common code that I have found useful over the years, particularly when bootstrapping small
66
proof-of-concept or bug demonstration applications. It reduces the amount of boilerplate code needed to be productive.
77

8-
# Requirements
8+
# Supported .NET Versions
99

10-
`v2.x` will target `.NET 8.0`.
11-
12-
`v1.x` targets `.NET 7.0`.
10+
- `.NET 8.0`
11+
- `.NET 9.0`
12+
- `.NET 10.0`
1313

1414
# NuGet Packages
1515

@@ -41,6 +41,13 @@ proof-of-concept or bug demonstration applications. It reduces the amount of boi
4141
[Sagara.Core.Data docs](src/Sagara.Core.Data/docs/index.md)
4242

4343

44+
## Sagara.Core.Google
45+
46+
[![NuGet](https://img.shields.io/nuget/v/Sagara.Core.Google?label=NuGet)](https://www.nuget.org/packages/Sagara.Core.Google/)
47+
48+
[Sagara.Core.Google docs](src/Sagara.Core.Google/docs/index.md)
49+
50+
4451
## Sagara.Core.Logging.Serilog
4552

4653
[![NuGet](https://img.shields.io/nuget/v/Sagara.Core.Logging.Serilog?label=NuGet)](https://www.nuget.org/packages/Sagara.Core.Logging.Serilog/)

‎Sagara.Core.slnx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,16 @@
1616
<Project Path="src/Sagara.Core.AspNetCore/Sagara.Core.AspNetCore.csproj" />
1717
<Project Path="src/Sagara.Core.Caching/Sagara.Core.Caching.csproj" />
1818
<Project Path="src/Sagara.Core.Data/Sagara.Core.Data.csproj" />
19+
<Project Path="src/Sagara.Core.Google/Sagara.Core.Google.csproj" />
1920
<Project Path="src/Sagara.Core.Logging.Serilog/Sagara.Core.Logging.Serilog.csproj" />
2021
<Project Path="src/Sagara.Core/Sagara.Core.csproj" />
2122
</Folder>
2223
<Folder Name="/tests/">
2324
<Project Path="src/Sagara.Core.Caching.IntegrationTests/Sagara.Core.Caching.IntegrationTests.csproj" />
25+
<Project Path="src/Sagara.Core.Google.Tests/Sagara.Core.Google.Tests.csproj" />
2426
<Project Path="src/Sagara.Core.Tests/Sagara.Core.Tests.csproj" />
2527
</Folder>
28+
<Folder Name="/tools/">
29+
<Project Path="src/Sagara.Core.ConsoleRunner/Sagara.Core.ConsoleRunner.csproj" Id="8239e9fd-ce67-4bb3-86c7-8c7a9cc2344e" />
30+
</Folder>
2631
</Solution>

‎make_docs.bat‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ echo [Sagara.Core.Data] Generating docs...
2424
dotnet defaultDocumentation -a "src\Sagara.Core.Data\bin\Debug\net8.0\Sagara.Core.Data.dll" -o "src\Sagara.Core.Data\docs" --ConfigurationFilePath ".\DefaultDocumentation.json"
2525
echo [Sagara.Core.Data] Done.
2626

27+
REM Sagara.Core.Google
28+
echo [Sagara.Core.Google] Generating docs...
29+
dotnet defaultDocumentation -a "src\Sagara.Core.Google\bin\Debug\net8.0\Sagara.Core.Google.dll" -o "src\Sagara.Core.Google\docs" --ConfigurationFilePath ".\DefaultDocumentation.json"
30+
echo [Sagara.Core.Google] Done.
31+
2732
REM Sagara.Core.Logging.Serilog
2833
echo [Sagara.Core.Logging.Serilog] Generating docs...
2934
dotnet defaultDocumentation -a "src\Sagara.Core.Logging.Serilog\bin\Debug\net8.0\Sagara.Core.Logging.Serilog.dll" -o "src\Sagara.Core.Logging.Serilog\docs" --ConfigurationFilePath ".\DefaultDocumentation.json"

‎src/Sagara.Core.Caching/RedisAdminCache.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ public RedisAdminCache(ILogger<RedisAdminCache> logger, string connectionString,
3333
}
3434

3535

36-
#pragma warning disable CA1031 // Do not catch general exception types
37-
3836
/// <summary>
3937
/// Delete all the keys of all databases on the server.
4038
/// </summary>
@@ -57,6 +55,4 @@ await server
5755
_logger.Error_UnhandledException(ex, command: "FLUSHALL", key: "(all keys)");
5856
}
5957
}
60-
61-
#pragma warning restore CA1031 // Do not catch general exception types
6258
}

‎src/Sagara.Core.Caching/RedisCache.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ protected ConnectionMultiplexer InitializeConnectionMultiplexer(ConfigurationOpt
8383
}
8484

8585

86-
// Justification: Anything can happen on the network. Catch them all.
87-
#pragma warning disable CA1031 // Do not catch general exception types
88-
8986
/// <summary>
9087
/// Get the value of key. If the key does not exist the special value nil is returned.
9188
/// </summary>
@@ -473,8 +470,6 @@ public async Task<long> PublishAsync(RedisChannel channel, RedisValue message)
473470
return null;
474471
}
475472

476-
#pragma warning restore CA1031 // Do not catch general exception types
477-
478473

479474
/// <summary>
480475
/// <para>Send a ping message to the Redis server and return the round-trip latency.</para>

0 commit comments

Comments
 (0)