diff --git a/src/samples/EFCoreSample/EFCoreSample.Shared/SampleClass.cs b/src/samples/EFCoreSample/EFCoreSample.Shared/SampleClass.cs index 47fca99..e845c75 100644 --- a/src/samples/EFCoreSample/EFCoreSample.Shared/SampleClass.cs +++ b/src/samples/EFCoreSample/EFCoreSample.Shared/SampleClass.cs @@ -4,6 +4,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; namespace EFCoreSample { @@ -57,13 +58,29 @@ namespace EFCoreSample protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - // Uncomment those to enable logging - // optionsBuilder.UseLoggerFactory(LogExtensionPoint.AmbientLoggerFactory); - // optionsBuilder.EnableSensitiveDataLogging(true); + // Uncomment to see EF Core logs in the browser debugger + // EnableLogging(optionsBuilder); // When building in app, use Windows.Storage.ApplicationData.Current.LocalFolder.Path // instead of /local to get browser persistence. optionsBuilder.UseSqlite($"data source=/local/local.db"); } + + + private void EnableLogging(DbContextOptionsBuilder optionsBuilder) + { + var factory = LoggerFactory.Create(builder => + { + // The Console logger cannot yet be used until .NET WebAssembly supports threading + builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider()); + + // Exclude logs below this level + builder.SetMinimumLevel(LogLevel.Information); + }); + + // Uncomment those to enable logging + optionsBuilder.UseLoggerFactory(factory); + optionsBuilder.EnableSensitiveDataLogging(true); + } } } diff --git a/src/samples/EFCoreSample/EFCoreSample.Wasm/LinkerConfig.xml b/src/samples/EFCoreSample/EFCoreSample.Wasm/LinkerConfig.xml index 585bb5b..ed67801 100644 --- a/src/samples/EFCoreSample/EFCoreSample.Wasm/LinkerConfig.xml +++ b/src/samples/EFCoreSample/EFCoreSample.Wasm/LinkerConfig.xml @@ -2,6 +2,8 @@ + + - + diff --git a/src/samples/EFCoreSample/EFCoreSample.Wasm/Program.cs b/src/samples/EFCoreSample/EFCoreSample.Wasm/Program.cs index 5b3771d..07dda6a 100644 --- a/src/samples/EFCoreSample/EFCoreSample.Wasm/Program.cs +++ b/src/samples/EFCoreSample/EFCoreSample.Wasm/Program.cs @@ -18,8 +18,6 @@ namespace EFCoreSample.Wasm #endif SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3()); - //SQLitePCL.Batteries.Init(); - Windows.UI.Xaml.Application.Start(_ => _app = new App()); } /// diff --git a/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Abstractions.dll b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Abstractions.dll index 064474e..5ff33ce 100644 Binary files a/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Abstractions.dll and b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Abstractions.dll differ diff --git a/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Configuration.dll b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Configuration.dll new file mode 100644 index 0000000..a501aa5 Binary files /dev/null and b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Configuration.dll differ diff --git a/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Console.dll b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Console.dll index bb60469..fc8ca8c 100644 Binary files a/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Console.dll and b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Console.dll differ diff --git a/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Debug.dll b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Debug.dll index f887851..05c4bde 100644 Binary files a/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Debug.dll and b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.Debug.dll differ diff --git a/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.dll b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.dll index 662d975..6a4ea59 100644 Binary files a/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.dll and b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Microsoft.Extensions.Logging.dll differ diff --git a/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Uno.Core.dll b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Uno.Core.dll new file mode 100644 index 0000000..bc6aa9c Binary files /dev/null and b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Uno.Core.dll differ diff --git a/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Uno.Extensions.Logging.WebAssembly.Console.dll b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Uno.Extensions.Logging.WebAssembly.Console.dll new file mode 100644 index 0000000..836814a Binary files /dev/null and b/src/samples/EFCoreSample/EFCoreSample.Wasm/dotnet-sdk/Uno.Extensions.Logging.WebAssembly.Console.dll differ