Skip to content

Commit 881c5ce

Browse files
Merge pull request #463 from nventive/dev/maso/updatepackages
chore: update external dependencies after .net10 update
2 parents f01b735 + cc57a54 commit 881c5ce

File tree

20 files changed

+85
-42
lines changed

20 files changed

+85
-42
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Prefix your items with `(Template)` if the change is about the template and not
1111
- Updated android aot profile and profiling packages to 10.0.0-preview1.
1212
- Set MtouchUseLlvm to false for iOS release build to fix build time issue.
1313
- Changed the way that iOS app icons are added to the project.
14+
- Updated external dependencies packages versions.
1415

1516
## 3.11.X
1617
- Added API Client tests project.

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<PrivateAssets>all</PrivateAssets>
55
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
66
</PackageReference>
7-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
7+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.101">
88
<PrivateAssets>all</PrivateAssets>
99
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1010
</PackageReference>
1111
<!-- Microsoft.VisualStudio.Threading.Analyzers has the async void analyzers. -->
12-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2" PrivateAssets="all" />
12+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" PrivateAssets="all" />
1313
<PackageReference Include="GooseAnalyzers" Version="1.0.0" PrivateAssets="all" />
1414
</ItemGroup>
1515

src/app/ApplicationTemplate.Access/ApplicationTemplate.Access.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="DynamicData" Version="9.2.1" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.3" />
23-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.3" />
24-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
25-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.3" />
21+
<PackageReference Include="DynamicData" Version="9.4.1" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.1" />
23+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
24+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
25+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
2626
<PackageReference Include="Reactive.Annex" Version="2.0.1" />
27-
<PackageReference Include="Refit" Version="8.0.0" />
27+
<PackageReference Include="Refit" Version="9.0.2" />
2828
<PackageReference Include="ReviewService.Abstractions" Version="1.0.0" />
2929
<PackageReference Include="MallardMessageHandlers" Version="2.0.0" />
3030
<PackageReference Include="Nventive.Persistence.Reactive" Version="0.5.0" />
3131
<PackageReference Include="Nventive.Persistence" Version="0.5.0" />
32-
<PackageReference Include="System.Reactive" Version="6.0.1" />
32+
<PackageReference Include="System.Reactive" Version="6.1.0" />
3333
</ItemGroup>
3434
</Project>

src/app/ApplicationTemplate.Access/PlatformServices/Email/MockedEmailService.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ public MockedEmailService(ILogger<MockedEmailService> logger)
1515

1616
public Task Compose(CancellationToken ct, Email email)
1717
{
18-
_logger.LogInformation("Email composed: {Email}", email);
18+
if (_logger.IsEnabled(LogLevel.Information))
19+
{
20+
_logger.LogInformation("Email composed: {Email}", email);
21+
}
1922
return Task.CompletedTask;
2023
}
2124
}

src/app/ApplicationTemplate.Business/KillSwitch/KillSwitchService.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,11 @@ public KillSwitchService(IKillSwitchDataSource killSwitchDataSource, ILogger<Kil
2626

2727
/// <inheritdoc/>
2828
public IObservable<bool> ObserveKillSwitchActivation() => _killSwitchDataSource.ObserveKillSwitchActivation()
29-
.Do(isActive => _logger.LogInformation("Kill switch is now {IsActive}.", isActive));
29+
.Do(isActive =>
30+
{
31+
if (_logger.IsEnabled(LogLevel.Information))
32+
{
33+
_logger.LogInformation("Kill switch is now {IsActive}.", isActive);
34+
}
35+
});
3036
}

src/app/ApplicationTemplate.Mobile/ApplicationTemplate.Mobile.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PackageReference Include="Chinook.SectionsNavigation.Uno.WinUI" Version="4.0.1" />
2323
<PackageReference Include="ExtendedSplashScreen.Uno.WinUI" Version="2.0.1" />
2424
<PackageReference Include="MessageDialogService.Uno.WinUI" Version="2.0.0" />
25-
<PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.50" />
25+
<PackageReference Include="Microsoft.Maui.Essentials" Version="10.0.20" />
2626
<PackageReference Include="Nventive.Persistence.Uno.WinUI" Version="0.5.1-dev.57" />
2727
<PackageReference Include="Nventive.View.Uno.WinUI" Version="0.7.0-dev.88" />
2828
<PackageReference Include="Reactive.Annex.Uno.WinUI" Version="2.0.1" />
@@ -36,9 +36,9 @@
3636
<PackageReference Include="Uno.WinUI.DevServer" Version="5.6.81" Condition="'$(Configuration)'=='Debug'" />
3737
<PackageReference Include="Uno.WinUI.Lottie" Version="5.6.81" />
3838
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.6.81" />
39-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
39+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.1" />
4040
<PackageReference Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
41-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
41+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
4242

4343
<!-- It would normally be a transitive dependency, however, the version included with one of the packages has a vulnerability. -->
4444
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
@@ -152,7 +152,7 @@
152152
<PropertyGroup>
153153
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
154154
<MtouchExtraArgs>$(MtouchExtraArgs) --xml=./iOS/LinkerExclusions.xml --linkskip=$(AssemblyName)</MtouchExtraArgs>
155-
<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>
155+
<MtouchInterpreter>-all,Microsoft.Maui.Controls.HotReload.Forms</MtouchInterpreter>
156156
<!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
157157
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
158158
<!-- See https://github.com/xamarin/xamarin-macios/issues/14812 for more details. -->

src/app/ApplicationTemplate.Presentation/ApplicationTemplate.Presentation.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="ByteSize" Version="2.1.2" />
20-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.3" />
21-
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.3" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
20+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
21+
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="10.0.1" />
22+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.1" />
2323
<PackageReference Include="ReviewService" Version="1.0.0" />
24-
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
25-
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
24+
<PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
25+
<PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
2626
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
2727
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="9.5.4" />
2828
<PackageReference Include="Chinook.DynamicMvvm" Version="3.0.1" />

src/app/ApplicationTemplate.Presentation/Configuration/ErrorConfiguration.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ public static void OnUnhandledException(Exception exception, bool isTerminating,
4141
}
4242

4343
var logger = services.GetRequiredService<ILogger<CoreStartup>>();
44-
logger.LogError(exception, "An unhandled exception occurred. StackTrace: {StackTrace}", exception.StackTrace);
44+
45+
if (logger.IsEnabled(LogLevel.Error))
46+
{
47+
logger.LogError(exception, "An unhandled exception occurred. StackTrace: {StackTrace}", exception.StackTrace);
48+
}
4549
}
4650

4751
private static async Task HandleCommandException(CancellationToken ct, IDynamicCommand command, Exception exception, IServiceProvider services)

src/app/ApplicationTemplate.Presentation/CoreStartup.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,10 @@ private void SuscribeToKillSwitch(IServiceProvider serviceProvider)
229229
killSwitchService.ObserveKillSwitchActivation()
230230
.SelectManyDisposePrevious(async (activated, ct) =>
231231
{
232-
Logger.LogTrace("Kill switch activation changed to {Activated}.", activated);
232+
if (Logger.IsEnabled(LogLevel.Trace))
233+
{
234+
Logger.LogTrace("Kill switch activation changed to {Activated}.", activated);
235+
}
233236

234237
if (activated)
235238
{

src/app/ApplicationTemplate.Presentation/Framework/DataLoader/LogErrorDataLoaderStrategy.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ public override async Task<object> Load(CancellationToken ct, IDataLoaderRequest
3131
}
3232
catch (Exception error)
3333
{
34-
_logger.LogError(error, "Failed to load request '{RequestSequenceId}' in DataLoader '{DataLoaderName}'.", request.SequenceId, request.Context.GetDataLoaderName());
34+
if (_logger.IsEnabled(LogLevel.Error))
35+
{
36+
_logger.LogError(error, "Failed to load request '{RequestSequenceId}' in DataLoader '{DataLoaderName}'.", request.SequenceId, request.Context.GetDataLoaderName());
37+
}
3538

3639
throw;
3740
}

0 commit comments

Comments
 (0)