initial commit
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
<Application x:Class="AvaloniaLog4NetNoDI.App"
|
||||
xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
|
||||
<Application.Styles>
|
||||
<FluentTheme Mode="Light"/>
|
||||
<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
|
||||
</Application.Styles>
|
||||
</Application>
|
||||
@@ -0,0 +1,29 @@
|
||||
using Avalonia;
|
||||
using Avalonia.Controls.ApplicationLifetimes;
|
||||
using Avalonia.Data.Core;
|
||||
using Avalonia.Data.Core.Plugins;
|
||||
using Avalonia.Markup.Xaml;
|
||||
using AvaloniaLog4NetNoDI.Views;
|
||||
|
||||
namespace AvaloniaLog4NetNoDI;
|
||||
|
||||
public partial class App : Application
|
||||
{
|
||||
public override void Initialize()
|
||||
{
|
||||
AvaloniaXamlLoader.Load(this);
|
||||
}
|
||||
|
||||
public override void OnFrameworkInitializationCompleted()
|
||||
{
|
||||
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
|
||||
{
|
||||
// Line below is needed to remove Avalonia data validation.
|
||||
// Without this line you will get duplicate validations from both Avalonia and CT
|
||||
ExpressionObserver.DataValidators.RemoveAll(x => x is DataAnnotationsValidationPlugin);
|
||||
desktop.MainWindow = new MainWindow();
|
||||
}
|
||||
|
||||
base.OnFrameworkInitializationCompleted();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="appsettings.Development.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="appsettings.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="appsettings.Production.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<TrimmerRootAssembly Include="Avalonia.Themes.Fluent" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Resources\Avalonia.Resources\Avalonia.Resources.vbproj" />
|
||||
<ProjectReference Include="..\..\Background Services\RandomLogging.Service\RandomLogging.Service.csproj" />
|
||||
<ProjectReference Include="..\..\Controls\LogViewer.Avalonia\LogViewer.Avalonia.csproj" />
|
||||
<ProjectReference Include="..\..\Core\Common.Core\Common.Core.csproj" />
|
||||
<ProjectReference Include="..\..\Core\Log4Net.Appender.LogView.Core\Log4Net.Appender.LogView.Core.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="log4net.config">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -0,0 +1,10 @@
|
||||
using LogViewer.Core;
|
||||
using LogDataStore = LogViewer.Avalonia.Logging.LogDataStore;
|
||||
|
||||
namespace AvaloniaLog4NetNoDI.DataStores;
|
||||
|
||||
// Application-wide shared instance of the LogDataStore logging entries
|
||||
public static class MainControlsDataStore
|
||||
{
|
||||
public static ILogDataStore DataStore { get; } = new LogDataStore();
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
using AvaloniaLog4NetNoDI.DataStores;
|
||||
using LogViewer.Core;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using System;
|
||||
using Log4Net.Appender.LogView.Core;
|
||||
|
||||
namespace AvaloniaLog4NetNoDI.Extensions;
|
||||
|
||||
public static class ServiceExtension
|
||||
{
|
||||
public static ILoggingBuilder AddLog4NetNoDI(this ILoggingBuilder builder, IConfiguration config)
|
||||
{
|
||||
// We need to use a shared instance of the DataStore to pass to the LogViewerControl
|
||||
builder.Services.AddSingleton(MainControlsDataStore.DataStore);
|
||||
|
||||
// call core Log4Net ServiceExtension initializer
|
||||
builder.AddLog4Net(config);
|
||||
|
||||
return builder;
|
||||
}
|
||||
|
||||
public static ILoggingBuilder AddLog4NetNoDI(this ILoggingBuilder builder, IConfiguration config, Action<DataStoreLoggerConfiguration> configure)
|
||||
{
|
||||
builder.AddLog4NetNoDI(config);
|
||||
builder.Services.Configure(configure);
|
||||
return builder;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using AvaloniaLog4NetNoDI.Extensions;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Common.Core;
|
||||
using Common.Core.Extensions;
|
||||
|
||||
namespace AvaloniaLog4NetNoDI.Helpers;
|
||||
|
||||
// application-wide DataStoreLogger Factory ... returns a wired up Logger instance
|
||||
public static class LoggingHelper
|
||||
{
|
||||
#region Constructors
|
||||
|
||||
static LoggingHelper()
|
||||
{
|
||||
// retrieve the log level from 'appsettings'
|
||||
string value = AppSettings<string>.Current("Logging:LogLevel", "Default") ?? "Information";
|
||||
Enum.TryParse(value, out LogLevel logLevel);
|
||||
|
||||
IConfigurationRoot configuration = new ConfigurationBuilder()
|
||||
.Initialize()
|
||||
.Build();
|
||||
|
||||
|
||||
// wire up the loggers
|
||||
Factory = LoggerFactory.Create(builder => builder
|
||||
|
||||
// visual debugging tools
|
||||
.AddLog4NetNoDI(configuration)
|
||||
|
||||
// uncomment to use custom logging colors (note: System.Drawing namespace)
|
||||
//
|
||||
//.AddLog4NetNoDI(configuration, options =>
|
||||
//{
|
||||
// options.Colors[LogLevel.Trace] = new()
|
||||
// {
|
||||
// Foreground = Color.White,
|
||||
// Background = Color.DarkGray
|
||||
// };
|
||||
|
||||
// options.Colors[LogLevel.Debug] = new()
|
||||
// {
|
||||
// Foreground = Color.White,
|
||||
// Background = Color.Gray
|
||||
// };
|
||||
|
||||
// options.Colors[LogLevel.Information] = new()
|
||||
// {
|
||||
// Foreground = Color.White,
|
||||
// Background = Color.DodgerBlue
|
||||
// };
|
||||
|
||||
// options.Colors[LogLevel.Warning] = new()
|
||||
// {
|
||||
// Foreground = Color.White,
|
||||
// Background = Color.Orchid
|
||||
// };
|
||||
//})
|
||||
|
||||
// set minimum log level from 'appsettings*.json'
|
||||
.SetMinimumLevel(logLevel));
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Properties
|
||||
|
||||
public static ILoggerFactory Factory { get; }
|
||||
|
||||
#endregion
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
using Avalonia;
|
||||
using System;
|
||||
|
||||
namespace AvaloniaLog4NetNoDI;
|
||||
|
||||
internal class Program
|
||||
{
|
||||
// Initialization code. Don't use any Avalonia, third-party APIs or any
|
||||
// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
|
||||
// yet and stuff might break.
|
||||
[STAThread]
|
||||
public static void Main(string[] args)
|
||||
=> BuildAvaloniaApp()
|
||||
.StartWithClassicDesktopLifetime(args);
|
||||
|
||||
// Avalonia configuration, don't remove; also used by visual designer.
|
||||
public static AppBuilder BuildAvaloniaApp()
|
||||
=> AppBuilder.Configure<App>()
|
||||
.UsePlatformDetect()
|
||||
.LogToTrace();
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"profiles": {
|
||||
"Development": {
|
||||
"commandName": "Project",
|
||||
"environmentVariables": {
|
||||
"DOTNET_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"Staging": {
|
||||
"commandName": "Project",
|
||||
"environmentVariables": {
|
||||
"DOTNET_ENVIRONMENT": "Staging"
|
||||
}
|
||||
},
|
||||
"Production": {
|
||||
"commandName": "Project"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
<Window x:Class="AvaloniaLog4NetNoDI.Views.MainWindow"
|
||||
xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
|
||||
x:Name="Window"
|
||||
|
||||
xmlns:control="clr-namespace:LogViewer.Avalonia;assembly=LogViewer.Avalonia"
|
||||
|
||||
mc:Ignorable="d"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
|
||||
Title="C# AVALONIA MINIMAL | LOG4NET LogViewer Control Example - Dot Net 7.0"
|
||||
Icon="avares://Avalonia.Resources/Assets/avalonia-logo.ico"
|
||||
WindowStartupLocation="CenterScreen" Height="634" Width="600">
|
||||
|
||||
<control:LogViewerControl x:Name="LogViewerControl" />
|
||||
|
||||
</Window>
|
||||
@@ -0,0 +1,48 @@
|
||||
using Avalonia.Controls;
|
||||
using AvaloniaLog4NetNoDI.DataStores;
|
||||
using AvaloniaLog4NetNoDI.Helpers;
|
||||
using LogViewer.Core;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using RandomLogging.Service;
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
|
||||
namespace AvaloniaLog4NetNoDI.Views;
|
||||
|
||||
public partial class MainWindow : Window, ILogDataStoreImpl
|
||||
{
|
||||
public MainWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
// Initialize service and pass in the Logger
|
||||
RandomLoggingService service = new(new Logger<RandomLoggingService>(LoggingHelper.Factory));
|
||||
|
||||
// Get the Launch mode
|
||||
bool isDevelopment = string.Equals(Environment.GetEnvironmentVariable("DOTNET_MODIFIABLE_ASSEMBLIES"), "debug",
|
||||
StringComparison.InvariantCultureIgnoreCase);
|
||||
|
||||
// initialize a logger & EventId
|
||||
Logger<MainWindow> logger = new Logger<MainWindow>(LoggingHelper.Factory);
|
||||
EventId eventId = new EventId(id: 0, name: Assembly.GetEntryAssembly()!.GetName().Name);
|
||||
|
||||
// log a test pattern for each log level
|
||||
logger.TestPattern(eventId: eventId);
|
||||
|
||||
// log that we have started...
|
||||
logger.Emit(eventId, LogLevel.Information, $"Running in {(isDevelopment ? "Debug" : "Release")} mode");
|
||||
|
||||
// Start generating log entries
|
||||
_ = service.StartAsync(CancellationToken.None);
|
||||
|
||||
// manually wire up the logging to the view ... the control will show backlog entries...
|
||||
DataStore = MainControlsDataStore.DataStore;
|
||||
|
||||
// we can't bind the controls' DataContext to a static object, so assign the DataStore to the Window
|
||||
// and pass a reference to the Window itself
|
||||
LogViewerControl.DataContext = this;
|
||||
}
|
||||
|
||||
public ILogDataStore DataStore { get; init; }
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<!-- This manifest is used on Windows only.
|
||||
Don't remove it as it might cause problems with window transparency and embeded controls.
|
||||
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
|
||||
<assemblyIdentity version="1.0.0.0" name="AvaloniaTest.Desktop"/>
|
||||
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<!-- A list of the Windows versions that this application has been tested on
|
||||
and is designed to work with. Uncomment the appropriate elements
|
||||
and Windows will automatically select the most compatible environment. -->
|
||||
|
||||
<!-- Windows 10 -->
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
|
||||
</application>
|
||||
</compatibility>
|
||||
</assembly>
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Trace",
|
||||
"System.Net.Http.HttpClient": "Trace"
|
||||
}
|
||||
},
|
||||
"Log4NetCore": {
|
||||
"Name": "Log4NetLogViewer_Dev",
|
||||
"LoggerRepository": "LogViewerRepository",
|
||||
"OverrideCriticalLevelWith": "Critical",
|
||||
"Watch": false,
|
||||
"UseWebOrAppConfig": false,
|
||||
"PropertyOverrides": [
|
||||
{
|
||||
"XPath": "/log4net/appender[@name='ConsoleAppender']/layout/conversionPattern",
|
||||
"Attributes": {
|
||||
"Value": "%date [%thread] %-5level | %logger | %message%newline"
|
||||
}
|
||||
},
|
||||
{
|
||||
"XPath": "/log4net/appender[@name='ConsoleAppender']/threshold",
|
||||
"Attributes": {
|
||||
"Value": "Trace"
|
||||
}
|
||||
},
|
||||
{
|
||||
"XPath": "/log4net/appender[@name='DataStoreLogger']/threshold",
|
||||
"Attributes": {
|
||||
"Value": "Trace"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Trace",
|
||||
"System.Net.Http.HttpClient": "Trace"
|
||||
}
|
||||
},
|
||||
"Log4NetCore": {
|
||||
"Name": "Log4NetLogViewer_Prod",
|
||||
"LoggerRepository": "LogViewerRepository",
|
||||
"OverrideCriticalLevelWith": "Critical",
|
||||
"Watch": false,
|
||||
"UseWebOrAppConfig": false,
|
||||
"PropertyOverrides": [
|
||||
{
|
||||
"XPath": "/log4net/appender[@name='ConsoleAppender']/layout/conversionPattern",
|
||||
"Attributes": {
|
||||
"Value": "%date [%thread] %-5level | %logger | %message%newline"
|
||||
}
|
||||
},
|
||||
{
|
||||
"XPath": "/log4net/appender[@name='ConsoleAppender']/threshold",
|
||||
"Attributes": {
|
||||
"Value": "Warn"
|
||||
}
|
||||
},
|
||||
{
|
||||
"XPath": "/log4net/appender[@name='DataStoreLogger']/threshold",
|
||||
"Attributes": {
|
||||
"Value": "Warn"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"System.Net.Http.HttpClient": "Information"
|
||||
}
|
||||
},
|
||||
"Log4NetCore": {
|
||||
"Name": "Log4NetLogViewer_default",
|
||||
"LoggerRepository": "LogViewerRepository",
|
||||
"OverrideCriticalLevelWith": "Critical",
|
||||
"Watch": false,
|
||||
"UseWebOrAppConfig": false,
|
||||
"PropertyOverrides": [
|
||||
{
|
||||
"XPath": "/log4net/appender[@name='ConsoleAppender']/layout/conversionPattern",
|
||||
"Attributes": {
|
||||
"Value": "%date [%thread] %-5level | %logger | %message%newline"
|
||||
}
|
||||
},
|
||||
{
|
||||
"XPath": "/log4net/appender[@name='ConsoleAppender']/threshold",
|
||||
"Attributes": {
|
||||
"Value": "Info"
|
||||
}
|
||||
},
|
||||
{
|
||||
"XPath": "/log4net/appender[@name='DataStoreLogger']/threshold",
|
||||
"Attributes": {
|
||||
"Value": "Info"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<log4net>
|
||||
<appender name="DebugAppender" type="log4net.Appender.DebugAppender" >
|
||||
<layout type="log4net.Layout.PatternLayout">
|
||||
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
|
||||
</layout>
|
||||
</appender>
|
||||
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
|
||||
<threshold value="ALL" />
|
||||
<layout type="log4net.Layout.PatternLayout">
|
||||
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
|
||||
</layout>
|
||||
</appender>
|
||||
<appender name="DataStoreLogger" type="Log4Net.Appender.LogView.Core.DataStoreLoggerServiceAppender">
|
||||
<threshold value="ALL" />
|
||||
</appender>
|
||||
<root>
|
||||
<Level value="ALL" />
|
||||
<appender-ref ref="DebugAppender" />
|
||||
<appender-ref ref="ConsoleAppender" />
|
||||
<appender-ref ref="DataStoreLogger" />
|
||||
</root>
|
||||
</log4net>
|
||||
Reference in New Issue
Block a user