Skip to content

Commit 0daaf43

Browse files
JonPSmithJonPSmith
committed
All tests work. Now waiting info on EF Core issue 35186
1 parent ed1f87b commit 0daaf43

File tree

13 files changed

+95
-131
lines changed

13 files changed

+95
-131
lines changed

‎AuthPermissions.AspNetCore/CreateNuGetDebug.nuspec‎

Lines changed: 44 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -2,108 +2,65 @@
22
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>AuthPermissions.AspNetCore</id>
5-
<version>5.1.0-preview002</version>
5+
<version>9.0.0</version>
66
<authors>Jon P Smith</authors>
77
<product>AuthPermissions.AspNetCore</product>
88
<copyright>Copyright (c) 2021 Jon P Smith</copyright>
9-
<description>Provides extra authorization and multi-tenant features to a ASP.NET Core application.</description>
9+
<description>Provides extra authorization and multi-tenant features to an ASP.NET Core application.</description>
1010
<releaseNotes>
11-
- Minor improvement to set the default sharding data.
12-
</releaseNotes>
11+
- .NET 9 version
12+
</releaseNotes>
1313
<license type="expression">MIT</license>
1414
<projectUrl>https://github.com/JonPSmith/AuthPermissions.AspNetCore</projectUrl>
1515
<icon>images\AuthPermissionsAspNetCoreNuGetIcon.png</icon>
1616
<tags>ASP.NET Core, Entity Framework Core</tags>
1717
<dependencies>
18-
<group targetFramework="net6.0">
18+
<group targetFramework="net9.0">
1919
<dependency id="GenericServices.StatusGeneric" version="1.2.0" />
20-
<dependency id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" version="6.0.11" />
21-
<dependency id="Microsoft.Data.Sqlite.Core" version="6.0.11" />
22-
<dependency id="Microsoft.EntityFrameworkCore" version="6.0.11" />
23-
<dependency id="Microsoft.EntityFrameworkCore.InMemory" version="6.0.11" />
24-
<dependency id="Microsoft.EntityFrameworkCore.Sqlite" version="6.0.11" />
25-
<dependency id="Microsoft.EntityFrameworkCore.SqlServer" version="6.0.11" />
26-
<dependency id="Microsoft.EntityFrameworkCore.Tools" version="6.0.11" />
27-
<dependency id="Microsoft.Extensions.Hosting" version="6.0.1" />
28-
<dependency id="Net.RunMethodsSequentially" version="2.0.0" />
29-
<dependency id="Npgsql.EntityFrameworkCore.PostgreSQL" version="6.0.7" />
30-
<dependency id="Net.LocalizeMessagesAndErrors" version="1.0.0" />
31-
<dependency id="Microsoft.AspNetCore.Authentication.OpenIdConnect" version="6.0.11" />
32-
<dependency id="Microsoft.AspNetCore.Authorization" version="6.0.11" />
33-
<dependency id="Microsoft.AspNetCore.Http" version="2.2.2" />
34-
<dependency id="EntityFrameworkCore.Exceptions.PostgreSQL" version="6.0.3" />
35-
<dependency id="EntityFrameworkCore.Exceptions.Sqlite" version="6.0.3" />
36-
<dependency id="EntityFrameworkCore.Exceptions.SqlServer" version="6.0.3.1" />
37-
<dependency id="Microsoft.Extensions.Localization.Abstractions" version="6.0.11" />
38-
<dependency id="DistributedLock" version="2.3.2" />
39-
<dependency id="EfCore.TestSupport" version="6.0.0" />
40-
<dependency id="Microsoft.AspNetCore.Hosting" version="2.2.7" />
41-
<dependency id="Microsoft.Graph" version="4.37.0" />
42-
<dependency id="Net.DistributedFileStoreCache" version="2.0.0" />
43-
</group>
44-
<group targetFramework="net7.0">
45-
<dependency id="GenericServices.StatusGeneric" version="1.2.0" />
46-
<dependency id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" version="7.0.0" />
47-
<dependency id="Microsoft.Data.Sqlite.Core" version="7.0.0" />
48-
<dependency id="Microsoft.EntityFrameworkCore" version="7.0.0" />
49-
<dependency id="Microsoft.EntityFrameworkCore.InMemory" version="7.0.0" />
50-
<dependency id="Microsoft.EntityFrameworkCore.Sqlite" version="7.0.0" />
51-
<dependency id="Microsoft.EntityFrameworkCore.SqlServer" version="7.0.0" />
52-
<dependency id="Microsoft.EntityFrameworkCore.Tools" version="7.0.0" />
53-
<dependency id="Microsoft.Extensions.Hosting" version="7.0.0" />
54-
<dependency id="Net.RunMethodsSequentially" version="2.0.0" />
55-
<dependency id="Npgsql.EntityFrameworkCore.PostgreSQL" version="7.0.0" />
56-
<dependency id="Net.LocalizeMessagesAndErrors" version="1.0.0" />
57-
<dependency id="Microsoft.AspNetCore.Authentication.OpenIdConnect" version="7.0.0" />
58-
<dependency id="Microsoft.AspNetCore.Authorization" version="7.0.0" />
59-
<dependency id="Microsoft.AspNetCore.Http" version="2.2.2" />
60-
<dependency id="EntityFrameworkCore.Exceptions.PostgreSQL" version="6.0.3" />
61-
<dependency id="EntityFrameworkCore.Exceptions.Sqlite" version="6.0.3" />
62-
<dependency id="EntityFrameworkCore.Exceptions.SqlServer" version="6.0.3.1" />
63-
<dependency id="Microsoft.Extensions.Localization.Abstractions" version="7.0.0" />
64-
<dependency id="DistributedLock" version="2.3.2" />
65-
<dependency id="EfCore.TestSupport" version="6.0.0" />
66-
<dependency id="Microsoft.AspNetCore.Hosting" version="2.2.7" />
67-
<dependency id="Microsoft.Graph" version="4.37.0" />
20+
<dependency id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" version="9.0.0" />
21+
<dependency id="Microsoft.Data.Sqlite.Core" version="9.0.0" />
22+
<dependency id="Microsoft.EntityFrameworkCore" version="9.0.0" />
23+
<dependency id="Microsoft.EntityFrameworkCore.InMemory" version="9.0.0" />
24+
<dependency id="Microsoft.EntityFrameworkCore.Sqlite" version="9.0.0" />
25+
<dependency id="Microsoft.EntityFrameworkCore.SqlServer" version="9.0.0" />
26+
<dependency id="Npgsql.EntityFrameworkCore.PostgreSQL" version="9.0.1" />
27+
<dependency id="Microsoft.EntityFrameworkCore.Tools" version="9.0.0" />
28+
<dependency id="Microsoft.Extensions.Hosting" version="9.0.0" />
29+
<dependency id="Net.RunMethodsSequentially" version="2.0.1" />
30+
<dependency id="Net.LocalizeMessagesAndErrors" version="9.0.0" />
31+
<dependency id="Microsoft.AspNetCore.Authentication.OpenIdConnect" version="9.0.0" />
32+
<dependency id="Microsoft.AspNetCore.Authorization" version="9.0.0" />
33+
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.2.1" />
6834
<dependency id="Net.DistributedFileStoreCache" version="2.0.0" />
35+
<dependency id="System.IdentityModel.Tokens.Jwt" version="8.2.1" />
36+
<dependency id="EntityFrameworkCore.Exceptions.PostgreSQL" version="8.1.3" />
37+
<dependency id="EntityFrameworkCore.Exceptions.Sqlite" version="8.1.3" />
38+
<dependency id="EntityFrameworkCore.Exceptions.SqlServer" version="8.1.3" />
39+
<dependency id="Microsoft.EntityFrameworkCore.Design" version="9.0.0" />
40+
<dependency id="Microsoft.Extensions.Localization.Abstractions" version="9.0.0" />
41+
<dependency id="DistributedLock" version="2.5.0" />
42+
<dependency id="Microsoft.Graph" version="4.54.0" />
6943
</group>
7044
</dependencies>
7145
</metadata>
7246
<files>
73-
<file src="..\AuthPermissions\bin\Debug\net6.0\AuthPermissions.dll" target="lib\net6.0" />
74-
<file src="..\AuthPermissions\bin\Debug\net6.0\AuthPermissions.xml" target="lib\net6.0" />
75-
<file src="..\AuthPermissions\bin\Debug\net6.0\AuthPermissions.pdb" target="lib\net6.0" />
76-
<file src="..\AuthPermissions\bin\Debug\net7.0\AuthPermissions.dll" target="lib\net7.0" />
77-
<file src="..\AuthPermissions\bin\Debug\net7.0\AuthPermissions.xml" target="lib\net7.0" />
78-
<file src="..\AuthPermissions\bin\Debug\net7.0\AuthPermissions.pdb" target="lib\net7.0" />
79-
<file src="..\AuthPermissions.AspNetCore\bin\Debug\net6.0\AuthPermissions.AspNetCore.dll" target="lib\net6.0" />
80-
<file src="..\AuthPermissions.AspNetCore\bin\Debug\net6.0\AuthPermissions.AspNetCore.xml" target="lib\net6.0" />
81-
<file src="..\AuthPermissions.AspNetCore\bin\Debug\net6.0\AuthPermissions.AspNetCore.pdb" target="lib\net6.0" />
82-
<file src="..\AuthPermissions.AspNetCore\bin\Debug\net7.0\AuthPermissions.AspNetCore.dll" target="lib\net7.0" />
83-
<file src="..\AuthPermissions.AspNetCore\bin\Debug\net7.0\AuthPermissions.AspNetCore.xml" target="lib\net7.0" />
84-
<file src="..\AuthPermissions.AspNetCore\bin\Debug\net7.0\AuthPermissions.AspNetCore.pdb" target="lib\net7.0" />
85-
<file src="..\AuthPermissions.BaseCode\bin\Debug\net6.0\AuthPermissions.BaseCode.dll" target="lib\net6.0" />
86-
<file src="..\AuthPermissions.BaseCode\bin\Debug\net6.0\AuthPermissions.BaseCode.xml" target="lib\net6.0" />
87-
<file src="..\AuthPermissions.BaseCode\bin\Debug\net6.0\AuthPermissions.BaseCode.pdb" target="lib\net6.0" />
88-
<file src="..\AuthPermissions.BaseCode\bin\Debug\net7.0\AuthPermissions.BaseCode.dll" target="lib\net7.0" />
89-
<file src="..\AuthPermissions.BaseCode\bin\Debug\net7.0\AuthPermissions.BaseCode.xml" target="lib\net7.0" />
90-
<file src="..\AuthPermissions.BaseCode\bin\Debug\net7.0\AuthPermissions.BaseCode.pdb" target="lib\net7.0" />
91-
<file src="..\AuthPermissions.PostgreSql\bin\Debug\net6.0\AuthPermissions.PostgreSql.dll" target="lib\net6.0" />
92-
<file src="..\AuthPermissions.PostgreSql\bin\Debug\net6.0\AuthPermissions.PostgreSql.xml" target="lib\net6.0" />
93-
<file src="..\AuthPermissions.PostgreSql\bin\Debug\net6.0\AuthPermissions.PostgreSql.pdb" target="lib\net6.0" />
94-
<file src="..\AuthPermissions.PostgreSql\bin\Debug\net7.0\AuthPermissions.PostgreSql.dll" target="lib\net7.0" />
95-
<file src="..\AuthPermissions.PostgreSql\bin\Debug\net7.0\AuthPermissions.PostgreSql.xml" target="lib\net7.0" />
96-
<file src="..\AuthPermissions.PostgreSql\bin\Debug\net7.0\AuthPermissions.PostgreSql.pdb" target="lib\net7.0" />
97-
<file src="..\AuthPermissions.SqlServer\bin\Debug\net6.0\AuthPermissions.SqlServer.dll" target="lib\net6.0" />
98-
<file src="..\AuthPermissions.SqlServer\bin\Debug\net6.0\AuthPermissions.SqlServer.pdb" target="lib\net6.0" />
99-
<file src="..\AuthPermissions.SqlServer\bin\Debug\net7.0\AuthPermissions.SqlServer.dll" target="lib\net7.0" />
100-
<file src="..\AuthPermissions.SqlServer\bin\Debug\net7.0\AuthPermissions.SqlServer.pdb" target="lib\net7.0" />
101-
<file src="..\AuthPermissions.SupportCode\bin\Debug\net6.0\AuthPermissions.SupportCode.dll" target="lib\net6.0" />
102-
<file src="..\AuthPermissions.SupportCode\bin\Debug\net6.0\AuthPermissions.SupportCode.xml" target="lib\net6.0" />
103-
<file src="..\AuthPermissions.SupportCode\bin\Debug\net6.0\AuthPermissions.SupportCode.pdb" target="lib\net6.0" />
104-
<file src="..\AuthPermissions.SupportCode\bin\Debug\net7.0\AuthPermissions.SupportCode.dll" target="lib\net7.0" />
105-
<file src="..\AuthPermissions.SupportCode\bin\Debug\net7.0\AuthPermissions.SupportCode.xml" target="lib\net7.0" />
106-
<file src="..\AuthPermissions.SupportCode\bin\Debug\net7.0\AuthPermissions.SupportCode.pdb" target="lib\net7.0" />
47+
<file src="..\AuthPermissions\bin\Debug\net9.0\AuthPermissions.dll" target="lib\net9.0" />
48+
<file src="..\AuthPermissions\bin\Debug\net9.0\AuthPermissions.xml" target="lib\net9.0" />
49+
<file src="..\AuthPermissions\bin\Debug\net9.0\AuthPermissions.pdb" target="lib\net9.0" />
50+
<file src="..\AuthPermissions.AspNetCore\bin\Debug\net9.0\AuthPermissions.AspNetCore.dll" target="lib\net9.0" />
51+
<file src="..\AuthPermissions.AspNetCore\bin\Debug\net9.0\AuthPermissions.AspNetCore.xml" target="lib\net9.0" />
52+
<file src="..\AuthPermissions.AspNetCore\bin\Debug\net9.0\AuthPermissions.AspNetCore.pdb" target="lib\net9.0" />
53+
<file src="..\AuthPermissions.BaseCode\bin\Debug\net9.0\AuthPermissions.BaseCode.dll" target="lib\net9.0" />
54+
<file src="..\AuthPermissions.BaseCode\bin\Debug\net9.0\AuthPermissions.BaseCode.xml" target="lib\net9.0" />
55+
<file src="..\AuthPermissions.BaseCode\bin\Debug\net9.0\AuthPermissions.BaseCode.pdb" target="lib\net9.0" />
56+
<file src="..\AuthPermissions.PostgreSql\bin\Debug\net9.0\AuthPermissions.PostgreSql.dll" target="lib\net9.0" />
57+
<file src="..\AuthPermissions.PostgreSql\bin\Debug\net9.0\AuthPermissions.PostgreSql.xml" target="lib\net9.0" />
58+
<file src="..\AuthPermissions.PostgreSql\bin\Debug\net9.0\AuthPermissions.PostgreSql.pdb" target="lib\net9.0" />
59+
<file src="..\AuthPermissions.SqlServer\bin\Debug\net9.0\AuthPermissions.SqlServer.dll" target="lib\net9.0" />
60+
<file src="..\AuthPermissions.SqlServer\bin\Debug\net9.0\AuthPermissions.SqlServer.pdb" target="lib\net9.0" />
61+
<file src="..\AuthPermissions.SupportCode\bin\Debug\net9.0\AuthPermissions.SupportCode.dll" target="lib\net9.0" />
62+
<file src="..\AuthPermissions.SupportCode\bin\Debug\net9.0\AuthPermissions.SupportCode.xml" target="lib\net9.0" />
63+
<file src="..\AuthPermissions.SupportCode\bin\Debug\net9.0\AuthPermissions.SupportCode.pdb" target="lib\net9.0" />
10764
<file src="..\AuthPermissions.AspNetCore\images\AuthPermissionsAspNetCoreNuGetIcon.png" target="images\" />
10865
</files>
10966
</package>

‎AuthPermissions.AspNetCore/MultiProjPack.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
<!-- See documentation for all the possible values -->
55
<metadata>
66
<id>AuthPermissions.AspNetCore</id>
7-
<version>8.1.0</version>
7+
<version>9.0.0</version>
88
<authors>Jon P Smith</authors>
99
<product>AuthPermissions.AspNetCore</product>
1010
<copyright>Copyright (c) 2021 Jon P Smith</copyright>
1111
<description>Provides extra authorization and multi-tenant features to an ASP.NET Core application.</description>
1212
<releaseNotes>
13-
- Code to recreate the ShardingEntries if the FileStore Cache is deleted - see issue #115
14-
- Updates vulnerable NuGets Microsoft.Identity.Client and System.Text.Json
13+
- .NET 9 version
1514
</releaseNotes>
1615
<license type="expression">MIT</license>
1716
<projectUrl>https://github.com/JonPSmith/AuthPermissions.AspNetCore</projectUrl>

‎Test/StubClasses/StubDefaultLocalizerWithLogging.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ public void WipeLocalizationCaptureDb()
194194
if (context == null)
195195
return;
196196

197-
context.Database.EnsureClean();
197+
context.Database.EnsureDeleted();
198+
context.Database.EnsureCreated();
198199
}
199200

200201
public List<LocalizedLog> ListLocalizationCaptureDb()

‎Test/UnitTests/TestAuthPermissions/TestSetupPartsSetupRolesService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public async Task TestAddRolesToDatabaseIfEmpty()
6262
//var options = this.CreateUniqueClassOptions<AuthPermissionsDbContext>();
6363
using var context = new AuthPermissionsDbContext(options);
6464
context.Database.EnsureCreated();
65-
//context.Database.EnsureClean();
65+
//context.Database.EnsureDeleted(); context.Database.EnsureCreated()
6666

6767
var authOptions = new AuthPermissionsOptions();
6868
authOptions.InternalData.EnumPermissionsType = typeof(TestEnum);

‎Test/UnitTests/TestAuthPermissionsAdmin/TestRolesAdminServices.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ public async Task TestAddRoleToPermissionsAsyncDuplicate()
141141
var options = this.CreateUniqueClassOptions<AuthPermissionsDbContext>(builder =>
142142
{
143143
builder.UseExceptionProcessor();
144-
builder.ReplaceService<IModelCacheKeyFactory, DynamicModelCacheKeyFactory>();
145144
});
146145
using var context = new AuthPermissionsDbContext(options);
147-
context.Database.EnsureClean();
146+
context.Database.EnsureDeleted();
147+
context.Database.EnsureCreated();
148148

149149
await context.SetupRolesInDbAsync();
150150
context.ChangeTracker.Clear();

‎Test/UnitTests/TestAuthPermissionsDbContext.cs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ public class TestAuthPermissionsDbContext
1919
public void TestSqlServer()
2020
{
2121
//SETUP
22-
var options = this.CreateUniqueClassOptions<AuthPermissionsDbContext>(builder =>
23-
{
24-
builder.ReplaceService<IModelCacheKeyFactory, DynamicModelCacheKeyFactory>();
25-
});
22+
var options = this.CreateUniqueClassOptions<AuthPermissionsDbContext>();
2623
using var context = new AuthPermissionsDbContext(options);
2724
context.Database.EnsureDeleted();
2825
context.Database.EnsureCreated();
@@ -39,10 +36,7 @@ public void TestSqlServer()
3936
public void TestPostgres()
4037
{
4138
//SETUP
42-
var options = this.CreatePostgreSqlUniqueClassOptions<AuthPermissionsDbContext>(builder =>
43-
{
44-
builder.ReplaceService<IModelCacheKeyFactory, DynamicModelCacheKeyFactory>();
45-
});
39+
var options = this.CreatePostgreSqlUniqueClassOptions<AuthPermissionsDbContext>();
4640
using var context = new AuthPermissionsDbContext(options);
4741
context.Database.EnsureDeleted();
4842
context.Database.EnsureCreated();

‎Test/UnitTests/TestEfCoreCodePostgres/TestAuthUserUnique.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public void TestAddAuthUserNullEmail()
2121
var options = this.CreatePostgreSqlUniqueClassOptions<AuthPermissionsDbContext>(builder =>
2222
{
2323
builder.UseExceptionProcessor();
24-
builder.ReplaceService<IModelCacheKeyFactory, DynamicModelCacheKeyFactory>();
2524
});
2625

2726
using var context = new AuthPermissionsDbContext(options);
28-
context.Database.EnsureClean();
27+
context.Database.EnsureDeleted();
28+
context.Database.EnsureCreated();
2929

3030
//ATTEMPT
3131
context.Add(AuthPSetupHelpers.CreateTestAuthUserOk("123", null, "userName"));
@@ -42,10 +42,10 @@ public void TestAddAuthUserNullUserName()
4242
var options = this.CreatePostgreSqlUniqueClassOptions<AuthPermissionsDbContext>(builder =>
4343
{
4444
builder.UseExceptionProcessor();
45-
builder.ReplaceService<IModelCacheKeyFactory, DynamicModelCacheKeyFactory>();
4645
});
4746
using var context = new AuthPermissionsDbContext(options);
48-
context.Database.EnsureClean();
47+
context.Database.EnsureDeleted();
48+
context.Database.EnsureCreated();
4949

5050
context.Add(AuthPSetupHelpers.CreateTestAuthUserOk("123", "[email protected]", "userName"));
5151
var status = context.SaveChangesWithChecks("en".SetupAuthPLoggingLocalizer().DefaultLocalizer);
@@ -61,10 +61,10 @@ public void TestAddAuthUserNullEmailAndUserName()
6161
var options = this.CreatePostgreSqlUniqueClassOptions<AuthPermissionsDbContext>(builder =>
6262
{
6363
builder.UseExceptionProcessor();
64-
builder.ReplaceService<IModelCacheKeyFactory, DynamicModelCacheKeyFactory>();
6564
});
6665
using var context = new AuthPermissionsDbContext(options);
67-
context.Database.EnsureClean();
66+
context.Database.EnsureDeleted();
67+
context.Database.EnsureCreated();
6868

6969
//ATTEMPT
7070
var ex = Assert.Throws<AuthPermissionsBadDataException>(() =>

‎Test/UnitTests/TestEfCoreCodePostgres/TestConcurrency.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public void TestUpdateRolePostgreSql()
3535
var options = this.CreatePostgreSqlUniqueClassOptions<AuthPermissionsDbContext>(builder =>
3636
builder.UseExceptionProcessor());
3737
using var context = new AuthPermissionsDbContext(options);
38-
context.Database.EnsureClean();
38+
context.Database.EnsureDeleted();
39+
context.Database.EnsureCreated();
3940

4041
var initial = new RoleToPermissions("Test", null, "123");
4142
context.Add(initial);

0 commit comments

Comments
 (0)