From d15dafa459b73243169f081bf4a313fbde73e9a0 Mon Sep 17 00:00:00 2001 From: olefebvre Date: Mon, 21 Nov 2016 15:10:43 +0100 Subject: [PATCH 1/3] test redis --- NuGet.Config | 2 +- chatle.sln | 15 +++++++++++++ integration/integration.nuget.props | 9 ++++++++ .../ChatLe.Authentication.xproj | 19 ++++++++++++++++ src/chatle/Startup.cs | 21 ++++++++++-------- src/chatle/config.json | 8 +++---- src/chatle/project.json | 3 ++- test/chatle.test/project.json | Bin 1434 -> 1426 bytes 8 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 integration/integration.nuget.props create mode 100644 src/ChatLe.Authentication/ChatLe.Authentication.xproj diff --git a/NuGet.Config b/NuGet.Config index 80f1ee2a..f9016fc9 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -4,7 +4,7 @@ - + diff --git a/chatle.sln b/chatle.sln index da4cf624..8c48b74f 100644 --- a/chatle.sln +++ b/chatle.sln @@ -42,6 +42,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ChatLe.Repository.Identity. EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ChatLe.Repository.Identity.Sqlite", "src\ChatLe.Repository.Identity.Sqlite\ChatLe.Repository.Identity.Sqlite.xproj", "{22573857-8F40-4DE3-8277-F6E05151B61F}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ChatLe.Authentication", "src\ChatLe.Authentication\ChatLe.Authentication.xproj", "{84E5605E-1227-461B-BC4A-BF1D28BB6797}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -148,6 +150,18 @@ Global {22573857-8F40-4DE3-8277-F6E05151B61F}.Release|Any CPU.Build.0 = Release|Any CPU {22573857-8F40-4DE3-8277-F6E05151B61F}.Verbose|Any CPU.ActiveCfg = Debug|Any CPU {22573857-8F40-4DE3-8277-F6E05151B61F}.Verbose|Any CPU.Build.0 = Debug|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Debug|Any CPU.Build.0 = Debug|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.k10|Any CPU.ActiveCfg = Debug|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.k10|Any CPU.Build.0 = Debug|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Log Output|Any CPU.ActiveCfg = Debug|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Log Output|Any CPU.Build.0 = Debug|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.net45|Any CPU.ActiveCfg = Debug|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.net45|Any CPU.Build.0 = Debug|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Release|Any CPU.ActiveCfg = Release|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Release|Any CPU.Build.0 = Release|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Verbose|Any CPU.ActiveCfg = Debug|Any CPU + {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Verbose|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -161,5 +175,6 @@ Global {679986E1-A5F9-417B-A5A7-963644A1D5E6} = {F31E7481-B6F1-4A59-89B5-92CE0C3754FD} {6E97ADF2-44D2-4905-85D5-936AC92EBBA1} = {9BDC16D7-7C2E-4387-82D9-0043C630D5FB} {22573857-8F40-4DE3-8277-F6E05151B61F} = {9BDC16D7-7C2E-4387-82D9-0043C630D5FB} + {84E5605E-1227-461B-BC4A-BF1D28BB6797} = {9BDC16D7-7C2E-4387-82D9-0043C630D5FB} EndGlobalSection EndGlobal diff --git a/integration/integration.nuget.props b/integration/integration.nuget.props new file mode 100644 index 00000000..6bbc060e --- /dev/null +++ b/integration/integration.nuget.props @@ -0,0 +1,9 @@ + + + + $(UserProfile)\.nuget\packages\ + + + + + \ No newline at end of file diff --git a/src/ChatLe.Authentication/ChatLe.Authentication.xproj b/src/ChatLe.Authentication/ChatLe.Authentication.xproj new file mode 100644 index 00000000..a2fe07bf --- /dev/null +++ b/src/ChatLe.Authentication/ChatLe.Authentication.xproj @@ -0,0 +1,19 @@ + + + + 14.0.25420 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 84e5605e-1227-461b-bc4a-bf1d28bb6797 + ChatLe.Authentication + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/src/chatle/Startup.cs b/src/chatle/Startup.cs index f737f91f..52d8579a 100644 --- a/src/chatle/Startup.cs +++ b/src/chatle/Startup.cs @@ -3,6 +3,7 @@ using System.Net.Http.Headers; using System.Security.Claims; using ChatLe.Models; +using Chatle.EntityFrameworkCore.Redis; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; @@ -97,15 +98,17 @@ private void ConfigureEntity(IServiceCollection services) case DBEngine.MySql: options.UseMySql(Configuration["Data:DefaultConnection:ConnectionString"], o => o.MigrationsAssembly("ChatLe.Repository.Identity.MySql")); break; - //case DBEngine.Redis: - // int port; - // int database; - // if (!int.TryParse(Configuration.Get("Data:Redis:Port"), out port)) - // port = 6379; - // int.TryParse(Configuration.Get("Data:Redis:Database"), out database); - - // //options.UseRedis(Configuration.Get("Data:Redis:Hostname"), port, database); - // break; + case DBEngine.Redis: + int port; + int database; + string hostName = Configuration["Data:Redis:HostName"] ?? "127.0.0.1"; + + if (!int.TryParse(Configuration["Data:Redis:Port"], out port)) + port = 6379; + int.TryParse(Configuration["Data:Redis:Database"], out database); + + options.UseRedisDatabase(hostName: hostName, port: port, database: database); + break; } }); diff --git a/src/chatle/config.json b/src/chatle/config.json index d98f8225..5f9bb449 100644 --- a/src/chatle/config.json +++ b/src/chatle/config.json @@ -2,15 +2,15 @@ "ChatConfig": { "UserPerPage": 25 }, - "DatabaseEngine": "SQLite", + "DatabaseEngine": "Redis", "CreateDatabase": "false", "Data": { "DefaultConnection": { "ConnectionString": "Filename=./ChatLeDbContext.db" }, - "Redis": { - "Hostname": "127.0.0.1" - } + "Redis": { + "HostName": "127.0.0.1" + } }, "Identity": { "Password": { diff --git a/src/chatle/project.json b/src/chatle/project.json index 85c3c4c9..7ad707a7 100644 --- a/src/chatle/project.json +++ b/src/chatle/project.json @@ -35,6 +35,7 @@ "ChatLe.Repository.Identity.Sqlite": "1.0.0-*", "ChatLe.Repository.Identity.SqlServer": "1.0.0-*", "ChatLe.Repository.Identity.MySql": "1.0.0-*", + "Chatle.EntityFrameworkCore.Redis": "0.1.0-*", "Microsoft.EntityFrameworkCore.InMemory": "1.0.1", "Microsoft.EntityFrameworkCore.SqlServer": "1.0.1", "Microsoft.EntityFrameworkCore.Sqlite": "1.0.1", @@ -65,7 +66,7 @@ "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0", "Microsoft.AspNetCore.SignalR.Server": "0.2.0-*", "Microsoft.AspNetCore.WebSockets": "0.2.0-*", - "Microsoft.AspNetCore.Cors": "1.0.0" + "Microsoft.AspNetCore.Cors": "1.0.0" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/chatle.test/project.json b/test/chatle.test/project.json index 063be87bc3dfc071f2bd09fde328726df4d49466..6c32539e3c3c0a99ae447f955ad5cda87e91e43e 100644 GIT binary patch delta 16 XcmbQmJ&AjR3e#jGX0gpqOcBfgDO3bW delta 20 ccmbQlJ&SvT3e)5>EL@Xym_;^QF-0%~07ByhrT_o{ From 93e0cf7bdc2ed10ac6a66267017590570dc39082 Mon Sep 17 00:00:00 2001 From: olefebvre Date: Mon, 21 Nov 2016 15:11:48 +0100 Subject: [PATCH 2/3] Revert "test redis" This reverts commit d15dafa459b73243169f081bf4a313fbde73e9a0. --- NuGet.Config | 2 +- chatle.sln | 15 ------------- integration/integration.nuget.props | 9 -------- .../ChatLe.Authentication.xproj | 19 ---------------- src/chatle/Startup.cs | 21 ++++++++---------- src/chatle/config.json | 8 +++---- src/chatle/project.json | 3 +-- test/chatle.test/project.json | Bin 1426 -> 1434 bytes 8 files changed, 15 insertions(+), 62 deletions(-) delete mode 100644 integration/integration.nuget.props delete mode 100644 src/ChatLe.Authentication/ChatLe.Authentication.xproj diff --git a/NuGet.Config b/NuGet.Config index f9016fc9..80f1ee2a 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -4,7 +4,7 @@ - + diff --git a/chatle.sln b/chatle.sln index 8c48b74f..da4cf624 100644 --- a/chatle.sln +++ b/chatle.sln @@ -42,8 +42,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ChatLe.Repository.Identity. EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ChatLe.Repository.Identity.Sqlite", "src\ChatLe.Repository.Identity.Sqlite\ChatLe.Repository.Identity.Sqlite.xproj", "{22573857-8F40-4DE3-8277-F6E05151B61F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ChatLe.Authentication", "src\ChatLe.Authentication\ChatLe.Authentication.xproj", "{84E5605E-1227-461B-BC4A-BF1D28BB6797}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -150,18 +148,6 @@ Global {22573857-8F40-4DE3-8277-F6E05151B61F}.Release|Any CPU.Build.0 = Release|Any CPU {22573857-8F40-4DE3-8277-F6E05151B61F}.Verbose|Any CPU.ActiveCfg = Debug|Any CPU {22573857-8F40-4DE3-8277-F6E05151B61F}.Verbose|Any CPU.Build.0 = Debug|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.k10|Any CPU.ActiveCfg = Debug|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.k10|Any CPU.Build.0 = Debug|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Log Output|Any CPU.ActiveCfg = Debug|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Log Output|Any CPU.Build.0 = Debug|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.net45|Any CPU.ActiveCfg = Debug|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.net45|Any CPU.Build.0 = Debug|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Release|Any CPU.Build.0 = Release|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Verbose|Any CPU.ActiveCfg = Debug|Any CPU - {84E5605E-1227-461B-BC4A-BF1D28BB6797}.Verbose|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -175,6 +161,5 @@ Global {679986E1-A5F9-417B-A5A7-963644A1D5E6} = {F31E7481-B6F1-4A59-89B5-92CE0C3754FD} {6E97ADF2-44D2-4905-85D5-936AC92EBBA1} = {9BDC16D7-7C2E-4387-82D9-0043C630D5FB} {22573857-8F40-4DE3-8277-F6E05151B61F} = {9BDC16D7-7C2E-4387-82D9-0043C630D5FB} - {84E5605E-1227-461B-BC4A-BF1D28BB6797} = {9BDC16D7-7C2E-4387-82D9-0043C630D5FB} EndGlobalSection EndGlobal diff --git a/integration/integration.nuget.props b/integration/integration.nuget.props deleted file mode 100644 index 6bbc060e..00000000 --- a/integration/integration.nuget.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - $(UserProfile)\.nuget\packages\ - - - - - \ No newline at end of file diff --git a/src/ChatLe.Authentication/ChatLe.Authentication.xproj b/src/ChatLe.Authentication/ChatLe.Authentication.xproj deleted file mode 100644 index a2fe07bf..00000000 --- a/src/ChatLe.Authentication/ChatLe.Authentication.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 84e5605e-1227-461b-bc4a-bf1d28bb6797 - ChatLe.Authentication - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/chatle/Startup.cs b/src/chatle/Startup.cs index 52d8579a..f737f91f 100644 --- a/src/chatle/Startup.cs +++ b/src/chatle/Startup.cs @@ -3,7 +3,6 @@ using System.Net.Http.Headers; using System.Security.Claims; using ChatLe.Models; -using Chatle.EntityFrameworkCore.Redis; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; @@ -98,17 +97,15 @@ private void ConfigureEntity(IServiceCollection services) case DBEngine.MySql: options.UseMySql(Configuration["Data:DefaultConnection:ConnectionString"], o => o.MigrationsAssembly("ChatLe.Repository.Identity.MySql")); break; - case DBEngine.Redis: - int port; - int database; - string hostName = Configuration["Data:Redis:HostName"] ?? "127.0.0.1"; - - if (!int.TryParse(Configuration["Data:Redis:Port"], out port)) - port = 6379; - int.TryParse(Configuration["Data:Redis:Database"], out database); - - options.UseRedisDatabase(hostName: hostName, port: port, database: database); - break; + //case DBEngine.Redis: + // int port; + // int database; + // if (!int.TryParse(Configuration.Get("Data:Redis:Port"), out port)) + // port = 6379; + // int.TryParse(Configuration.Get("Data:Redis:Database"), out database); + + // //options.UseRedis(Configuration.Get("Data:Redis:Hostname"), port, database); + // break; } }); diff --git a/src/chatle/config.json b/src/chatle/config.json index 5f9bb449..d98f8225 100644 --- a/src/chatle/config.json +++ b/src/chatle/config.json @@ -2,15 +2,15 @@ "ChatConfig": { "UserPerPage": 25 }, - "DatabaseEngine": "Redis", + "DatabaseEngine": "SQLite", "CreateDatabase": "false", "Data": { "DefaultConnection": { "ConnectionString": "Filename=./ChatLeDbContext.db" }, - "Redis": { - "HostName": "127.0.0.1" - } + "Redis": { + "Hostname": "127.0.0.1" + } }, "Identity": { "Password": { diff --git a/src/chatle/project.json b/src/chatle/project.json index 7ad707a7..85c3c4c9 100644 --- a/src/chatle/project.json +++ b/src/chatle/project.json @@ -35,7 +35,6 @@ "ChatLe.Repository.Identity.Sqlite": "1.0.0-*", "ChatLe.Repository.Identity.SqlServer": "1.0.0-*", "ChatLe.Repository.Identity.MySql": "1.0.0-*", - "Chatle.EntityFrameworkCore.Redis": "0.1.0-*", "Microsoft.EntityFrameworkCore.InMemory": "1.0.1", "Microsoft.EntityFrameworkCore.SqlServer": "1.0.1", "Microsoft.EntityFrameworkCore.Sqlite": "1.0.1", @@ -66,7 +65,7 @@ "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0", "Microsoft.AspNetCore.SignalR.Server": "0.2.0-*", "Microsoft.AspNetCore.WebSockets": "0.2.0-*", - "Microsoft.AspNetCore.Cors": "1.0.0" + "Microsoft.AspNetCore.Cors": "1.0.0" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/chatle.test/project.json b/test/chatle.test/project.json index 6c32539e3c3c0a99ae447f955ad5cda87e91e43e..063be87bc3dfc071f2bd09fde328726df4d49466 100644 GIT binary patch delta 20 ccmbQlJ&SvT3e)5>EL@Xym_;^QF-0%~07ByhrT_o{ delta 16 XcmbQmJ&AjR3e#jGX0gpqOcBfgDO3bW From a0913daa3b0494655ad6031123e5d21e46e66e11 Mon Sep 17 00:00:00 2001 From: olefebvre Date: Fri, 25 Nov 2016 16:15:49 +0100 Subject: [PATCH 3/3] upgrade project dependencies to 1.1 --- chatle.sln | 30 ++++++++ .../ChatLe.Authentication.xproj} | 12 ++-- src/ChatLe.Authentication/project.json | 2 +- .../ChatLe.Repository.Identity.MySql.xproj | 19 +++++ .../project.json | 15 ++-- .../project.json | 13 ++-- .../project.json | 13 ++-- src/ChatLe.Repository.Identity/project.json | Bin 1776 -> 1776 bytes src/ChatLe.Repository/project.json | Bin 1838 -> 1838 bytes src/chatle/Startup.cs | 18 ++--- src/chatle/project.json | 68 +++++++++--------- test/ChatLe.Repository.Test/project.json | Bin 1996 -> 2072 bytes test/chatle.test/project.json | Bin 1434 -> 1410 bytes 13 files changed, 117 insertions(+), 73 deletions(-) rename src/{ChatLe.Repository.Identity.MySql/ChatLe.Repository.Identity.Sqlite.xproj => ChatLe.Authentication/ChatLe.Authentication.xproj} (69%) create mode 100644 src/ChatLe.Repository.Identity.MySql/ChatLe.Repository.Identity.MySql.xproj diff --git a/chatle.sln b/chatle.sln index da4cf624..612dd6e9 100644 --- a/chatle.sln +++ b/chatle.sln @@ -42,6 +42,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ChatLe.Repository.Identity. EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ChatLe.Repository.Identity.Sqlite", "src\ChatLe.Repository.Identity.Sqlite\ChatLe.Repository.Identity.Sqlite.xproj", "{22573857-8F40-4DE3-8277-F6E05151B61F}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ChatLe.Authentication", "src\ChatLe.Authentication\ChatLe.Authentication.xproj", "{8B940D10-64A7-463A-BE19-E3F3D4E739E4}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ChatLe.Repository.Identity.MySql", "src\ChatLe.Repository.Identity.MySql\ChatLe.Repository.Identity.MySql.xproj", "{A39713E8-C2AF-42DF-B13E-17CF381AA56B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -148,6 +152,30 @@ Global {22573857-8F40-4DE3-8277-F6E05151B61F}.Release|Any CPU.Build.0 = Release|Any CPU {22573857-8F40-4DE3-8277-F6E05151B61F}.Verbose|Any CPU.ActiveCfg = Debug|Any CPU {22573857-8F40-4DE3-8277-F6E05151B61F}.Verbose|Any CPU.Build.0 = Debug|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.k10|Any CPU.ActiveCfg = Debug|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.k10|Any CPU.Build.0 = Debug|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.Log Output|Any CPU.ActiveCfg = Debug|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.Log Output|Any CPU.Build.0 = Debug|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.net45|Any CPU.ActiveCfg = Debug|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.net45|Any CPU.Build.0 = Debug|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.Release|Any CPU.Build.0 = Release|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.Verbose|Any CPU.ActiveCfg = Debug|Any CPU + {8B940D10-64A7-463A-BE19-E3F3D4E739E4}.Verbose|Any CPU.Build.0 = Debug|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.k10|Any CPU.ActiveCfg = Debug|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.k10|Any CPU.Build.0 = Debug|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.Log Output|Any CPU.ActiveCfg = Debug|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.Log Output|Any CPU.Build.0 = Debug|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.net45|Any CPU.ActiveCfg = Debug|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.net45|Any CPU.Build.0 = Debug|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.Release|Any CPU.Build.0 = Release|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.Verbose|Any CPU.ActiveCfg = Debug|Any CPU + {A39713E8-C2AF-42DF-B13E-17CF381AA56B}.Verbose|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -161,5 +189,7 @@ Global {679986E1-A5F9-417B-A5A7-963644A1D5E6} = {F31E7481-B6F1-4A59-89B5-92CE0C3754FD} {6E97ADF2-44D2-4905-85D5-936AC92EBBA1} = {9BDC16D7-7C2E-4387-82D9-0043C630D5FB} {22573857-8F40-4DE3-8277-F6E05151B61F} = {9BDC16D7-7C2E-4387-82D9-0043C630D5FB} + {8B940D10-64A7-463A-BE19-E3F3D4E739E4} = {9BDC16D7-7C2E-4387-82D9-0043C630D5FB} + {A39713E8-C2AF-42DF-B13E-17CF381AA56B} = {9BDC16D7-7C2E-4387-82D9-0043C630D5FB} EndGlobalSection EndGlobal diff --git a/src/ChatLe.Repository.Identity.MySql/ChatLe.Repository.Identity.Sqlite.xproj b/src/ChatLe.Authentication/ChatLe.Authentication.xproj similarity index 69% rename from src/ChatLe.Repository.Identity.MySql/ChatLe.Repository.Identity.Sqlite.xproj rename to src/ChatLe.Authentication/ChatLe.Authentication.xproj index 7ef2e6db..abd5dfbf 100644 --- a/src/ChatLe.Repository.Identity.MySql/ChatLe.Repository.Identity.Sqlite.xproj +++ b/src/ChatLe.Authentication/ChatLe.Authentication.xproj @@ -1,21 +1,19 @@  - + - 14.0 + 14.0.25420 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - 22573857-8f40-4de3-8277-f6e05151b61f - ChatLe.Repository.Identity.SqlLite + 8b940d10-64a7-463a-be19-e3f3d4e739e4 + ChatLe.Authentication .\obj .\bin\ - v4.5.2 2.0 - + \ No newline at end of file diff --git a/src/ChatLe.Authentication/project.json b/src/ChatLe.Authentication/project.json index 821ec06f..0bb68b95 100644 --- a/src/ChatLe.Authentication/project.json +++ b/src/ChatLe.Authentication/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "1.1.0-*", "authors": [ "Olivier Lefebvre" ], "description": "ChatLe authentication middleware to override MicrosoftAccountMiddleware", "buildOptions": { diff --git a/src/ChatLe.Repository.Identity.MySql/ChatLe.Repository.Identity.MySql.xproj b/src/ChatLe.Repository.Identity.MySql/ChatLe.Repository.Identity.MySql.xproj new file mode 100644 index 00000000..765f97d4 --- /dev/null +++ b/src/ChatLe.Repository.Identity.MySql/ChatLe.Repository.Identity.MySql.xproj @@ -0,0 +1,19 @@ + + + + 14.0.25420 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + a39713e8-c2af-42df-b13e-17cf381aa56b + ChatLe.Repository.Identity.MySql + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/src/ChatLe.Repository.Identity.MySql/project.json b/src/ChatLe.Repository.Identity.MySql/project.json index d3912c9e..49c3d55f 100644 --- a/src/ChatLe.Repository.Identity.MySql/project.json +++ b/src/ChatLe.Repository.Identity.MySql/project.json @@ -1,25 +1,24 @@ { - "version": "1.0.0-*", + "version": "1.1.0-*", "dependencies": { - "ChatLe.Repository.Identity": "1.0.0-*", - "Pomelo.EntityFrameworkCore.MySql": "1.0.0", - "Microsoft.EntityFrameworkCore.Design": "1.0.0-preview2-final", - "NETStandard.Library": "1.6.0" + "ChatLe.Repository.Identity": "1.1.0-*", + "Pomelo.EntityFrameworkCore.MySql": "1.1.0-*", + "Microsoft.EntityFrameworkCore.Design": "1.1.0" }, "frameworks": { "net451": { }, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.1.0", "type": "platform" } } } }, "tools": { - "Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final" + "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final" } } diff --git a/src/ChatLe.Repository.Identity.SqlServer/project.json b/src/ChatLe.Repository.Identity.SqlServer/project.json index 8a644820..19574382 100644 --- a/src/ChatLe.Repository.Identity.SqlServer/project.json +++ b/src/ChatLe.Repository.Identity.SqlServer/project.json @@ -1,16 +1,15 @@ { - "version": "1.0.0-*", + "version": "1.1.0-*", "dependencies": { - "ChatLe.Repository.Identity": "1.0.0-*", - "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0", - "Microsoft.EntityFrameworkCore.Design": "1.0.0-preview2-final", - "NETStandard.Library": "1.6.0" + "ChatLe.Repository.Identity": "1.1.0-*", + "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", + "Microsoft.EntityFrameworkCore.Design": "1.1.0" }, "frameworks": { "net451": {}, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", @@ -20,6 +19,6 @@ } }, "tools": { - "Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final" + "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final" } } diff --git a/src/ChatLe.Repository.Identity.Sqlite/project.json b/src/ChatLe.Repository.Identity.Sqlite/project.json index 7c185d4c..7ad4b2c5 100644 --- a/src/ChatLe.Repository.Identity.Sqlite/project.json +++ b/src/ChatLe.Repository.Identity.Sqlite/project.json @@ -1,16 +1,15 @@ { - "version": "1.0.0-*", + "version": "1.1.0-*", "dependencies": { - "ChatLe.Repository.Identity": "1.0.0-*", - "Microsoft.EntityFrameworkCore.Sqlite": "1.0.0", - "Microsoft.EntityFrameworkCore.Design": "1.0.0-preview2-final", - "NETStandard.Library": "1.6.0" + "ChatLe.Repository.Identity": "1.1.0-*", + "Microsoft.EntityFrameworkCore.Sqlite": "1.1.0", + "Microsoft.EntityFrameworkCore.Design": "1.1.0" }, "frameworks": { "net451": { }, - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { "Microsoft.NETCore.App": { "version": "1.1.0-*", @@ -20,6 +19,6 @@ } }, "tools": { - "Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final" + "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final" } } diff --git a/src/ChatLe.Repository.Identity/project.json b/src/ChatLe.Repository.Identity/project.json index 9154359b7a13f4403b9f5eea0faf1c22bec18d2f..0c73e987068550fead001bd94ad397e8a7e7dbc3 100644 GIT binary patch delta 40 ucmeys`+;|Y#^eY#v5j^tER2SeompIgJf6){SU4Dg-1jWfn|H8UFaiJqeGAV3 delta 36 rcmeys`+;|Y2BX17O-U9;gUQY;u8anoJ6VJoft>d&(wld%S}+0t#u5rE diff --git a/src/ChatLe.Repository/project.json b/src/ChatLe.Repository/project.json index e59910e485e9f62391b4d92b834a92b03b9d1e06..a57d9cdbc1f839079454096333b0d587ad358506 100644 GIT binary patch delta 58 zcmV-A0LA~V4z3Q6D3g{37O_5n0}U|%E&wn9A^H|svF|#!Ur2zpk QlYs&mlb!+wv-$-z0kI_x(EtDd delta 56 zcmV-80LTBX4z3Q6C;>3BDU|~aFaRz9F#sX}EC3Av3X>rQACu|>N&zslH3X#r0Wgz+ O0vVH@0tU1C1vCM4$ql;z diff --git a/src/chatle/Startup.cs b/src/chatle/Startup.cs index f737f91f..619de56b 100644 --- a/src/chatle/Startup.cs +++ b/src/chatle/Startup.cs @@ -97,15 +97,15 @@ private void ConfigureEntity(IServiceCollection services) case DBEngine.MySql: options.UseMySql(Configuration["Data:DefaultConnection:ConnectionString"], o => o.MigrationsAssembly("ChatLe.Repository.Identity.MySql")); break; - //case DBEngine.Redis: - // int port; - // int database; - // if (!int.TryParse(Configuration.Get("Data:Redis:Port"), out port)) - // port = 6379; - // int.TryParse(Configuration.Get("Data:Redis:Database"), out database); - - // //options.UseRedis(Configuration.Get("Data:Redis:Hostname"), port, database); - // break; + case DBEngine.Redis: + int port; + int database; + if (!int.TryParse(Configuration["Data:Redis:Port"], out port)) + port = 6379; + int.TryParse(Configuration["Data:Redis:Database"], out database); + + options.UseRedisDatabase(Configuration["Data:Redis:Hostname"], port, database); + break; } }); diff --git a/src/chatle/project.json b/src/chatle/project.json index 85c3c4c9..df322426 100644 --- a/src/chatle/project.json +++ b/src/chatle/project.json @@ -1,7 +1,7 @@ { "webroot": "wwwroot", "userSecretsId": "aspnet5-chatle-75f79cf1-fb8a-43d9-8dd4-7d8dab2fef27", - "version": "1.0.0-*", + "version": "1.1.0-*", "authors": [ "Olivier Lefebvre" ], @@ -30,45 +30,45 @@ } }, "dependencies": { - "ChatLe.Authentication": "1.0.0-*", - "ChatLe.Repository.Identity": "1.0.0-*", - "ChatLe.Repository.Identity.Sqlite": "1.0.0-*", - "ChatLe.Repository.Identity.SqlServer": "1.0.0-*", - "ChatLe.Repository.Identity.MySql": "1.0.0-*", - "Microsoft.EntityFrameworkCore.InMemory": "1.0.1", - "Microsoft.EntityFrameworkCore.SqlServer": "1.0.1", - "Microsoft.EntityFrameworkCore.Sqlite": "1.0.1", - "Pomelo.EntityFrameworkCore.MySql": "1.0.0", - "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0", - "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0", - "Microsoft.AspNetCore.Authentication.Google": "1.0.0", - "Microsoft.AspNetCore.Authentication.Twitter": "1.0.0", - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1", + "ChatLe.Authentication": "1.1.0-*", + "ChatLe.Repository.Identity": "1.1.0-*", + "ChatLe.Repository.Identity.Sqlite": "1.1.0-*", + "ChatLe.Repository.Identity.SqlServer": "1.1.0-*", + "ChatLe.Repository.Identity.MySql": "1.1.0-*", + "Microsoft.EntityFrameworkCore.InMemory": "1.1.0", + "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", + "Microsoft.EntityFrameworkCore.Sqlite": "1.1.0", + "Chatle.EntityFrameworkCore.Redis": "0.1.0-*", + "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0", + "Microsoft.AspNetCore.Authentication.Facebook": "1.1.0", + "Microsoft.AspNetCore.Authentication.Google": "1.1.0", + "Microsoft.AspNetCore.Authentication.Twitter": "1.1.0", + "Microsoft.AspNetCore.Diagnostics": "1.1.0", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.0", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", + "Microsoft.AspNetCore.Mvc": "1.1.0", "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", + "version": "1.1.0-preview4-final", "type": "build" }, - "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.0.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", + "Microsoft.AspNetCore.StaticFiles": "1.1.0", + "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", + "Microsoft.Extensions.Configuration.Json": "1.1.0", + "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", + "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", "Microsoft.Extensions.Logging": "1.1.0-*", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.TraceSource": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", + "Microsoft.Extensions.Logging.Console": "1.1.0", + "Microsoft.Extensions.Logging.TraceSource": "1.1.0", + "Microsoft.Extensions.Logging.Debug": "1.1.0", "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0", "Microsoft.AspNetCore.SignalR.Server": "0.2.0-*", "Microsoft.AspNetCore.WebSockets": "0.2.0-*", - "Microsoft.AspNetCore.Cors": "1.0.0" + "Microsoft.AspNetCore.Cors": "1.1.0" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "Microsoft.NETCore.App": { "version": "1.1.0-*" }, @@ -79,9 +79,9 @@ } }, "tools": { - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.Extensions.SecretManager.Tools": "1.0.0-preview2-final" + "Microsoft.AspNetCore.Razor.Tools": "1.1.0-preview4-final", + "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final", + "Microsoft.Extensions.SecretManager.Tools": "1.1.0-preview4-final" }, "scripts": { "prepublish": [ "npm install", "npm install typescript -g", "tsc", "npm run gulp publish" ] diff --git a/test/ChatLe.Repository.Test/project.json b/test/ChatLe.Repository.Test/project.json index 4c4624992e5efc944142b874232bd36102cb6681..93c36a79af77800dba163b90a0bccc8f623b905c 100644 GIT binary patch delta 391 zcmX@ZKSO~1|G#PmUIwno-K?6tS`11IIv^f{0)xV2URM2yt5ha-@JyCrlA5^62}DhH zVHKM!!RW$hIJuum6w1?>yoON%NyLvyWwHR18d%nk$pJ-1ZSo@~B{Y!;W-%m@Y0LqW z=P+?he#PuGSr14XuxNqlI2JX2ptBfik(}7iqCB~Vm4jD_A&()Ip@hMN!IZ&paz3jl zKawi2XYR8|1MSFXm7L7Sx@7VcCV|N|tQ?a+u)0h(VHKKe$L7Fj4EB)?D;JQbHhB-5 z61Opf9)kfeNI=0O&nC(ZvKr`Qv0=pKZ&x2i0AFcwZG8Pt;U|qFv9+KN8 IPiHp;0OluBMgRZ+ delta 467 zcmbOsaE71r|G#PmUIs1(&WYTzlixA3@#->YF(@(UKm~2pnK^-S*@hrFeiS*7u=t&ntz zPhP_u05*}C#TiWdvS@?pdKPtVPKH{Tt0!+|Q3i|OXOZRyx&R>qbd4aZw6FothgJ*< z3{bBFRd7zU)t~Ig#x=Q)HAh*Op@5-?A(f$wArnZJGZ-@HG8h1%ArOLSAaC+VW?`Uu zj!A4RliAoD*g>`c;p9*@XHi22J)k0Z7(!*XvU$rJKxM!I4i<;I8LV5IT^4RqI1;;= Y-B1x?Lo6g-fU0YuEVv1iAG4bR0J2p}YybcN diff --git a/test/chatle.test/project.json b/test/chatle.test/project.json index 063be87bc3dfc071f2bd09fde328726df4d49466..7de98daa83212143b73189ac74be403d031288d6 100644 GIT binary patch delta 178 zcmbQm-NeoQ|6er&F9X-)T4qgNEe0h99T1N}fk9!S@rkyR8968OGpjRm0u?bb zN{eDq1eCF55})kDXdnoYg=+^H%;*f(dz(=kO!G1sPPSu~n;gRA2Q+ypQy`XED8Oj(kfn+&@A<#hvKxhbrAR5ShfY UWEP&x!6Gtw8p{@-slKeH08Hm89smFU