From 989df49cf22487173df1a1c521364dcb4fbffcb0 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Tue, 7 Jun 2016 22:00:10 +0200 Subject: [PATCH] nettoyage --- Yavsc/Auth/AuthServer/OAuthAuthorizationServerHandler.cs | 1 - Yavsc/Auth/AuthServer/OAuthAuthorizeEndpointContext.cs | 1 - Yavsc/Controllers/ApplicationController.cs | 1 - Yavsc/Controllers/OAuthController.cs | 7 +------ Yavsc/Controllers/TokenController.cs | 5 ----- Yavsc/Controllers/ValuesController.cs | 5 +---- Yavsc/Extensions/OAuthAuthorizationServerExtensions.cs | 1 - Yavsc/Model/ApplicationDbContext.cs | 1 - Yavsc/Startup/Startup.cs | 1 - Yavsc/gulpfile.js | 2 +- Yavsc/postPublish.sh | 6 ------ Yavsc/project.json | 2 +- 12 files changed, 4 insertions(+), 29 deletions(-) delete mode 100755 Yavsc/postPublish.sh diff --git a/Yavsc/Auth/AuthServer/OAuthAuthorizationServerHandler.cs b/Yavsc/Auth/AuthServer/OAuthAuthorizationServerHandler.cs index bb5cff45..03989dec 100644 --- a/Yavsc/Auth/AuthServer/OAuthAuthorizationServerHandler.cs +++ b/Yavsc/Auth/AuthServer/OAuthAuthorizationServerHandler.cs @@ -11,7 +11,6 @@ using System.Globalization; using System.IO; using System.Text; using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; namespace OAuth.AspNet.AuthServer { diff --git a/Yavsc/Auth/AuthServer/OAuthAuthorizeEndpointContext.cs b/Yavsc/Auth/AuthServer/OAuthAuthorizeEndpointContext.cs index e530c747..92765bc2 100644 --- a/Yavsc/Auth/AuthServer/OAuthAuthorizeEndpointContext.cs +++ b/Yavsc/Auth/AuthServer/OAuthAuthorizeEndpointContext.cs @@ -1,4 +1,3 @@ -using Microsoft.AspNet.Authentication; using Microsoft.AspNet.Http; namespace OAuth.AspNet.AuthServer diff --git a/Yavsc/Controllers/ApplicationController.cs b/Yavsc/Controllers/ApplicationController.cs index 11d90bcf..abf62500 100644 --- a/Yavsc/Controllers/ApplicationController.cs +++ b/Yavsc/Controllers/ApplicationController.cs @@ -2,7 +2,6 @@ using System; using System.Linq; using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Mvc; -using Microsoft.Data.Entity; using Yavsc.Models; namespace Yavsc.Controllers diff --git a/Yavsc/Controllers/OAuthController.cs b/Yavsc/Controllers/OAuthController.cs index cb438b9d..792e16b3 100644 --- a/Yavsc/Controllers/OAuthController.cs +++ b/Yavsc/Controllers/OAuthController.cs @@ -1,19 +1,14 @@ -using System; -using System.Linq; +using System.Linq; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Authentication; using Microsoft.AspNet.Authorization; -using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection.KeyManagement; -using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Identity; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; using Microsoft.Extensions.Logging; using Microsoft.Extensions.OptionsModel; -using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Yavsc.Extensions; using Yavsc.Models; using Yavsc.ViewModels.Account; diff --git a/Yavsc/Controllers/TokenController.cs b/Yavsc/Controllers/TokenController.cs index 483e22d3..523d04fb 100644 --- a/Yavsc/Controllers/TokenController.cs +++ b/Yavsc/Controllers/TokenController.cs @@ -1,12 +1,7 @@ using System; -using System.Linq; using Microsoft.AspNet.Mvc; -using System.IdentityModel.Tokens; using System.Security.Claims; using Microsoft.AspNet.Authorization; -using System.Security.Principal; -using Microsoft.AspNet.Authentication.JwtBearer; -using System.IdentityModel.Tokens.Jwt; using Microsoft.Extensions.Logging; using Microsoft.Extensions.OptionsModel; using Yavsc.Auth; diff --git a/Yavsc/Controllers/ValuesController.cs b/Yavsc/Controllers/ValuesController.cs index b113b9b3..3b83c5b9 100644 --- a/Yavsc/Controllers/ValuesController.cs +++ b/Yavsc/Controllers/ValuesController.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using System.Collections.Generic; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Authorization; diff --git a/Yavsc/Extensions/OAuthAuthorizationServerExtensions.cs b/Yavsc/Extensions/OAuthAuthorizationServerExtensions.cs index 5e43059d..c8089209 100644 --- a/Yavsc/Extensions/OAuthAuthorizationServerExtensions.cs +++ b/Yavsc/Extensions/OAuthAuthorizationServerExtensions.cs @@ -1,5 +1,4 @@ using System; -using Microsoft.AspNet.Builder; using OAuth.AspNet.AuthServer; namespace Microsoft.AspNet.Builder diff --git a/Yavsc/Model/ApplicationDbContext.cs b/Yavsc/Model/ApplicationDbContext.cs index 0e3edd07..f426cccb 100644 --- a/Yavsc/Model/ApplicationDbContext.cs +++ b/Yavsc/Model/ApplicationDbContext.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Authentication.OAuth; using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Infrastructure; using Yavsc.Models.Booking; namespace Yavsc.Models diff --git a/Yavsc/Startup/Startup.cs b/Yavsc/Startup/Startup.cs index 03491955..143b9674 100755 --- a/Yavsc/Startup/Startup.cs +++ b/Yavsc/Startup/Startup.cs @@ -21,7 +21,6 @@ using Microsoft.AspNet.Localization; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Razor; -using Microsoft.AspNet.StaticFiles; using Microsoft.Data.Entity; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; diff --git a/Yavsc/gulpfile.js b/Yavsc/gulpfile.js index f56e7b72..38931c03 100755 --- a/Yavsc/gulpfile.js +++ b/Yavsc/gulpfile.js @@ -51,4 +51,4 @@ gulp.task("min", ["min:js", "min:css"]); gulp.task('watch', shell.task(['MONO_OPTIONS=--debug ASPNET_ENV=Development dnx-watch web --configuration=Debug'])) gulp.task('build', shell.task(['dnu build --configuration=Debug'])) -gulp.task('publish', shell.task(['dnu publish'])) +gulp.task('publish', shell.task(['dnu publish -o ../build'])) diff --git a/Yavsc/postPublish.sh b/Yavsc/postPublish.sh deleted file mode 100755 index ff70b30a..00000000 --- a/Yavsc/postPublish.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -ssh root@localhost rm -rf /srv/www/yavscpre/approot/src -cd bin/output -rsync -ravu --exclude=.git --chown=www-data:www-data wwwroot approot root@localhost:/srv/www/yavscpre - - diff --git a/Yavsc/project.json b/Yavsc/project.json index 3e636c6a..73132863 100755 --- a/Yavsc/project.json +++ b/Yavsc/project.json @@ -143,6 +143,6 @@ "prerestore": "echo before restoring packages", "postrestore": "echo after restoring packages", "prepublish": "gulp min", - "postpublish": "./postPublish.sh" + "postpublish": "echo \" (cd ../build && . ./postPublish.sh) # to push in prod.\"" } } \ No newline at end of file