move folder and fix naming

EasyMicroservices · Dec 4, 2023 · 2153f63 · 2153f63
1 parent b94b4a9
commit 2153f63
Show file tree

Hide file tree

Showing 28 changed files with 71 additions and 33 deletions.
diff --git a/...t/EasyMicroservices.Logger.Log4net.csproj → ...t/EasyMicroservices.Logger.Log4net.csproj b/...t/EasyMicroservices.Logger.Log4net.csproj → ...t/EasyMicroservices.Logger.Log4net.csproj
@@ -17,7 +17,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.2</Version>
+    <Version>0.0.0.3</Version>
     <Description>logger wrapper</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>log,logger,logging,log4net</PackageTags>

diff --git a/...ices.Logger. Log4net/Log4netExtensions.cs → ...ices.Logger. Log4net/Log4netExtensions.cs b/...ices.Logger. Log4net/Log4netExtensions.cs → ...ices.Logger. Log4net/Log4netExtensions.cs
diff --git a/...ger. Log4net/Providers/Log4netProvider.cs → ...ger. Log4net/Providers/Log4netProvider.cs b/...ger. Log4net/Providers/Log4netProvider.cs → ...ger. Log4net/Providers/Log4netProvider.cs
diff --git a/...ervices.Logger.DependencyInjection.csproj → ...ervices.Logger.DependencyInjection.csproj b/...ervices.Logger.DependencyInjection.csproj → ...ervices.Logger.DependencyInjection.csproj
@@ -17,7 +17,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.1</Version>
+    <Version>0.0.0.3</Version>
     <Description>logger wrapper</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>log,logger,logging</PackageTags>

diff --git a/src/CSharp/EasyMicroservices.Logger.DependencyInjection/LoggerExtensions.cs b/src/CSharp/EasyMicroservices.Logger.DependencyInjection/LoggerExtensions.cs
@@ -0,0 +1,64 @@
+using EasyMicroservices.Logger.Options;
+using System;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public static class LoggerExtensions
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddLogger(this IServiceCollection services, Action<LoggerOption> options)
+        {
+            return AddLoggerTransient(services, options);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddLoggerScoped(this IServiceCollection services, Action<LoggerOption> options)
+        {
+            options.ThrowIfNull(nameof(options));
+            options(new LoggerOption());
+            services.AddScoped(service => LoggerOptionBuilder.GetLogger());
+            return services;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddLoggerTransient(this IServiceCollection services, Action<LoggerOption> options)
+        {
+            options.ThrowIfNull(nameof(options));
+            options(new LoggerOption());
+            services.AddTransient(service => LoggerOptionBuilder.GetLogger());
+            return services;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddLoggerSingleton(this IServiceCollection services, Action<LoggerOption> options)
+        {
+            options.ThrowIfNull(nameof(options));
+            options(new LoggerOption());
+            services.AddSingleton(service => LoggerOptionBuilder.GetLogger());
+            return services;
+        }
+    }
+}
diff --git a/...NLog/EasyMicroservices.Logger.NLog.csproj → ...NLog/EasyMicroservices.Logger.NLog.csproj b/...NLog/EasyMicroservices.Logger.NLog.csproj → ...NLog/EasyMicroservices.Logger.NLog.csproj
@@ -17,7 +17,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.2</Version>
+    <Version>0.0.0.3</Version>
     <Description>logger wrapper</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>log,logger,logging,nlog</PackageTags>

diff --git a/...croservices.Logger.NLog/NLogExtensions.cs → ...croservices.Logger.NLog/NLogExtensions.cs b/...croservices.Logger.NLog/NLogExtensions.cs → ...croservices.Logger.NLog/NLogExtensions.cs
@@ -15,7 +15,7 @@ public static class NLogExtensions
         /// <param name="options"></param>
         /// <param name="logger"></param>
         /// <returns></returns>
-        public static LoggerOption UseLog4net(this LoggerOption options, NLog.Logger logger)
+        public static LoggerOption UseNLog(this LoggerOption options, NLog.Logger logger)
         {
             options.ThrowIfNull(nameof(options));
             logger.ThrowIfNull(nameof(logger));

diff --git a/...ces.Logger.NLog/Providers/NLogProvider.cs → ...ces.Logger.NLog/Providers/NLogProvider.cs b/...ces.Logger.NLog/Providers/NLogProvider.cs → ...ces.Logger.NLog/Providers/NLogProvider.cs
diff --git a/...g/EasyMicroservices.Logger.Serilog.csproj → ...g/EasyMicroservices.Logger.Serilog.csproj b/...g/EasyMicroservices.Logger.Serilog.csproj → ...g/EasyMicroservices.Logger.Serilog.csproj
@@ -17,7 +17,7 @@
 		<Platforms>AnyCPU;x64;x86</Platforms>
 		<Authors>EasyMicroservices</Authors>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<Version>0.0.0.2</Version>
+		<Version>0.0.0.3</Version>
 		<Description>logger wrapper</Description>
 		<Copyright>[email protected]</Copyright>
 		<PackageTags>log,logger,logging,serilog</PackageTags>

diff --git a/...gger.Serilog/Providers/SerilogProvider.cs → ...gger.Serilog/Providers/SerilogProvider.cs b/...gger.Serilog/Providers/SerilogProvider.cs → ...gger.Serilog/Providers/SerilogProvider.cs
diff --git a/...vices.Logger.Serilog/SerilogExtensions.cs → ...vices.Logger.Serilog/SerilogExtensions.cs b/...vices.Logger.Serilog/SerilogExtensions.cs → ...vices.Logger.Serilog/SerilogExtensions.cs
@@ -16,7 +16,7 @@ public static class SerilogExtensions
         /// <param name="options"></param>
         /// <param name="loggerConfiguration"></param>
         /// <returns></returns>
-        public static LoggerOption UseLog4net(this LoggerOption options, LoggerConfiguration loggerConfiguration)
+        public static LoggerOption UseSerilog(this LoggerOption options, LoggerConfiguration loggerConfiguration)
         {
             options.ThrowIfNull(nameof(options));
             loggerConfiguration.ThrowIfNull(nameof(loggerConfiguration));

diff --git a/...ces.Logger.Tests/BaseProviderAsyncTest.cs → ...ces.Logger.Tests/BaseProviderAsyncTest.cs b/...ces.Logger.Tests/BaseProviderAsyncTest.cs → ...ces.Logger.Tests/BaseProviderAsyncTest.cs
diff --git a/...services.Logger.Tests/BaseProviderTest.cs → ...services.Logger.Tests/BaseProviderTest.cs b/...services.Logger.Tests/BaseProviderTest.cs → ...services.Logger.Tests/BaseProviderTest.cs
diff --git a/...sts/EasyMicroservices.Logger.Tests.csproj → ...sts/EasyMicroservices.Logger.Tests.csproj b/...sts/EasyMicroservices.Logger.Tests.csproj → ...sts/EasyMicroservices.Logger.Tests.csproj
diff --git a/...er.Tests/Providers/Log4netProviderTest.cs → ...er.Tests/Providers/Log4netProviderTest.cs b/...er.Tests/Providers/Log4netProviderTest.cs → ...er.Tests/Providers/Log4netProviderTest.cs
diff --git a/...ogger.Tests/Providers/NLogProviderTest.cs → ...ogger.Tests/Providers/NLogProviderTest.cs b/...ogger.Tests/Providers/NLogProviderTest.cs → ...ogger.Tests/Providers/NLogProviderTest.cs
diff --git a/...er.Tests/Providers/SerilogProviderTest.cs → ...er.Tests/Providers/SerilogProviderTest.cs b/...er.Tests/Providers/SerilogProviderTest.cs → ...er.Tests/Providers/SerilogProviderTest.cs
diff --git a/...vices.Logger/EasyMicroservices.Logger.sln → src/CSharp/EasyMicroservices.Logger.sln b/...vices.Logger/EasyMicroservices.Logger.sln → src/CSharp/EasyMicroservices.Logger.sln
diff --git a/...EasyMicroservices.Logger/EasyMicroservices.Logger.DependencyInjection/LoggerExtensions.cs b/...EasyMicroservices.Logger/EasyMicroservices.Logger.DependencyInjection/LoggerExtensions.cs
diff --git a/...es.Logger/EasyMicroservices.Logger.csproj → ...es.Logger/EasyMicroservices.Logger.csproj b/...es.Logger/EasyMicroservices.Logger.csproj → ...es.Logger/EasyMicroservices.Logger.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.2</Version>
+    <Version>0.0.0.3</Version>
     <Description>Logger and Auditing system</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>logging,auditing</PackageTags>

diff --git a/...ices.Logger/Interfaces/ILoggerProvider.cs → ...ices.Logger/Interfaces/ILoggerProvider.cs b/...ices.Logger/Interfaces/ILoggerProvider.cs → ...ices.Logger/Interfaces/ILoggerProvider.cs
diff --git a/...Logger/Interfaces/ILoggerProviderAsync.cs → ...Logger/Interfaces/ILoggerProviderAsync.cs b/...Logger/Interfaces/ILoggerProviderAsync.cs → ...Logger/Interfaces/ILoggerProviderAsync.cs
diff --git a/...ervices.Logger/Models/ExtractedLogInfo.cs → ...ervices.Logger/Models/ExtractedLogInfo.cs b/...ervices.Logger/Models/ExtractedLogInfo.cs → ...ervices.Logger/Models/ExtractedLogInfo.cs
diff --git a/...roservices.Logger/Options/LoggerOption.cs → ...roservices.Logger/Options/LoggerOption.cs b/...roservices.Logger/Options/LoggerOption.cs → ...roservices.Logger/Options/LoggerOption.cs
diff --git a/...ces.Logger/Options/LoggerOptionBuilder.cs → ...ces.Logger/Options/LoggerOptionBuilder.cs b/...ces.Logger/Options/LoggerOptionBuilder.cs → ...ces.Logger/Options/LoggerOptionBuilder.cs
diff --git a/...services.Logger/Providers/BaseProvider.cs → ...services.Logger/Providers/BaseProvider.cs b/...services.Logger/Providers/BaseProvider.cs → ...services.Logger/Providers/BaseProvider.cs
diff --git a/...services.Logger/coverage-badge-branch.svg → src/CSharp/coverage-badge-branch.svg b/...services.Logger/coverage-badge-branch.svg → src/CSharp/coverage-badge-branch.svg
diff --git a/...roservices.Logger/coverage-badge-line.svg → src/CSharp/coverage-badge-line.svg b/...roservices.Logger/coverage-badge-line.svg → src/CSharp/coverage-badge-line.svg