Skip to content

Commit 5145b55

Browse files
WeihanLiWeihanLi
authored
Merge pull request #235 from WeihanLi/dev
1.0.73
2 parents 5a802ae + e755f39 commit 5145b55

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+600
-150
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<Import Project="./build/version.props" />
33
<PropertyGroup>
4-
<LangVersion>latest</LangVersion>
4+
<LangVersion>preview</LangVersion>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<Authors>WeihanLi</Authors>

‎Directory.Packages.props‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@
22
<PropertyGroup>
33
<!-- Enable central package management -->
44
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5-
<ExtensionPackageVersion Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'net6.0'">6.0.0</ExtensionPackageVersion>
6-
<ExtensionPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">7.0.0</ExtensionPackageVersion>
7-
<ExtensionPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">8.0.0</ExtensionPackageVersion>
8-
<ExtensionPackageVersion Condition="'$(TargetFramework)' == 'net9.0'">9.0.0</ExtensionPackageVersion>
95
</PropertyGroup>
10-
<ItemGroup>
11-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(ExtensionPackageVersion)" />
12-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(ExtensionPackageVersion)" />
6+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net8.0'">
7+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
138
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
9+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
10+
</ItemGroup>
11+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
12+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
13+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
14+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
1415
</ItemGroup>
1516
<ItemGroup>
1617
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
1718
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
1819
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
1920
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
20-
<PackageVersion Include="Serilog" Version="4.1.0" />
21+
<PackageVersion Include="Serilog" Version="4.2.0" />
2122
</ItemGroup>
2223
<ItemGroup>
23-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
24+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
2425
<PackageVersion Include="FluentAssertions" Version="6.6.0" />
2526
<PackageVersion Include="Moq" Version="4.20.72" />
2627
<PackageVersion Include="xunit" Version="2.9.2" />
@@ -35,10 +36,10 @@
3536
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
3637
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
3738
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
38-
<PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
39+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
3940
<PackageVersion Include="Dapper" Version="2.1.44" />
4041
</ItemGroup>
4142
<ItemGroup>
42-
<GlobalPackageReference Include="PolySharp" Version="1.14.1" />
43+
<GlobalPackageReference Include="PolySharp" Version="1.15.0" />
4344
</ItemGroup>
4445
</Project>

‎README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,3 @@
2828
## Release Notes
2929

3030
See pull requests list for changes <https://github.com/WeihanLi/WeihanLi.Common/pulls?q=is%3Apr+is%3Amerged+base%3Amaster>
31-
32-
## Contact
33-
34-
Contact me if you need: <[email protected]>

‎build/version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<VersionMajor>1</VersionMajor>
44
<VersionMinor>0</VersionMinor>
5-
<VersionPatch>72</VersionPatch>
5+
<VersionPatch>73</VersionPatch>
66
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
77
</PropertyGroup>
88
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"rollForward": "latestMajor",
4-
"version": "8.0.100",
4+
"version": "9.0.101",
55
"allowPrerelease": true
66
}
77
}

‎samples/DotNetCoreSample/DataExtensionTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Microsoft.Extensions.Configuration;
22
using System.ComponentModel.DataAnnotations.Schema;
33
using System.Data.Common;
4-
using System.Data.SqlClient;
4+
using Microsoft.Data.SqlClient;
55
using WeihanLi.Common;
66
using WeihanLi.Common.Helpers;
77
using WeihanLi.Common.Logging;

‎samples/DotNetCoreSample/DotNetCoreSample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
1111
<PackageReference Include="Microsoft.Extensions.ObjectPool" />
1212
<PackageReference Include="Serilog.Sinks.Console" />
13-
<PackageReference Include="System.Data.SqlClient" />
13+
<PackageReference Include="Microsoft.Data.SqlClient" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎samples/DotNetCoreSample/InMemoryStreamTest.cs‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Copyright (c) Weihan Li. All rights reserved.
2+
// Licensed under the Apache license.
3+
4+
using WeihanLi.Common.Helpers;
5+
using WeihanLi.Extensions;
6+
7+
namespace DotNetCoreSample;
8+
internal static class InMemoryStreamTest
9+
{
10+
public static async Task MainTest()
11+
{
12+
var stream = new InMemoryStream<long>("test");
13+
var timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
14+
await Task.Delay(100);
15+
await stream.AddAsync(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), new Dictionary<string, string>
16+
{
17+
{ "messages", new { name = $"test-{DateTimeOffset.Now}" } .ToJson() }
18+
});
19+
Console.WriteLine("stream message added");
20+
await Task.Delay(1000);
21+
await stream.AddAsync(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), new Dictionary<string, string>
22+
{
23+
{ "messages", new { name = $"test-{DateTimeOffset.Now}" } .ToJson() }
24+
});
25+
Console.WriteLine("stream message added");
26+
//
27+
{
28+
Console.WriteLine("Fetch messages from stream");
29+
await foreach (var item in stream.FetchAsync(timestamp, 2))
30+
{
31+
Console.WriteLine($"{item.Id} - {item.Timestamp}");
32+
Console.WriteLine(item.Fields.ToJson());
33+
}
34+
}
35+
{
36+
Console.WriteLine("Fetch messages from stream again");
37+
await foreach (var item in stream.FetchAsync(timestamp, 2))
38+
{
39+
Console.WriteLine($"{item.Id} - {item.Timestamp}");
40+
Console.WriteLine(item.Fields.ToJson());
41+
}
42+
}
43+
}
44+
}

‎samples/DotNetCoreSample/LoggerTest.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ public static void MainTest()
3535
public static void MicrosoftLoggingTest()
3636
{
3737
var services = new ServiceCollection()
38-
.AddLogging(builder => builder.AddConsole())
38+
.AddLogging(builder =>
39+
// builder.AddConsole()
40+
builder.AddFile()
41+
)
3942
.AddSingleton(typeof(GenericTest<>))
4043
.BuildServiceProvider();
4144
services.GetRequiredService<GenericTest<int>>()
@@ -46,7 +49,7 @@ public static void MicrosoftLoggingTest()
4649
Console.WriteLine();
4750

4851
services = new ServiceCollection()
49-
.AddLogging(builder => builder.AddConsole().UseCustomGenericLogger(options => options.FullNamePredict = _ => true))
52+
.AddLogging(builder => builder.AddConsole().UseCustomGenericLogger())
5053
.AddSingleton(typeof(GenericTest<>))
5154
.BuildServiceProvider();
5255
services.GetRequiredService<GenericTest<int>>()

‎samples/DotNetCoreSample/Program.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@
347347

348348
// InvokeHelper.TryInvoke(() => throw null, 3);
349349

350-
await InvokeHelper.TryInvokeAsync(TemplatingSample.MainTest);
350+
// InvokeHelper.TryInvoke(LoggerTest.MicrosoftLoggingTest);
351+
await InvokeHelper.TryInvokeAsync(InMemoryStreamTest.MainTest);
351352

352353
ConsoleHelper.ReadKeyWithPrompt("Press any key to exit");
353354

0 commit comments

Comments
 (0)