From 8e368f2028a9d57ec7c281b87c5508dba0517234 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sat, 10 Mar 2018 23:14:16 +0100 Subject: [PATCH] [POUR MORCEAUX] --- cli/Program.cs | 27 +++++--- cli/Startup.cs | 15 ++++- cli/cli.csproj | 146 ++++++++++++++++++++++++++++---------------- cli/packages.config | 34 +++++++---- cli/project.json | 21 ------- 5 files changed, 149 insertions(+), 94 deletions(-) delete mode 100644 cli/project.json diff --git a/cli/Program.cs b/cli/Program.cs index b5a7b6bf..6d5fd6d6 100644 --- a/cli/Program.cs +++ b/cli/Program.cs @@ -2,14 +2,15 @@ using System; using System.Diagnostics; using System.Threading.Tasks; using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Hosting.Server; using Microsoft.AspNet.Identity; using Microsoft.Extensions.CommandLineUtils; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.PlatformAbstractions; using Yavsc.Models; using Yavsc.Services; +using Microsoft.AspNet.Builder; +using Microsoft.AspNet.Builder.Internal; +using Microsoft.Extensions.PlatformAbstractions; namespace cli { @@ -77,23 +78,31 @@ public class Program Console.WriteLine(greeting); IServiceCollection services = new ServiceCollection(); // Startup.cs finally :) + + //EntryPoint.Main(new string[] {}); + IHostingEnvironment hosting = new HostingEnvironment{ EnvironmentName = environmentName }; - var test = PlatformServices.Create (null); + var basePath = AppDomain.CurrentDomain.BaseDirectory; // FIXME null ref var appName = AppDomain.CurrentDomain.ApplicationIdentity.FullName; - PlatformServices.SetDefault (test); + // var rtdcontext = new System.Runtime.DesignerServices.WindowsRuntimeDesignerContext (new string { "." }, "nonname"); + + // hosting.Initialize("approot", config); + + // ApplicationHostContext apphostcontext = new ApplicationHostContext (); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + IApplicationBuilder iappbuilder = new ApplicationBuilder(serviceProvider); + iappbuilder.ApplicationServices = serviceProvider; - Startup startup = new Startup(hosting, null); - startup.ConfigureServices(services); - IServiceProvider serviceProvider = services.BuildServiceProvider(); + Startup startup = new Startup(hosting, PlatformServices.Default.Application); //configure console logging serviceProvider .GetService() .AddConsole(LogLevel.Debug); - + var logger = serviceProvider.GetService() .CreateLogger(); @@ -102,7 +111,7 @@ public class Program var userManager = serviceProvider.GetService >(); var emailSender = serviceProvider.GetService(); - foreach (var user in userManager.Users) + foreach (var user in userManager?.Users) { Task.Run(async () => await emailSender.SendEmailAsync(Startup.SiteSetup, Startup.SmtpSettup, Startup.SiteSetup.Owner.Name, Startup.SiteSetup.Owner.EMail, diff --git a/cli/Startup.cs b/cli/Startup.cs index 88f591eb..e835b7a7 100644 --- a/cli/Startup.cs +++ b/cli/Startup.cs @@ -3,11 +3,13 @@ using Microsoft.AspNet.Hosting; using Microsoft.Data.Entity; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.OptionsModel; -using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Framework.Configuration; using Newtonsoft.Json; using Yavsc; using Yavsc.Models; +using Yavsc.Auth; +using Microsoft.AspNet.Identity.EntityFramework; +using Microsoft.AspNet.Identity; namespace cli { @@ -20,6 +22,8 @@ namespace cli public static SmtpSettings SmtpSettup { get; private set; } public IConfigurationRoot Configuration { get; set; } public string ConnectionString { get; private set; } + public static MonoDataProtectionProvider ProtectionProvider { get; private set; } + public static IdentityOptions AppIdentityOptions { get; private set; } // Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) @@ -37,6 +41,13 @@ namespace cli services.Configure((o)=> JsonConvert.PopulateObject(Configuration["Site"],o)); services.Configure((o)=> JsonConvert.PopulateObject(Configuration["Smtp"],o)); + + ProtectionProvider = new MonoDataProtectionProvider(Configuration["Site:Title"]); ; + services.AddInstance + (ProtectionProvider); + + + } @@ -48,7 +59,7 @@ namespace cli SmtpSettup = smtpSettingsOptions.Value; } - public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv) + public Startup(IHostingEnvironment env, IApplicationBuilder app) { var devtag = env.IsDevelopment()?"D":""; var prodtag = env.IsProduction()?"P":""; diff --git a/cli/cli.csproj b/cli/cli.csproj index a2662a4c..8515999c 100644 --- a/cli/cli.csproj +++ b/cli/cli.csproj @@ -8,6 +8,8 @@ cli cli v4.5.1 + 8.0.30703 + 2.0 true @@ -31,9 +33,6 @@ - - ..\packages\Microsoft.Extensions.CommandLineUtils.1.1.1\lib\net451\Microsoft.Extensions.CommandLineUtils.dll - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll @@ -55,57 +54,9 @@ ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.CodeAnalysis.dll - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.ApplicationHost.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.Abstractions.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.CSharp.Abstractions.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.CSharp.Common.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.CSharp.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.DesignTime.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.DesignTimeHost.Abstractions.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Host.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Host.Mono.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Loader.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Runtime.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Runtime.Internals.dll - - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Extensions.PlatformAbstractions.dll - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\System.Collections.Immutable.dll - - ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\System.Reflection.Metadata.dll - ..\..\..\..\..\srv\www\dnx\packages\Microsoft.AspNet.Hosting\1.0.0-rc1-final\lib\net451\Microsoft.AspNet.Hosting.dll @@ -222,6 +173,93 @@ ..\..\..\..\..\srv\www\dnx\packages\Microsoft.Extensions.Configuration\1.0.0-rc1-final\lib\net451\Microsoft.Extensions.Configuration.dll + + ..\..\..\..\..\srv\www\dnx\packages\Microsoft.Framework.Configuration.FileExtensions\1.0.0-beta8\lib\net45\Microsoft.Framework.Configuration.FileExtensions.dll + + + packages\Microsoft.Extensions.Caching.Abstractions.1.0.0-rc1-final\lib\net451\Microsoft.Extensions.Caching.Abstractions.dll + + + packages\Microsoft.Extensions.Caching.Memory.1.0.0-rc1-final\lib\net451\Microsoft.Extensions.Caching.Memory.dll + + + packages\Remotion.Linq.2.0.1\lib\net45\Remotion.Linq.dll + + + ..\..\..\..\..\srv\www\dnx\packages\System.Diagnostics.DiagnosticSource\4.0.0-beta-23516\lib\portable-net45+win8+wp8+wpa81\System.Diagnostics.DiagnosticSource.dll + + + packages\Microsoft.Extensions.Localization.Abstractions.1.0.0-rc1-final\lib\net451\Microsoft.Extensions.Localization.Abstractions.dll + + + packages\Microsoft.AspNet.Authentication.Cookies.1.0.0-rc1-final\lib\net451\Microsoft.AspNet.Authentication.Cookies.dll + + + packages\Microsoft.AspNet.DataProtection.1.0.0-rc1-final\lib\net451\Microsoft.AspNet.DataProtection.dll + + + packages\Microsoft.AspNet.DataProtection.Abstractions.1.0.0-rc1-final\lib\net451\Microsoft.AspNet.DataProtection.Abstractions.dll + + + packages\Owin.1.0\lib\net40\Owin.dll + + + packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\System.Reflection.Metadata.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Extensions.PlatformAbstractions.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.Runtime.Internals.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.Runtime.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.Loader.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.Host.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.DesignTimeHost.Abstractions.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.DesignTime.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.CSharp.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.CSharp.Common.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.CSharp.Abstractions.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.Compilation.Abstractions.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-coreclr-linux-x64.1.0.0-rc1-update2\bin\Microsoft.Dnx.ApplicationHost.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\lib\Microsoft.Dnx.DesignTimeHost\Microsoft.Dnx.DesignTimeHost.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.dll + + + ..\..\..\..\..\srv\www\dnx\runtimes\dnx-mono.1.0.0-rc1-update2\bin\Microsoft.Dnx.Host.Mono.dll + + + packages\Microsoft.Extensions.CommandLineUtils.1.1.1\lib\net451\Microsoft.Extensions.CommandLineUtils.dll + @@ -231,5 +269,11 @@ + + PreserveNewest + + + PreserveNewest + \ No newline at end of file diff --git a/cli/packages.config b/cli/packages.config index a9b637c2..c570b325 100644 --- a/cli/packages.config +++ b/cli/packages.config @@ -1,20 +1,32 @@  + + + + + + + + + + - + + + + + + + + + - - - - - - - - - - + + + + \ No newline at end of file diff --git a/cli/project.json b/cli/project.json deleted file mode 100644 index 7dffe74d..00000000 --- a/cli/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "description": "Yavsc command line interface", - "dependencies": { - "Yavsc": { - "type": "build" - }, - "Microsoft.Extensions.CommandLineUtils": "1.1.1", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final" - }, - "frameworks": { - "dnx451": { - "frameworkAssemblies": { - "System.ServiceProcess": "4.0.0.0" - } - } - }, - "commands": { - "run": "cli" - } -} \ No newline at end of file