Skip to content

Commit cac1d99

Browse files
yetanotherchrisyetanotherchris
authored
Use Directory props and Martin 8, .NET 9 (#6)
1 parent d342fe3 commit cac1d99

File tree

8 files changed

+59
-42
lines changed

8 files changed

+59
-42
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,4 +330,5 @@ ASALocalRun/
330330
.mfractor/
331331

332332
.vscode/
333-
.vs/
333+
.vs/
334+
.claude/settings.local.json

‎Directory.Build.props‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!-- Common properties for all projects -->
4+
<TargetFramework>net9.0</TargetFramework>
5+
<LangVersion>latest</LangVersion>
6+
<Nullable>disable</Nullable>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
</PropertyGroup>
9+
10+
<!-- Package metadata for library projects -->
11+
<PropertyGroup Condition="'$(IsPackable)' == 'true'">
12+
<Authors>Chris Small</Authors>
13+
<Company />
14+
<Description>A Marten implementation of the ASP.NET Core Identity stores.</Description>
15+
<PackageProjectUrl>https://github.com/roadkillwiki/Marten.AspNetIdentity</PackageProjectUrl>
16+
<RepositoryUrl>https://github.com/yetanotherchris/MartenAspNetIdentity</RepositoryUrl>
17+
<PackageTags>marten aspnetidentity</PackageTags>
18+
<PackageIconUrl>http://jasperfx.github.io/marten/content/images/emblem.png</PackageIconUrl>
19+
<PackageReadmeFile>README.md</PackageReadmeFile>
20+
</PropertyGroup>
21+
</Project>

‎global.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "9.0.305",
4+
"rollForward": "latestMinor"
5+
}
6+
}

‎src/Marten.AspNetIdentity.Example/Marten.AspNetIdentity.Example.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
43
<UserSecretsId>aspnet-Examples.MvcSecurity-ADC7C261-1B6F-4EAB-8654-2C14BC7254E6</UserSecretsId>
54
<RootNamespace>Marten.AspNetIdentity.Example</RootNamespace>
65
</PropertyGroup>
76

8-
<ItemGroup>
9-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
10-
</ItemGroup>
117
<ItemGroup>
128
<ProjectReference Include="..\Marten.AspNetIdentity\Marten.AspNetIdentity.csproj" />
139
</ItemGroup>
14-
</Project>
10+
</Project>

‎src/Marten.AspNetIdentity.Tests/Marten.AspNetIdentity.Tests.csproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
</PropertyGroup>
6-
73
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
4+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
95
<PackageReference Include="AutoFixture" Version="4.18.1" />
106
<PackageReference Include="AutoFixture.Xunit2" Version="4.18.1" />
11-
<PackageReference Include="NSubstitute" Version="5.1.0" />
12-
<PackageReference Include="Shouldly" Version="4.2.1" />
13-
<PackageReference Include="xunit" Version="2.9.2" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
7+
<PackageReference Include="NSubstitute" Version="5.3.0" />
8+
<PackageReference Include="Shouldly" Version="4.3.0" />
9+
<PackageReference Include="xunit" Version="2.9.3" />
10+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1511
<PrivateAssets>all</PrivateAssets>
1612
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1713
</PackageReference>

‎src/Marten.AspNetIdentity/Marten.AspNetIdentity.csproj‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<Description>A Marten implementation of the ASP.NET Core Identity stores.</Description>
6-
<PackageProjectUrl>https://github.com/roadkillwiki/Marten.AspNetIdentity</PackageProjectUrl>
7-
<RepositoryUrl>https://github.com/yetanotherchris/MartenAspNetIdentity</RepositoryUrl>
8-
<PackageTags>marten aspnetidentity</PackageTags>
9-
<PackageIconUrl>http://jasperfx.github.io/marten/content/images/emblem.png</PackageIconUrl>
10-
<Authors>Chris Small</Authors>
11-
<Company />
12-
<PackageReadmeFile>README.md</PackageReadmeFile>
4+
<IsPackable>true</IsPackable>
135
</PropertyGroup>
146

157
<ItemGroup>
16-
<PackageReference Include="Marten" Version="7.31.0" />
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
18-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
19-
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.10" />
20-
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.10" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
8+
<PackageReference Include="Marten" Version="8.13.1" />
9+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="9.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
2214
</ItemGroup>
2315

2416
<ItemGroup>
25-
<None Include="../../README.md" Pack="true" PackagePath="\"/>
26-
</ItemGroup>
27-
</Project>
17+
<None Include="../../README.md" Pack="true" PackagePath="\"/>
18+
</ItemGroup>
19+
</Project>

‎src/Marten.AspNetIdentity/MartenRoleStore.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public async Task<IdentityResult> CreateAsync(TRole role, CancellationToken canc
3636
{
3737
try
3838
{
39-
using (IDocumentSession session = _documentStore.OpenSession())
39+
using (IDocumentSession session = _documentStore.LightweightSession())
4040
{
4141
session.Store(role);
4242
await session.SaveChangesAsync(cancellationToken);
@@ -55,7 +55,7 @@ public async Task<IdentityResult> UpdateAsync(TRole role, CancellationToken canc
5555
{
5656
try
5757
{
58-
using (IDocumentSession session = _documentStore.OpenSession())
58+
using (IDocumentSession session = _documentStore.LightweightSession())
5959
{
6060
session.Update(role);
6161
await session.SaveChangesAsync(cancellationToken);
@@ -74,7 +74,7 @@ public async Task<IdentityResult> DeleteAsync(TRole role, CancellationToken canc
7474
{
7575
try
7676
{
77-
using (IDocumentSession session = _documentStore.OpenSession())
77+
using (IDocumentSession session = _documentStore.LightweightSession())
7878
{
7979
session.Delete(role);
8080
await session.SaveChangesAsync(cancellationToken);

‎src/Marten.AspNetIdentity/MartenUserStore.cs‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,15 @@ public IQueryable<TUser> Users
3636

3737
public void Wipe()
3838
{
39-
using (IDocumentSession session = _documentStore.OpenSession())
39+
WipeAsync().GetAwaiter().GetResult();
40+
}
41+
42+
public async Task WipeAsync()
43+
{
44+
using (IDocumentSession session = _documentStore.LightweightSession())
4045
{
4146
session.DeleteWhere<TUser>(x => true);
42-
session.SaveChanges();
47+
await session.SaveChangesAsync();
4348
}
4449
}
4550

@@ -82,7 +87,7 @@ public async Task<IdentityResult> CreateAsync(TUser user, CancellationToken canc
8287

8388
try
8489
{
85-
using (IDocumentSession session = _documentStore.OpenSession())
90+
using (IDocumentSession session = _documentStore.LightweightSession())
8691
{
8792
session.Store(user);
8893
await session.SaveChangesAsync(cancellationToken);
@@ -100,7 +105,7 @@ public async Task<IdentityResult> UpdateAsync(TUser user, CancellationToken canc
100105
{
101106
try
102107
{
103-
using (IDocumentSession session = _documentStore.OpenSession())
108+
using (IDocumentSession session = _documentStore.LightweightSession())
104109
{
105110
session.Update(user);
106111
await session.SaveChangesAsync(cancellationToken);
@@ -118,7 +123,7 @@ public async Task<IdentityResult> DeleteAsync(TUser user, CancellationToken canc
118123
{
119124
try
120125
{
121-
using (IDocumentSession session = _documentStore.OpenSession())
126+
using (IDocumentSession session = _documentStore.LightweightSession())
122127
{
123128
session.Delete(user);
124129
await session.SaveChangesAsync(cancellationToken);
@@ -316,7 +321,7 @@ public async Task AddClaimsAsync(TUser user, IEnumerable<Claim> claims, Cancella
316321

317322
user.RoleClaims = userRoleClaims;
318323

319-
using (IDocumentSession session = _documentStore.OpenSession())
324+
using (IDocumentSession session = _documentStore.LightweightSession())
320325
{
321326
session.Store(user);
322327
await session.SaveChangesAsync(cancellationToken);

0 commit comments

Comments
 (0)