Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Prefix your items with `(Template)` if the change is about the template and not
- Updated android aot profile and profiling packages to 10.0.0-preview1.
- Set MtouchUseLlvm to false for iOS release build to fix build time issue.
- Changed the way that iOS app icons are added to the project.
- Updated external dependencies packages versions.

## 3.11.X
- Added API Client tests project.
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.101">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<!-- Microsoft.VisualStudio.Threading.Analyzers has the async void analyzers. -->
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" PrivateAssets="all" />
<PackageReference Include="GooseAnalyzers" Version="1.0.0" PrivateAssets="all" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DynamicData" Version="9.2.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.3" />
<PackageReference Include="DynamicData" Version="9.4.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
<PackageReference Include="Reactive.Annex" Version="2.0.1" />
<PackageReference Include="Refit" Version="8.0.0" />
<PackageReference Include="Refit" Version="9.0.2" />
<PackageReference Include="ReviewService.Abstractions" Version="1.0.0" />
<PackageReference Include="MallardMessageHandlers" Version="2.0.0" />
<PackageReference Include="Nventive.Persistence.Reactive" Version="0.5.0" />
<PackageReference Include="Nventive.Persistence" Version="0.5.0" />
<PackageReference Include="System.Reactive" Version="6.0.1" />
<PackageReference Include="System.Reactive" Version="6.1.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ public MockedEmailService(ILogger<MockedEmailService> logger)

public Task Compose(CancellationToken ct, Email email)
{
_logger.LogInformation("Email composed: {Email}", email);
if (_logger.IsEnabled(LogLevel.Information))
{
_logger.LogInformation("Email composed: {Email}", email);
}
return Task.CompletedTask;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,11 @@ public KillSwitchService(IKillSwitchDataSource killSwitchDataSource, ILogger<Kil

/// <inheritdoc/>
public IObservable<bool> ObserveKillSwitchActivation() => _killSwitchDataSource.ObserveKillSwitchActivation()
.Do(isActive => _logger.LogInformation("Kill switch is now {IsActive}.", isActive));
.Do(isActive =>
{
if (_logger.IsEnabled(LogLevel.Information))
{
_logger.LogInformation("Kill switch is now {IsActive}.", isActive);
}
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<PackageReference Include="Chinook.SectionsNavigation.Uno.WinUI" Version="4.0.1" />
<PackageReference Include="ExtendedSplashScreen.Uno.WinUI" Version="2.0.1" />
<PackageReference Include="MessageDialogService.Uno.WinUI" Version="2.0.0" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.50" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="10.0.20" />
<PackageReference Include="Nventive.Persistence.Uno.WinUI" Version="0.5.1-dev.57" />
<PackageReference Include="Nventive.View.Uno.WinUI" Version="0.7.0-dev.88" />
<PackageReference Include="Reactive.Annex.Uno.WinUI" Version="2.0.1" />
Expand All @@ -36,9 +36,9 @@
<PackageReference Include="Uno.WinUI.DevServer" Version="5.6.81" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI.Lottie" Version="5.6.81" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.6.81" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.1" />
<PackageReference Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />

<!-- It would normally be a transitive dependency, however, the version included with one of the packages has a vulnerability. -->
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
Expand Down Expand Up @@ -152,7 +152,7 @@
<PropertyGroup>
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
<MtouchExtraArgs>$(MtouchExtraArgs) --xml=./iOS/LinkerExclusions.xml --linkskip=$(AssemblyName)</MtouchExtraArgs>
<MtouchInterpreter>-all,ByteSize,Uno.Core.Extensions,Uno.Core.Extensions.Collections,Uno.Core.Extensions.Equality,Uno.Core.Extensions.Threading,Uno.Core.Extensions.Disposables,Uno.Core.Extensions.Logging,Nventive.Persistence.Reactive,Reactive.Annex,ReviewService.Abstractions,MallardMessageHandlers,FluentValidation,Chinook.DataLoader.Abstractions,Chinook.DynamicMvvm.Abstractions,Chinook.SectionsNavigation.Abstractions,Chinook.StackNavigation.Abstractions,Chinook.BackButtonManager.Abstractions,ApplicationTemplate.Business,Chinook.DynamicMvvm.FluentValidation,Chinook.DataLoader.DynamicMvvm,Chinook.DataLoader,Microsoft.Maui.Controls.HotReload.Forms</MtouchInterpreter>
<MtouchInterpreter>-all,Microsoft.Maui.Controls.HotReload.Forms</MtouchInterpreter>
<!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
<!-- See https://github.com/xamarin/xamarin-macios/issues/14812 for more details. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

<ItemGroup>
<PackageReference Include="ByteSize" Version="2.1.2" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.1" />
<PackageReference Include="ReviewService" Version="1.0.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="9.5.4" />
<PackageReference Include="Chinook.DynamicMvvm" Version="3.0.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ public static void OnUnhandledException(Exception exception, bool isTerminating,
}

var logger = services.GetRequiredService<ILogger<CoreStartup>>();
logger.LogError(exception, "An unhandled exception occurred. StackTrace: {StackTrace}", exception.StackTrace);

if (logger.IsEnabled(LogLevel.Error))
{
logger.LogError(exception, "An unhandled exception occurred. StackTrace: {StackTrace}", exception.StackTrace);
}
}

private static async Task HandleCommandException(CancellationToken ct, IDynamicCommand command, Exception exception, IServiceProvider services)
Expand Down
5 changes: 4 additions & 1 deletion src/app/ApplicationTemplate.Presentation/CoreStartup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,10 @@ private void SuscribeToKillSwitch(IServiceProvider serviceProvider)
killSwitchService.ObserveKillSwitchActivation()
.SelectManyDisposePrevious(async (activated, ct) =>
{
Logger.LogTrace("Kill switch activation changed to {Activated}.", activated);
if (Logger.IsEnabled(LogLevel.Trace))
{
Logger.LogTrace("Kill switch activation changed to {Activated}.", activated);
}

if (activated)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ public override async Task<object> Load(CancellationToken ct, IDataLoaderRequest
}
catch (Exception error)
{
_logger.LogError(error, "Failed to load request '{RequestSequenceId}' in DataLoader '{DataLoaderName}'.", request.SequenceId, request.Context.GetDataLoaderName());
if (_logger.IsEnabled(LogLevel.Error))
{
_logger.LogError(error, "Failed to load request '{RequestSequenceId}' in DataLoader '{DataLoaderName}'.", request.SequenceId, request.Context.GetDataLoaderName());
}

throw;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,10 @@ public async Task Start()

var isFirstStart = !State.IsStarted;

Logger.LogDebug("Starting services (isFirstStart: {IsFirstStart}).", isFirstStart);
if (Logger.IsEnabled(LogLevel.Debug))
{
Logger.LogDebug("Starting services (isFirstStart: {IsFirstStart}).", isFirstStart);
}

await StartServices(ServiceProvider, isFirstStart);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,10 @@ public async Task Start()

async Task StartViewServicesWithLogs(IServiceProvider services, bool isFirstStart)
{
Logger.LogDebug("Starting view services (isFirstStart: {IsFirstStart}).", isFirstStart);
if (Logger.IsEnabled(LogLevel.Debug))
{
Logger.LogDebug("Starting view services (isFirstStart: {IsFirstStart}).", isFirstStart);
}

await StartViewServices(services, isFirstStart);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ public override void Set(string key, string value)
}
}

_logger.LogDebug("Serialized ­­­­{PairCount} key-value-pairs in {ElapsedMilliseconds}ms.", Data.Count, stopwatch.ElapsedMilliseconds);

if (_logger.IsEnabled(LogLevel.Debug))
{
_logger.LogDebug("Serialized ­­­­{PairCount} key-value-pairs in {ElapsedMilliseconds}ms.", Data.Count, stopwatch.ElapsedMilliseconds);
}
OnReload();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,12 @@ string GetValueAsString(TValue value)
{
if (value is not string && value is not bool)
{
viewModel.GetService<ILogger<TOptions>>().LogWarning("Serialization of type {TypeName} may be wrong. Consider using the valueToString parameter from the GetFromOptionsMonitor method.", typeof(TValue).Name);
var logger = viewModel.GetService<ILogger>();

if (logger.IsEnabled(LogLevel.Warning))
{
logger.LogWarning("Serialization of type {TypeName} may be wrong. Consider using the valueToString parameter from the GetFromOptionsMonitor method.", typeof(TValue).Name);
}
}

return value.ToString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,12 @@ await this.GetService<IMessageDialogService>().ShowMessage(ct, mb => mb

private async Task OnConsoleLoggingChanged(CancellationToken ct, bool isEnabled)
{
this.GetService<ILogger<LoggersDiagnosticsViewModel>>().LogInformation("{IsEnabled} console logging.", isEnabled ? "Enabling" : "Disabling");
var logger = this.GetService<ILogger<LoggersDiagnosticsViewModel>>();

if (logger.IsEnabled(LogLevel.Information))
{
logger.LogInformation("{IsEnabled} console logging.", isEnabled ? "Enabling" : "Disabling");
}

await this.GetService<IMessageDialogService>().ShowMessage(ct, mb => mb
.Title("Diagnostics")
Expand All @@ -94,7 +99,12 @@ await this.GetService<IMessageDialogService>().ShowMessage(ct, mb => mb

private async Task OnFileLoggingChanged(CancellationToken ct, bool isEnabled)
{
this.GetService<ILogger<LoggersDiagnosticsViewModel>>().LogInformation("{IsEnabled} file logging.", isEnabled ? "Enabling" : "Disabling");
var logger = this.GetService<ILogger<LoggersDiagnosticsViewModel>>();

if (logger.IsEnabled(LogLevel.Information))
{
logger.LogInformation("{IsEnabled} file logging.", isEnabled ? "Enabling" : "Disabling");
}

await this.GetService<IMessageDialogService>().ShowMessage(ct, mb => mb
.Title("Diagnostics")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@

<ItemGroup>
<PackageReference Include="AutoFixture.Xunit2" Version="4.18.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.19" />
<PackageReference Include="FluentAssertions" Version="7.1.0" />
<PackageReference Include="FluentAssertions" Version="7.2.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@

<ItemGroup>
<PackageReference Include="AutoFixture.Xunit2" Version="4.18.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.19" />
<PackageReference Include="FluentAssertions" Version="7.1.0" />
<PackageReference Include="FluentAssertions" Version="7.2.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.3.0" />
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,18 @@
<PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" />
<PackageReference Include="ExtendedSplashScreen.Uno.WinUI" Version="2.0.1" />
<PackageReference Include="MessageDialogService.Uno.WinUI" Version="2.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.13.2" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.50" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250228001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.14.15" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="10.0.20" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.1" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
<PackageReference Include="Nventive.Persistence.Uno.WinUI" Version="0.5.1-dev.57" />
<PackageReference Include="Nventive.View.Uno.WinUI" Version="0.7.0-dev.88" />
<PackageReference Include="Reactive.Annex.Uno.WinUI" Version="2.0.1" />
<PackageReference Include="ReviewService.NativePrompters" Version="1.0.0" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="Uno.Material.WinUI" Version="5.4.0" />
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="6.4.3" />

Expand Down