Skip to content

Commit e8f20d1

Browse files
Soap-141Soap-141
committed
chore: Cleanup
1 parent 8bc2fc2 commit e8f20d1

File tree

18 files changed

+103
-123
lines changed

18 files changed

+103
-123
lines changed

‎APP_README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ This repository was generated using the **nventive Mobile Template**.
2020
### Local Development Requirements
2121
All development is expected to be done from Visual Studio in a Windows environment.
2222

23-
- .NET 8
24-
- Visual Studio 2022 (17.4 and above)
23+
- .NET 9
24+
- Visual Studio 2022 (17.12 and above)
2525
- We recommend validating your components using this [Uno guide](https://platform.uno/docs/articles/get-started-vs-2022.html).
2626
- For mobile development, MAUI workloads are required.
2727
- You can install them using [`uno-check`](https://platform.uno/docs/articles/external/uno.check/doc/using-uno-check.html).
28-
- For local iOS compilation and debugging, you need access to Mac with Xcode 14.2 (more recent versions may work too).
28+
- For local iOS compilation and debugging, you need access to Mac with Xcode 16 (more recent versions may work too).
2929
> 💡 You'll need an [Apple provisioning profile](https://developer.apple.com/help/account/manage-profiles/create-a-development-provisioning-profile/) to start your application.
3030
3131
### Pipelines Requirements
@@ -42,7 +42,7 @@ If you're unfamiliar with Azure Pipeline, you should at least read about the fol
4242
- You can follow [this guide](https://learn.microsoft.com/en-us/azure/devops/pipelines/get-started/pipelines-sign-up?view=azure-devops) for more details.
4343
- For compilation, access to the the following [Microsoft-hosted agents](https://learn.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml) is required.
4444
- `windows-2022`
45-
- `macOS-13`
45+
- `macOS-15`
4646
- For deployment, access to Mac agents with the following capabilities is required.
4747
- `fastlane 2.212.1`
4848

‎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
- Moved many components from the presentation layer to the data access layer.
1212
- Disabled simulated API call delays in automated tests.
1313
- Updated Configuration documentation and uno workaround comment.
14+
- Cleanup (fixes warnings on Windows, fixes vulnerabilities and renamed extensions) & Update packages.
1415

1516
## 3.8.X
1617
- Updated from .NET 8 to .NET 9.

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
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.12.19" PrivateAssets="all" />
12+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2" PrivateAssets="all" />
1313
<PackageReference Include="GooseAnalyzers" Version="1.0.0" PrivateAssets="all" />
1414
</ItemGroup>
1515

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ From left to right: WinUI, iOS, and Android.
2121

2222
## Requirements
2323

24-
Visual Studio 2022 with .NET 8 are required.
24+
Visual Studio 2022 with .NET 9 are required.
2525

2626
This template largely relies on Uno Platform, if you want to make sure you got everything installed correctly on your machine, we encourage you to use `uno-check`, the documentation is available [here](https://platform.uno/docs/articles/uno-check.html)
2727

‎src/ApplicationTemplate.sln‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,34 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{8711E408-6
1111
..\.azure-pipelines.yml = ..\.azure-pipelines.yml
1212
..\.editorconfig = ..\.editorconfig
1313
..\.gitignore = ..\.gitignore
14+
..\APP_README.md = ..\APP_README.md
15+
..\CODE_OF_CONDUCT.md = ..\CODE_OF_CONDUCT.md
16+
..\CONTRIBUTING.md = ..\CONTRIBUTING.md
1417
..\Directory.Build.props = ..\Directory.Build.props
1518
..\nuget.config = ..\nuget.config
19+
..\README.md = ..\README.md
1620
..\stylecop.json = ..\stylecop.json
1721
EndProjectSection
1822
EndProject
1923
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{4A31B4ED-94EB-43BC-91DD-7B142DEB887C}"
2024
ProjectSection(SolutionItems) = preProject
2125
..\doc\Architecture.md = ..\doc\Architecture.md
26+
..\doc\AzurePipelines.md = ..\doc\AzurePipelines.md
2227
..\CHANGELOG.md = ..\CHANGELOG.md
2328
..\doc\Configuration.md = ..\doc\Configuration.md
29+
..\doc\DataLoading.md = ..\doc\DataLoading.md
30+
..\doc\DefaultAnalytics.md = ..\doc\DefaultAnalytics.md
2431
..\doc\DependencyInjection.md = ..\doc\DependencyInjection.md
32+
..\doc\Diagnostics.md = ..\doc\Diagnostics.md
2533
..\doc\Environments.md = ..\doc\Environments.md
2634
..\doc\ErrorHandling.md = ..\doc\ErrorHandling.md
35+
..\doc\ForcedUpdate.md = ..\doc\ForcedUpdate.md
2736
..\doc\HTTP.md = ..\doc\HTTP.md
37+
..\doc\KillSwitch.md = ..\doc\KillSwitch.md
2838
..\doc\Localization.md = ..\doc\Localization.md
2939
..\doc\Logging.md = ..\doc\Logging.md
3040
..\doc\PlatformSpecifics.md = ..\doc\PlatformSpecifics.md
31-
..\README.md = ..\README.md
41+
..\doc\Reviews.md = ..\doc\Reviews.md
3242
..\doc\Scheduling.md = ..\doc\Scheduling.md
3343
..\doc\Serialization.md = ..\doc\Serialization.md
3444
..\doc\Startup.md = ..\doc\Startup.md
@@ -64,8 +74,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6E8378CB
6474
..\build\canary-merge.yml = ..\build\canary-merge.yml
6575
..\build\gitversion-config.yml = ..\build\gitversion-config.yml
6676
..\build\stage-build.yml = ..\build\stage-build.yml
67-
..\build\stage-release-firebase-app-distribution.yml = ..\build\stage-release-firebase-app-distribution.yml
6877
..\build\stage-release-appstore.yml = ..\build\stage-release-appstore.yml
78+
..\build\stage-release-firebase-app-distribution.yml = ..\build\stage-release-firebase-app-distribution.yml
6979
..\build\stage-release-googleplay.yml = ..\build\stage-release-googleplay.yml
7080
..\build\steps-build-android.yml = ..\build\steps-build-android.yml
7181
..\build\steps-build-ios.yml = ..\build\steps-build-ios.yml

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="DynamicData" Version="9.1.1" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
20-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.1" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
22-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.1" />
18+
<PackageReference Include="DynamicData" Version="9.2.1" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.3" />
20+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.3" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
22+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.3" />
2323
<PackageReference Include="Reactive.Annex" Version="2.0.0" />
2424
<PackageReference Include="Refit" Version="8.0.0" />
2525
<PackageReference Include="ReviewService.Abstractions" Version="1.0.0" />
26-
<PackageReference Include="System.Text.Json" Version="9.0.1" />
26+
<PackageReference Include="System.Text.Json" Version="9.0.3" />
2727
<PackageReference Include="MallardMessageHandlers" Version="2.0.0" />
2828
<PackageReference Include="Nventive.Persistence.Reactive" Version="0.5.0" />
2929
<PackageReference Include="Nventive.Persistence" Version="0.5.0" />

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,26 @@
2222
<PackageReference Include="Chinook.SectionsNavigation.Uno.WinUI" Version="3.0.2" />
2323
<PackageReference Include="ExtendedSplashScreen.Uno.WinUI" Version="2.0.0" />
2424
<PackageReference Include="MessageDialogService.Uno.WinUI" Version="2.0.0" />
25-
<PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.30" />
25+
<PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.50" />
2626
<PackageReference Include="Nventive.Persistence.Uno.WinUI" Version="0.5.0" />
2727
<PackageReference Include="Nventive.View.Uno.WinUI" Version="0.6.0" />
2828
<PackageReference Include="Reactive.Annex.Uno.WinUI" Version="2.0.0" />
2929
<PackageReference Include="ReviewService.NativePrompters" Version="1.0.0" />
3030
<PackageReference Include="Uno.CommunityToolkit.WinUI" Version="7.1.204" />
31-
<PackageReference Include="Uno.Material.WinUI" Version="5.3.1" />
31+
<PackageReference Include="Uno.Material.WinUI" Version="5.4.0" />
3232
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Interactivity.WinUI" Version="2.4.2" />
3333
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.4.2" />
34-
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="6.3.7" />
35-
<PackageReference Include="Uno.WinUI" Version="5.6.30" />
36-
<PackageReference Include="Uno.WinUI.DevServer" Version="5.6.30" Condition="'$(Configuration)'=='Debug'" />
37-
<PackageReference Include="Uno.WinUI.Lottie" Version="5.6.30" />
38-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.6.30" />
39-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
34+
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="6.4.3" />
35+
<PackageReference Include="Uno.WinUI" Version="5.6.81" />
36+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.6.81" Condition="'$(Configuration)'=='Debug'" />
37+
<PackageReference Include="Uno.WinUI.Lottie" Version="5.6.81" />
38+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.6.81" />
39+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
4040
<PackageReference Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
4141
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
42+
43+
<!-- It would normally be a transitive dependency, however, the version included with one of the packages has a vulnerability. -->
44+
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
4245
</ItemGroup>
4346
<ItemGroup>
4447
<ProjectReference Include="..\ApplicationTemplate.Access\ApplicationTemplate.Access.csproj" />
@@ -102,6 +105,9 @@
102105
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.37" />
103106
<PackageReference Include="Mono.AotProfiler.Android" Version="7.0.0" />
104107
<PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="2.0.21.2" />
108+
109+
<!-- Required with the last version of Uno otherwise an exception is thrown in the main activity. -->
110+
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.5" />
105111
</ItemGroup>
106112
<ItemGroup>
107113
<AndroidAotProfile Include="custom.aprof" />

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

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

1818
<ItemGroup>
1919
<PackageReference Include="ByteSize" Version="2.1.2" />
20-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
21-
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.1" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
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" />
2323
<PackageReference Include="ReviewService" Version="1.0.0" />
2424
<PackageReference Include="Uno.SourceGenerationTasks" Version="4.2.0" />
2525
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />

‎src/app/ApplicationTemplate.Presentation/ViewModels/Authentication/CreateAccountFormViewModel.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Chinook.DynamicMvvm;
33
using FluentValidation;
44
using Microsoft.Extensions.Localization;
5-
using Presentation;
65
using Uno.Extensions;
76

87
namespace ApplicationTemplate.Presentation;

src/app/ApplicationTemplate.Presentation/ViewModels/Extensions/ValidatorExtensions.cs renamed to src/app/ApplicationTemplate.Presentation/ViewModels/Extensions/IRuleBuilder.Extensions.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
using System;
22
using System.Globalization;
33
using System.Linq;
4-
using System.Text;
5-
using FluentValidation;
64
using Uno.Extensions;
75

8-
namespace Presentation;
6+
namespace FluentValidation;
97

10-
public static class ValidatorExtensions
8+
public static class RuleBuilderExtensions
119
{
1210
/// <summary>
1311
/// Adds a validation rule that checks whether the age is over 18 years old based on the date of birth.

0 commit comments

Comments
 (0)