Skip to content
This repository has been archived by the owner on Oct 9, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop' of https://github.com/aguacongas/chatle into d…
Browse files Browse the repository at this point in the history
…evelop
  • Loading branch information
aguacongas committed Dec 5, 2016
2 parents 65c1185 + a0913da commit 60e18c8
Show file tree
Hide file tree
Showing 13 changed files with 117 additions and 73 deletions.
30 changes: 30 additions & 0 deletions chatle.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>

<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>22573857-8f40-4de3-8277-f6e05151b61f</ProjectGuid>
<RootNamespace>ChatLe.Repository.Identity.SqlLite</RootNamespace>
<ProjectGuid>8b940d10-64a7-463a-be19-e3f3d4e739e4</ProjectGuid>
<RootNamespace>ChatLe.Authentication</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/ChatLe.Authentication/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-*",
"version": "1.1.0-*",
"authors": [ "Olivier Lefebvre" ],
"description": "ChatLe authentication middleware to override MicrosoftAccountMiddleware",
"buildOptions": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>a39713e8-c2af-42df-b13e-17cf381aa56b</ProjectGuid>
<RootNamespace>ChatLe.Repository.Identity.MySql</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
15 changes: 7 additions & 8 deletions src/ChatLe.Repository.Identity.MySql/project.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
13 changes: 6 additions & 7 deletions src/ChatLe.Repository.Identity.SqlServer/project.json
Original file line number Diff line number Diff line change
@@ -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-*",
Expand All @@ -20,6 +19,6 @@
}
},
"tools": {
"Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final"
"Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final"
}
}
13 changes: 6 additions & 7 deletions src/ChatLe.Repository.Identity.Sqlite/project.json
Original file line number Diff line number Diff line change
@@ -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-*",
Expand All @@ -20,6 +19,6 @@
}
},
"tools": {
"Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final"
"Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final"
}
}
Binary file modified src/ChatLe.Repository.Identity/project.json
Binary file not shown.
Binary file modified src/ChatLe.Repository/project.json
Binary file not shown.
18 changes: 9 additions & 9 deletions src/chatle/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
});

Expand Down
68 changes: 34 additions & 34 deletions src/chatle/project.json
Original file line number Diff line number Diff line change
@@ -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"
],
Expand Down Expand Up @@ -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-*"
},
Expand All @@ -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" ]
Expand Down
Binary file modified test/ChatLe.Repository.Test/project.json
Binary file not shown.
Binary file modified test/chatle.test/project.json
Binary file not shown.

0 comments on commit 60e18c8

Please sign in to comment.