imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1852 from abpframework/maliming/CurrentDirectoryHelpers

Browse Source 
Remove CurrentDirectoryHelpers.
pull/1884/head
Halil İbrahim Kalkan 6 years ago committed by GitHub
parent 04c90d28d0 d9ed777485
commit b8a90037fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 0 additions and 150 deletions
Show Stats Download Patch File Download Diff File

63
framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/InProcess/CurrentDirectoryHelpers.cs
Unescape View File

@ -1,63 +0,0 @@
using System;
namespace Microsoft.AspNetCore.InProcess
{
/// <summary>
/// https://github.com/aspnet/AspNetCore.Docs/blob/master/aspnetcore/host-and-deploy/aspnet-core-module/samples_snapshot/2.x/CurrentDirectoryHelpers.cs
/// TODO: Remove CurrentDirectoryHelpers.cs when upgrade to ASP.NET Core 3.0.
/// </summary>
public class CurrentDirectoryHelpers
{
internal const string AspNetCoreModuleDll = "aspnetcorev2_inprocess.dll";
[System.Runtime.InteropServices.DllImport("kernel32.dll")]
private static extern IntPtr GetModuleHandle(string lpModuleName);
[System.Runtime.InteropServices.DllImport(AspNetCoreModuleDll)]
private static extern int http_get_application_properties(ref IISConfigurationData iiConfigData);
[System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
private struct IISConfigurationData
{
public IntPtr pNativeApplication;
[System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.BStr)]
public string pwzFullApplicationPath;
[System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.BStr)]
public string pwzVirtualApplicationPath;
public bool fWindowsAuthEnabled;
public bool fBasicAuthEnabled;
public bool fAnonymousAuthEnable;
}
public static void SetCurrentDirectory()
{
try
{
// Check if physical path was provided by ANCM
var sitePhysicalPath = Environment.GetEnvironmentVariable("ASPNETCORE_IIS_PHYSICAL_PATH");
if (string.IsNullOrEmpty(sitePhysicalPath))
{
// Skip if not running ANCM InProcess
if (GetModuleHandle(AspNetCoreModuleDll) == IntPtr.Zero)
{
return;
}
IISConfigurationData configurationData = default(IISConfigurationData);
if (http_get_application_properties(ref configurationData) != 0)
{
return;
}
sitePhysicalPath = configurationData.pwzFullApplicationPath;
}
Environment.CurrentDirectory = sitePhysicalPath;
}
catch
{
// ignore
}
}
}
}

3
modules/blogging/app/Volo.BloggingTestApp/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace Volo.BloggingTestApp
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Debug() //TODO: Should be configurable!
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)

3
modules/client-simulation/demo/Volo.ClientSimulation.Demo/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace Volo.ClientSimulation.Demo
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Debug()
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)

3
modules/docs/app/VoloDocs.Web/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace VoloDocs.Web
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Debug() //TODO: Should be configurable!
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)

3
samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace Acme.BookStore
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
samples/BookStore-Modular/application/src/Acme.BookStore.Web/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace Acme.BookStore.Web
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace Acme.BookStore.BookManagement
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace Acme.BookStore.BookManagement
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace Acme.BookStore.BookManagement
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace Acme.BookStore.BookManagement
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Debug()
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)

3
samples/BookStore/src/Acme.BookStore.Web/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace Acme.BookStore.Web
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
samples/DashboardDemo/src/DashboardDemo.Web/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace DashboardDemo.Web
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Microsoft.Extensions.Configuration;
using Serilog;
using Serilog.Events;
@ -13,8 +12,6 @@ namespace AuthServer.Host
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
//TODO: Temporary: it's not good to read appsettings.json here just to configure logging
var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())

3
samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Microsoft.Extensions.Configuration;
using Serilog;
using Serilog.Events;
@ -13,8 +12,6 @@ namespace BackendAdminApp.Host
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
//TODO: Temporary: it's not good to read appsettings.json here just to configure logging
var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())

3
samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Microsoft.Extensions.Configuration;
using Serilog;
using Serilog.Events;
@ -13,8 +12,6 @@ namespace PublicWebSite.Host
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
//TODO: Temporary: it's not good to read appsettings.json here just to configure logging
var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())

3
samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Microsoft.Extensions.Configuration;
using Serilog;
using Serilog.Events;
@ -13,8 +12,6 @@ namespace BackendAdminAppGateway.Host
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
//TODO: Temporary: it's not good to read appsettings.json here just to configure logging
var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())

3
samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Microsoft.Extensions.Configuration;
using Serilog;
using Serilog.Events;
@ -13,8 +12,6 @@ namespace InternalGateway.Host
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
//TODO: Temporary: it's not good to read appsettings.json here just to configure logging
var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())

3
samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Microsoft.Extensions.Configuration;
using Serilog;
using Serilog.Events;
@ -13,8 +12,6 @@ namespace PublicWebSiteGateway.Host
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
//TODO: Temporary: it's not good to read appsettings.json here just to configure logging
var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())

3
samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Microsoft.Extensions.Configuration;
using Serilog;
using Serilog.Events;
@ -13,8 +12,6 @@ namespace BloggingService.Host
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
//TODO: Temporary: it's not good to read appsettings.json here just to configure logging
var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())

3
samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Microsoft.Extensions.Configuration;
using Serilog;
using Serilog.Events;
@ -13,8 +12,6 @@ namespace IdentityService.Host
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
//TODO: Temporary: it's not good to read appsettings.json here just to configure logging
var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())

3
samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Microsoft.Extensions.Configuration;
using Serilog;
using Serilog.Events;
@ -13,8 +12,6 @@ namespace ProductService.Host
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
//TODO: Temporary: it's not good to read appsettings.json here just to configure logging
var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace MyCompanyName.MyProjectName
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace MyCompanyName.MyProjectName
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace MyCompanyName.MyProjectName
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace MyCompanyName.MyProjectName.Web
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace MyCompanyName.MyProjectName.Web
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace MyCompanyName.MyProjectName
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace MyCompanyName.MyProjectName
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace MyCompanyName.MyProjectName
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()

3
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Program.cs
Unescape View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.InProcess;
using Serilog;
using Serilog.Events;
@ -11,8 +10,6 @@ namespace MyCompanyName.MyProjectName
{
public static int Main(string[] args)
{
CurrentDirectoryHelpers.SetCurrentDirectory();
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Debug()
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)

Write Preview
Loading…
Cancel
Save