Skip to content

Commit ac45310

Browse files
IInvocationIInvocation
committed
Merge branch 'master' of https://github.com/IInvocation/AppFx 
2 parents dd15f2b + f657f89 commit ac45310

File tree

221 files changed

+970
-1410
lines changed

Some content is hidden

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

221 files changed

+970
-1410
lines changed

‎src/AspNetCore/FluiTec.AppFx.AspNetCore.Examples.AuthExample/FluiTec.AppFx.AspNetCore.Examples.AuthExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="FluiTec.AppFx.AspNetCore" Version="1.0.39" />
10+
<PackageReference Include="FluiTec.AppFx.AspNetCore" Version="1.0.47" />
1111
<PackageReference Include="Localization.AspNetCore.TagHelpers" Version="0.3.0" />
1212
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
1313
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" />

‎src/AspNetCore/FluiTec.AppFx.AspNetCore.Examples.AuthExample/Startup.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System;
2+
using FluiTec.AppFx.AspNetCore.Configuration;
3+
using FluiTec.AppFx.Options;
24
using Microsoft.ApplicationInsights.Extensibility;
35
using Microsoft.AspNetCore.Builder;
46
using Microsoft.AspNetCore.Hosting;
@@ -49,9 +51,12 @@ public Startup(IHostingEnvironment environment)
4951
}
5052

5153
/// <summary>Configure services.</summary>
52-
/// <param name="services"> The services. </param>
54+
/// <param name="services"> The services. </param>
5355
public void ConfigureServices(IServiceCollection services)
5456
{
57+
var service = services.BuildServiceProvider();
58+
var loggerFactory = service.GetRequiredService<ILoggerFactory>();
59+
5560
services.ConfigureApplication(Configuration);
5661
services.ConfigureOperator(Configuration);
5762
services.ConfigureErrorHandling(Configuration);

‎src/AspNetCore/FluiTec.AppFx.AspNetCore.Examples.AuthExample/appsettings.json

+1-9
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
]
8989
},
9090
// dataprotection
91-
"DataProtectionOptions" : {
91+
"DataProtectionOptions": {
9292
"Provider": "MSSQL"
9393
},
9494
// identityserver-claims
@@ -146,14 +146,6 @@
146146
"ComplementaryRepresentatives": "", // secret
147147
"ComplementaryCommercialRegister": "" // secret
148148
},
149-
// application
150-
"ApplicationOptions": {
151-
"ApplicationRootDisplay": "", // secret
152-
"ApplicationRoot": "", // secret
153-
"ApplicationLoginPath": "", // secret
154-
"ApplicationLoginDisplay": "", // secret
155-
"ApplicationLogin": "" // secret
156-
},
157149
// activity-authorization
158150
"ActivityAuthorization": {
159151
"Resources": [

‎src/AspNetCore/FluiTec.AppFx.AspNetCore/DataProtectionExtension.cs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using FluiTec.AppFx.DataProtection;
2+
using FluiTec.AppFx.DataProtection.Dynamic;
23
using Microsoft.AspNetCore.DataProtection;
34
using Microsoft.AspNetCore.DataProtection.Repositories;
45
using Microsoft.Extensions.Configuration;

‎src/AspNetCore/FluiTec.AppFx.AspNetCore/FluiTec.AppFx.AspNetCore.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010
<PostBuildEvent></PostBuildEvent>
1111
<PreBuildEvent></PreBuildEvent>
1212
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
13-
<Version>1.0.45</Version>
13+
<Version>1.0.47</Version>
1414
</PropertyGroup>
1515

1616
<ItemGroup>
1717
<PackageReference Include="FluiTec.AppFx.Authentication.Amazon" Version="1.0.7" />
18-
<PackageReference Include="FluiTec.AppFx.Authorization.Activity" Version="1.0.6" />
19-
<PackageReference Include="FluiTec.AppFx.Authorization.Activity.Dynamic" Version="1.0.6" />
20-
<PackageReference Include="FluiTec.AppFx.DataProtection.Dynamic" Version="1.0.1" />
21-
<PackageReference Include="FluiTec.AppFx.Identity.Dynamic" Version="1.0.12" />
22-
<PackageReference Include="FluiTec.AppFx.IdentityServer.Dynamic" Version="1.0.17" />
23-
<PackageReference Include="FluiTec.AppFx.Localization" Version="1.0.4" />
24-
<PackageReference Include="FluiTec.AppFx.Localization.Dynamic" Version="1.0.5" />
25-
<PackageReference Include="FluiTec.AppFx.Mail" Version="1.0.15" />
26-
<PackageReference Include="FluiTec.AppFx.Options" Version="1.0.7" />
18+
<PackageReference Include="FluiTec.AppFx.Authorization.Activity" Version="1.0.9" />
19+
<PackageReference Include="FluiTec.AppFx.Authorization.Activity.Dynamic" Version="1.0.9" />
20+
<PackageReference Include="FluiTec.AppFx.DataProtection.Dynamic" Version="1.0.3" />
21+
<PackageReference Include="FluiTec.AppFx.Identity.Dynamic" Version="1.0.14" />
22+
<PackageReference Include="FluiTec.AppFx.IdentityServer.Dynamic" Version="1.0.20" />
23+
<PackageReference Include="FluiTec.AppFx.Localization" Version="1.0.6" />
24+
<PackageReference Include="FluiTec.AppFx.Localization.Dynamic" Version="1.0.7" />
25+
<PackageReference Include="FluiTec.AppFx.Mail" Version="1.0.16" />
26+
<PackageReference Include="FluiTec.AppFx.Options" Version="1.0.9" />
2727
<PackageReference Include="IdentityServer4" Version="2.1.3" />
2828
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.1.0" />
2929
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="2.0.3" />

‎src/AspNetCore/FluiTec.AspNetCore.Examples.AuthExampleClient/FluiTec.AspNetCore.Examples.AuthExampleClient.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="FluiTec.AppFx.OpenId" Version="1.0.1" />
8+
<PackageReference Include="FluiTec.AppFx.OpenId" Version="1.0.2" />
99
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
1010
</ItemGroup>
1111

‎src/Authentication/FluiTec.AppFx.OpenId/FluiTec.AppFx.OpenId.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="FluiTec.AppFx.Options" Version="1.0.7" />
17+
<PackageReference Include="FluiTec.AppFx.Options" Version="1.0.9" />
1818
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.0.3" />
1919
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.3" />
2020
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.0.3" />

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Migrations/FluiTec.AppFx.Authorization.Activity.Dapper.Migrations.csproj

-59
This file was deleted.

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Migrations/Migrate.sample.cmd

-11
This file was deleted.

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Migrations/Migration/FluentMigrator.dll

-106 KB
Binary file not shown.

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Migrations/Migration/FluiTec.AppFx.Authorization.Activity.Dapper.Migrations.dll

-11.5 KB
Binary file not shown.

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Migrations/Properties/AssemblyInfo.cs

-35
This file was deleted.

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Migrations/packages.config

-5
This file was deleted.

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Mssql.Test/FluiTec.AppFx.Authorization.Activity.Dapper.Mssql.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="FluiTec.AppFx.Identity.Dapper.Mssql" Version="1.0.15" />
10+
<PackageReference Include="FluiTec.AppFx.Identity.Dapper.Mssql" Version="1.0.17" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
1212
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
1313
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Mssql.Test/Helper.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static class Helper
1313
/// <returns> The data service. </returns>
1414
public static IAuthorizationDataService GetDataService()
1515
{
16-
var options = new DapperServiceOptions
16+
var options = new MssqlDapperServiceOptions
1717
{
1818
ConnectionFactory = new MssqlConnectionFactory(),
1919
ConnectionString = ConnectionStringHelper.GetConnectionStringFor("MSSQL")
@@ -26,7 +26,7 @@ public static IAuthorizationDataService GetDataService()
2626
/// <returns>The identity data service.</returns>
2727
public static IIdentityDataService GetIdentityDataService()
2828
{
29-
var options = new DapperServiceOptions
29+
var options = new MssqlDapperServiceOptions
3030
{
3131
ConnectionFactory = new MssqlConnectionFactory(),
3232
ConnectionString = ConnectionStringHelper.GetConnectionStringFor("MSSQL")

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Mssql/FluiTec.AppFx.Authorization.Activity.Dapper.Mssql.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
@@ -10,11 +10,11 @@
1010
<PostBuildEvent></PostBuildEvent>
1111
<PreBuildEvent></PreBuildEvent>
1212
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
13-
<Version>1.0.6</Version>
13+
<Version>1.0.9</Version>
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="FluiTec.AppFx.Data.Dapper.Mssql" Version="1.0.11" />
17+
<PackageReference Include="FluiTec.AppFx.Data.Dapper.Mssql" Version="1.0.13" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Mssql/MssqlDapperAuthorizationDataService.cs

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System;
2+
using FluentMigrator.Runner.VersionTableInfo;
3+
using FluiTec.AppFx.Authorization.Activity.Dapper.Migration;
24
using FluiTec.AppFx.Authorization.Activity.Dapper.Repositories;
35
using FluiTec.AppFx.Authorization.Activity.Repositories;
46
using FluiTec.AppFx.Data;
@@ -28,6 +30,10 @@ public MssqlDapperAuthorizationDataService(IDapperServiceOptions options) : base
2830
/// <value>The name.</value>
2931
public override string Name => "MssqlDapperAuthorizationDataService";
3032

33+
/// <summary>Gets or sets information describing the meta.</summary>
34+
/// <value>Information describing the meta.</value>
35+
public override IVersionTableMetaData MetaData => new VersionTable();
36+
3137
#endregion
3238

3339
#region Methods

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Mysql.Test/FluiTec.AppFx.Authorization.Activity.Dapper.Mysql.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="FluiTec.AppFx.Identity.Dapper.Mysql" Version="1.0.16" />
10+
<PackageReference Include="FluiTec.AppFx.Identity.Dapper.Mysql" Version="1.0.18" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
1212
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
1313
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Mysql.Test/Helper.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static class Helper
1313
/// <returns> The data service. </returns>
1414
public static IAuthorizationDataService GetDataService()
1515
{
16-
var options = new DapperServiceOptions
16+
var options = new MysqlDapperServiceOptions
1717
{
1818
ConnectionFactory = new MysqlConnectionFactory(),
1919
ConnectionString = ConnectionStringHelper.GetConnectionStringFor("MYSQL")
@@ -26,7 +26,7 @@ public static IAuthorizationDataService GetDataService()
2626
/// <returns> The data service. </returns>
2727
public static IIdentityDataService GetIdentityDataService()
2828
{
29-
var options = new DapperServiceOptions
29+
var options = new MysqlDapperServiceOptions
3030
{
3131
ConnectionFactory = new MysqlConnectionFactory(),
3232
ConnectionString = ConnectionStringHelper.GetConnectionStringFor("MYSQL")

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Mysql/FluiTec.AppFx.Authorization.Activity.Dapper.Mysql.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
@@ -10,11 +10,11 @@
1010
<PostBuildEvent></PostBuildEvent>
1111
<PreBuildEvent></PreBuildEvent>
1212
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
13-
<Version>1.0.6</Version>
13+
<Version>1.0.9</Version>
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="FluiTec.AppFx.Data.Dapper.Mysql" Version="1.0.14" />
17+
<PackageReference Include="FluiTec.AppFx.Data.Dapper.Mysql" Version="1.0.16" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Mysql/MysqlDapperAuthorizationDataService.cs

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System;
2+
using FluentMigrator.Runner.VersionTableInfo;
3+
using FluiTec.AppFx.Authorization.Activity.Dapper.Migration;
24
using FluiTec.AppFx.Authorization.Activity.Dapper.Repositories;
35
using FluiTec.AppFx.Authorization.Activity.Repositories;
46
using FluiTec.AppFx.Data;
@@ -28,6 +30,10 @@ public MysqlDapperAuthorizationDataService(IDapperServiceOptions options) : base
2830
/// <value>The name.</value>
2931
public override string Name => "MysqlDapperAuthorizationDataService";
3032

33+
/// <summary>Gets or sets information describing the meta.</summary>
34+
/// <value>Information describing the meta.</value>
35+
public override IVersionTableMetaData MetaData => new VersionTable();
36+
3137
#endregion
3238

3339
#region Methods

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Pgsql.Test/FluiTec.AppFx.Authorization.Activity.Dapper.Pgsql.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="FluiTec.AppFx.Identity.Dapper.Pgsql" Version="1.0.14" />
10+
<PackageReference Include="FluiTec.AppFx.Identity.Dapper.Pgsql" Version="1.0.16" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
1212
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
1313
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />

‎src/Authorization.Activity/FluiTec.AppFx.Authorization.Activity.Dapper.Pgsql.Test/Helper.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static class Helper
1313
/// <returns> The data service. </returns>
1414
public static IAuthorizationDataService GetDataService()
1515
{
16-
var options = new DapperServiceOptions
16+
var options = new PgsqlDapperServiceOptions
1717
{
1818
ConnectionFactory = new PgsqlConnectionFactory(),
1919
ConnectionString = ConnectionStringHelper.GetConnectionStringFor("PGSQL")
@@ -24,7 +24,7 @@ public static IAuthorizationDataService GetDataService()
2424

2525
public static IIdentityDataService GetIdentityDataService()
2626
{
27-
var options = new DapperServiceOptions
27+
var options = new PgsqlDapperServiceOptions
2828
{
2929
ConnectionFactory = new PgsqlConnectionFactory(),
3030
ConnectionString = ConnectionStringHelper.GetConnectionStringFor("PGSQL")

0 commit comments

Comments
 (0)