Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: update to uno 5 #381

Merged
merged 2 commits into from
Dec 15, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

Prefix your items with `(Template)` if the change is about the template and not the resulting application.

## 3.0.X
- Updated to Uno 5.

## 2.2.X
- Added hooks for default analytics (page views and command invocations).
- Renamed the `AnalyticsDataLoaderStrategy` to `MonitoringDataLoaderStrategy`. (The same renaming was applied to related methods and classes).
Expand Down
26 changes: 15 additions & 11 deletions build/templates/dotnet-install.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
parameters:
- name: installMobileWorkload
type: boolean
default: true
DotNetVersion: '7.0.400'
UnoCheck_Version: '1.17.0'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/262bebd06e916ec022b8fdc4a2a9df14f0554b92/manifests/uno.ui.manifest.json'

steps:
- task: UseDotNet@2
displayName: 'Install .NET SDK'
inputs:
packageType: 'sdk'
version: '7.0.203'
- task: UseDotNet@2
displayName: 'Use .NET SDK ${{ parameters.DotNetVersion }}'
inputs:
packageType: 'sdk'
version: ${{ parameters.DotNetVersion }}

- powershell: dotnet workload install maui --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json
condition: ${{ parameters.installMobileWorkload }}
displayName: Install .NET MAUI Workload
- powershell: |
& dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
& uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --skip androidsdk --skip androidemulator --manifest ${{ parameters.UnoCheck_Manifest }}
displayName: Install .NET Workloads | Uno Check
errorActionPreference: continue
ignoreLASTEXITCODE: true
retryCountOnTaskFailure: 3
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.0" />
<PackageReference Include="Reactive.Annex" Version="0.6.0-dev.50" />
<PackageReference Include="Reactive.Annex" Version="2.0.0-feature.Uno5.2" />
carlh98 marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Refit" Version="7.0.0" />
<PackageReference Include="ReviewService.Abstractions" Version="1.0.0" />
<PackageReference Include="System.Text.Json" Version="7.0.3" />
<PackageReference Include="MallardMessageHandlers" Version="0.2.0-dev.21" />
<PackageReference Include="Nventive.Persistence.Reactive" Version="0.4.0-dev.36" />
<PackageReference Include="Nventive.Persistence" Version="0.4.0-dev.36" />
<PackageReference Include="Nventive.Persistence.Reactive" Version="0.5.0-feature.Uno5Update.49" />
<PackageReference Include="Nventive.Persistence" Version="0.5.0-feature.Uno5Update.49" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<LangVersion>10.0</LangVersion>
<LangVersion>11.0</LangVersion>
<TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
<SingleProject>true</SingleProject>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -17,25 +17,25 @@
<TrimMode>partial</TrimMode>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Chinook.BackButtonManager.Uno.WinUI" Version="1.1.2" />
<PackageReference Include="Chinook.DataLoader.Uno.WinUI" Version="1.2.0" />
<PackageReference Include="Chinook.DynamicMvvm.Uno.WinUI" Version="1.1.2" />
<PackageReference Include="Chinook.SectionsNavigation.Uno.WinUI" Version="1.1.2" />
<PackageReference Include="ExtendedSplashScreen.Uno.WinUI" Version="0.5.0-dev.60" />
<PackageReference Include="MessageDialogService.Uno.WinUI" Version="0.6.0-dev.58" />
<PackageReference Include="Nventive.Persistence.Uno.WinUI" Version="0.4.0-dev.36" />
<PackageReference Include="Nventive.View.Uno.WinUI" Version="0.5.0-dev.62" />
<PackageReference Include="Reactive.Annex.Uno.WinUI" Version="0.6.0-dev.50" />
<PackageReference Include="Chinook.BackButtonManager.Uno.WinUI" Version="2.0.0-feature.Uno5Update.8" />
<PackageReference Include="Chinook.DataLoader.Uno.WinUI" Version="2.0.0-feature.Uno5Update.7" />
<PackageReference Include="Chinook.DynamicMvvm.Uno.WinUI" Version="2.0.0-feature.Uno5Update.6" />
<PackageReference Include="Chinook.SectionsNavigation.Uno.WinUI" Version="3.0.0-feature.Uno5Update.7" />
<PackageReference Include="ExtendedSplashScreen.Uno.WinUI" Version="2.0.0-feature.Uno5Update.6" />
<PackageReference Include="MessageDialogService.Uno.WinUI" Version="2.0.0-feature.Uno5Update.10" />
<PackageReference Include="Nventive.Persistence.Uno.WinUI" Version="0.5.0-feature.Uno5Update.49" />
<PackageReference Include="Nventive.View.Uno.WinUI" Version="0.5.0-feature.Uno5Update.81" />
<PackageReference Include="Reactive.Annex.Uno.WinUI" Version="2.0.0-feature.Uno5.2" />
<PackageReference Include="ReviewService.NativePrompters" Version="1.0.0" />
<PackageReference Include="Uno.CommunityToolkit.WinUI" Version="7.1.100" />
<PackageReference Include="Uno.Material.WinUI" Version="3.0.40" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Interactivity.WinUI" Version="2.3.1-uno.2" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.1-uno.2" />
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="4.2.22" />
<PackageReference Include="Uno.WinUI" Version="4.8.24" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.8.24" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI.Lottie" Version="4.8.24" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.24" />
<PackageReference Include="Uno.CommunityToolkit.WinUI" Version="7.1.200" />
<PackageReference Include="Uno.Material.WinUI" Version="4.0.6" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Interactivity.WinUI" Version="2.4.2" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.4.2" />
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="5.0.17" />
<PackageReference Include="Uno.WinUI" Version="5.0.64" />
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.64" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.64" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.64" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="1.0.1" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="9.5.4" />
<PackageReference Include="Chinook.DynamicMvvm" Version="1.1.2" />
<PackageReference Include="Chinook.DynamicMvvm.Reactive" Version="1.1.2" />
<PackageReference Include="Chinook.DynamicMvvm.FluentValidation" Version="1.1.2" />
<PackageReference Include="Chinook.DynamicMvvm.CollectionTracking" Version="1.1.2" />
<PackageReference Include="Chinook.DataLoader" Version="1.2.0" />
<PackageReference Include="Chinook.DataLoader.DynamicMvvm" Version="1.1.0" />
<PackageReference Include="Chinook.BackButtonManager" Version="1.1.2" />
<PackageReference Include="Chinook.SectionsNavigation" Version="1.1.2" />
<PackageReference Include="Chinook.SectionsNavigation.Reactive" Version="1.1.2" />
<PackageReference Include="MessageDialogService" Version="0.5.0-dev.54" />
<PackageReference Include="Chinook.DynamicMvvm" Version="2.0.0-feature.Uno5Update.6" />
<PackageReference Include="Chinook.DynamicMvvm.Reactive" Version="2.0.0-feature.Uno5Update.6" />
<PackageReference Include="Chinook.DynamicMvvm.FluentValidation" Version="2.0.0-feature.Uno5Update.6" />
<PackageReference Include="Chinook.DynamicMvvm.CollectionTracking" Version="2.0.0-feature.Uno5Update.6" />
<PackageReference Include="Chinook.DataLoader" Version="2.0.0-feature.Uno5Update.7" />
<PackageReference Include="Chinook.DataLoader.DynamicMvvm" Version="2.0.0-feature.Uno5Update.7" />
<PackageReference Include="Chinook.BackButtonManager" Version="2.0.0-feature.Uno5Update.8" />
<PackageReference Include="Chinook.SectionsNavigation" Version="3.0.0-feature.Uno5Update.7" />
<PackageReference Include="Chinook.SectionsNavigation.Reactive" Version="3.0.0-feature.Uno5Update.7" />
<PackageReference Include="MessageDialogService" Version="2.0.0-feature.Uno5Update.10" />
<PackageReference Include="Uno.Injectable" Version="2.0.0-dev.10" />
<PackageReference Include="Uno.CodeGen" Version="2.0.0-dev.10" />
</ItemGroup>
Expand Down
5 changes: 5 additions & 0 deletions src/app/ApplicationTemplate.Shared.Views/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Microsoft.Extensions.Logging;
using Microsoft.UI.Xaml;
using Uno.Extensions;
using Uno.UI;
using Windows.Graphics.Display;

namespace ApplicationTemplate;
Expand Down Expand Up @@ -80,6 +81,10 @@ private void InitializeAndStart()
#endif
//+:cnd:noEmit

#if DEBUG
CurrentWindow.EnableHotReload();
#endif

_ = Task.Run(() => Startup.Start());
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<LangVersion>10.0</LangVersion>
<LangVersion>11.0</LangVersion>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
Expand Down Expand Up @@ -67,26 +67,25 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Chinook.BackButtonManager.Uno.WinUI" Version="1.1.2" />
<PackageReference Include="Chinook.DataLoader.Uno.WinUI" Version="1.2.0" />
<PackageReference Include="Chinook.DynamicMvvm.Uno.WinUI" Version="1.1.2" />
<PackageReference Include="Chinook.SectionsNavigation.Uno.WinUI" Version="1.1.2" />
<PackageReference Include="Chinook.BackButtonManager.Uno.WinUI" Version="2.0.0-feature.Uno5Update.8" />
<PackageReference Include="Chinook.DataLoader.Uno.WinUI" Version="2.0.0-feature.Uno5Update.7" />
<PackageReference Include="Chinook.DynamicMvvm.Uno.WinUI" Version="2.0.0-feature.Uno5Update.6" />
<PackageReference Include="Chinook.SectionsNavigation.Uno.WinUI" Version="3.0.0-feature.Uno5Update.7" />
<PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" />
<PackageReference Include="ExtendedSplashScreen.Uno.WinUI" Version="0.5.0-dev.60" />
<PackageReference Include="MessageDialogService.Uno.WinUI" Version="0.6.0-dev.58" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
<PackageReference Include="ExtendedSplashScreen.Uno.WinUI" Version="2.0.0-feature.Uno5Update.6" />
<PackageReference Include="MessageDialogService.Uno.WinUI" Version="2.0.0-feature.Uno5Update.10" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.0" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Nventive.Persistence.Uno.WinUI" Version="0.4.0-dev.36" />
<PackageReference Include="Nventive.View.Uno.WinUI" Version="0.5.0-dev.62" />
<PackageReference Include="Reactive.Annex.Uno.WinUI" Version="0.6.0-dev.50" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
<PackageReference Include="Nventive.Persistence.Uno.WinUI" Version="0.5.0-feature.Uno5Update.49" />
<PackageReference Include="Nventive.View.Uno.WinUI" Version="0.5.0-feature.Uno5Update.81" />
<PackageReference Include="Reactive.Annex.Uno.WinUI" Version="2.0.0-feature.Uno5.2" />
<PackageReference Include="ReviewService.NativePrompters" Version="1.0.0" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Interactivity.WinUI" Version="2.3.1-uno.2" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.1-uno.2" />
<PackageReference Include="Uno.Material.WinUI" Version="3.0.40" />
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="4.2.22" />
<PackageReference Include="Uno.Material.WinUI" Version="4.0.6" />
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="5.0.17" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/app/ApplicationTemplate.Windows/Package.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</Properties>

<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.19041.0" />
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.19041.0" />
</Dependencies>

<Resources>
Expand Down