Merge pull request #1 from nventive/dev/arde/fix-canaries-errors

fix: fix to unoThemes issues
nventive · Apr 19, 2024 · 99f5073 · 99f5073
2 parents 7ce8ef8 + 8efdb4f
commit 99f5073
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 35 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,12 +1,11 @@
 GitHub Issue: #
 
 ## Proposed Changes
-<!-- Please check one or more that apply to this PR. -->
+<!-- This repo is the Canary from the UnoApplicationTemplate project
+    so all PRs should be fixing bugs and not be about adding new features.
+    Please check one or more that apply to this PR. -->
 
  - [ ] Bug fix
- - [ ] Feature
- - [ ] Code style update (formatting)
- - [ ] Refactoring (no functional changes, no api changes)
  - [ ] Build or CI related changes
  - [ ] Documentation content changes
  - [ ] Other, please describe:
@@ -17,7 +16,8 @@ GitHub Issue: #
 
 
 ## Impact on version
-<!-- Please select one or more based on your commits. -->
+<!-- What would be the impact on the version if these changes would be merged back into the main repository?
+    Please select one or more based on your commits. -->
 
 - [ ] **Major**
   - The template structure was changed.

diff --git a/src/app/ApplicationTemplate.Mobile/ApplicationTemplate.Mobile.csproj b/src/app/ApplicationTemplate.Mobile/ApplicationTemplate.Mobile.csproj
@@ -18,8 +18,8 @@
 	<ItemGroup>
 		<PackageReference Include="Chinook.BackButtonManager.Uno.WinUI" Version="2.1.0" />
 		<PackageReference Include="Chinook.DataLoader.Uno.WinUI" Version="2.0.0" />
-		<PackageReference Include="Chinook.DynamicMvvm.Uno.WinUI" Version="2.0.0" />
-		<PackageReference Include="Chinook.SectionsNavigation.Uno.WinUI" Version="3.0.0" />
+		<PackageReference Include="Chinook.DynamicMvvm.Uno.WinUI" Version="2.1.0" />
+		<PackageReference Include="Chinook.SectionsNavigation.Uno.WinUI" Version="3.0.2" />
 		<PackageReference Include="ExtendedSplashScreen.Uno.WinUI" Version="2.0.0" />
 		<PackageReference Include="MessageDialogService.Uno.WinUI" Version="2.0.0" />
 		<PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.3" />
@@ -28,14 +28,15 @@
 		<PackageReference Include="Reactive.Annex.Uno.WinUI" Version="2.0.0" />
 		<PackageReference Include="ReviewService.NativePrompters" Version="1.0.0" />
 		<PackageReference Include="Uno.CommunityToolkit.WinUI" Version="7.1.200" />
-		<PackageReference Include="Uno.Material.WinUI" Version="4.0.6" />
+		<PackageReference Include="Uno.Material.WinUI" Version="4.2.0-dev.18" />
 		<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="Uno.Themes.WinUI" Version="4.2.0-dev.18" />
+		<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="5.2.0-dev.32" />
+		<PackageReference Include="Uno.WinUI" Version="5.2.0-dev.1012" />
+		<PackageReference Include="Uno.WinUI.DevServer" Version="5.2.0-dev.1012" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.WinUI.Lottie" Version="5.2.0-dev.1012" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.2.0-dev.1016" />
 		<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" />
@@ -199,7 +200,7 @@
 				</When>
 			</Choose>
 			<ItemGroup>
-				<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
+				<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.8.0-dev.1" />
 			</ItemGroup>
 			<ItemGroup>
 				<TrimmerRootDescriptor Include="iOS\LinkerExclusions.xml" />

diff --git a/src/app/ApplicationTemplate.Presentation/ApplicationTemplate.Presentation.csproj b/src/app/ApplicationTemplate.Presentation/ApplicationTemplate.Presentation.csproj
@@ -26,15 +26,15 @@
 		<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="2.0.0" />
-		<PackageReference Include="Chinook.DynamicMvvm.Reactive" Version="2.0.0" />
-		<PackageReference Include="Chinook.DynamicMvvm.FluentValidation" Version="2.0.0" />
-		<PackageReference Include="Chinook.DynamicMvvm.CollectionTracking" Version="2.0.0" />
+		<PackageReference Include="Chinook.DynamicMvvm" Version="2.1.0" />
+		<PackageReference Include="Chinook.DynamicMvvm.Reactive" Version="2.1.0" />
+		<PackageReference Include="Chinook.DynamicMvvm.FluentValidation" Version="2.1.0" />
+		<PackageReference Include="Chinook.DynamicMvvm.CollectionTracking" Version="2.1.0" />
 		<PackageReference Include="Chinook.DataLoader" Version="2.0.0" />
 		<PackageReference Include="Chinook.DataLoader.DynamicMvvm" Version="2.0.0" />
 		<PackageReference Include="Chinook.BackButtonManager" Version="2.1.0" />
-		<PackageReference Include="Chinook.SectionsNavigation" Version="3.0.0" />
-		<PackageReference Include="Chinook.SectionsNavigation.Reactive" Version="3.0.0" />
+		<PackageReference Include="Chinook.SectionsNavigation" Version="3.0.2" />
+		<PackageReference Include="Chinook.SectionsNavigation.Reactive" Version="3.0.2" />
 		<PackageReference Include="MessageDialogService" Version="2.0.0" />
 		<PackageReference Include="Uno.Injectable" Version="2.0.0-dev.10" />
 		<PackageReference Include="Uno.CodeGen" Version="2.0.0-dev.10" />

diff --git a/src/app/ApplicationTemplate.Shared.Views/ApplicationTemplate.Shared.Views.projitems b/src/app/ApplicationTemplate.Shared.Views/ApplicationTemplate.Shared.Views.projitems
@@ -36,11 +36,17 @@
     <Compile Include="$(MSBuildThisFileDirectory)Content\Authentication\SentEmailConfirmationPage.xaml.cs">
       <DependentUpon>SentEmailConfirmationPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Content\DadJokes\DadJokesFavoritesPage.xaml.cs">
+      <DependentUpon>DadJokesFavoritesPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Content\DadJokes\DadJokesFiltersPage.xaml.cs">
       <DependentUpon>DadJokesFiltersPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Content\DadJokes\DadJokesPage.xaml.cs">
       <DependentUpon>DadJokesPage.xaml</DependentUpon>
+    </Compile>
+     <Compile Include="$(MSBuildThisFileDirectory)Content\DadJokes\DadJokesSearchPage.xaml.cs">
+      <DependentUpon>DadJokesSearchPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Content\Diagnostics\ConfigurationDebuggerView.xaml.cs">
       <DependentUpon>ConfigurationDebuggerView.xaml</DependentUpon>
@@ -203,13 +209,21 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Content\DadJokes\DadJokesFavoritesPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Content\DadJokes\DadJokesFiltersPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="$(MSBuildThisFileDirectory)Content\DadJokes\DadJokesPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
+    </Page>
+     <Page Include="$(MSBuildThisFileDirectory)Content\DadJokes\DadJokesSearchPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="$(MSBuildThisFileDirectory)Content\Diagnostics\ConfigurationDebuggerView.xaml">
       <SubType>Designer</SubType>

diff --git a/src/app/ApplicationTemplate.Shared.Views/Content/DadJokes/DadJokesFavoritesPage.xaml b/src/app/ApplicationTemplate.Shared.Views/Content/DadJokes/DadJokesFavoritesPage.xaml
@@ -4,7 +4,7 @@
 	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	  xmlns:dl="using:Chinook.DataLoader"
 	  xmlns:u="using:Nventive.View.Controls"
-	  xmlns:um="using:Uno.Material"
+	  xmlns:ut="using:Uno.Themes"
 	  xmlns:android="http://uno.ui/android"
 	  xmlns:not_android="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	  mc:Ignorable="android">
@@ -77,11 +77,11 @@
 										</ToggleButton.Content>
 
 										<!-- IsChecked:True Content -->
-										<um:ControlExtensions.AlternateContent>
+										<ut:ControlExtensions.AlternateContent>
 
 											<!-- Icon -->
 											<u:PathControl Style="{StaticResource FilledHeartPathControlStyle}" />
-										</um:ControlExtensions.AlternateContent>
+										</ut:ControlExtensions.AlternateContent>
 									</ToggleButton>
 								</Grid>
 							</DataTemplate>

diff --git a/src/app/ApplicationTemplate.Shared.Views/Content/DadJokes/DadJokesFavoritesPage.xaml.cs b/src/app/ApplicationTemplate.Shared.Views/Content/DadJokes/DadJokesFavoritesPage.xaml.cs
@@ -1,4 +1,4 @@
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 
 // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 

diff --git a/src/app/ApplicationTemplate.Shared.Views/Content/DadJokes/DadJokesPage.xaml b/src/app/ApplicationTemplate.Shared.Views/Content/DadJokes/DadJokesPage.xaml
@@ -4,7 +4,7 @@
 	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	  xmlns:dl="using:Chinook.DataLoader"
 	  xmlns:u="using:Nventive.View.Controls"
-	  xmlns:um="using:Uno.Material"
+	  xmlns:ut="using:Uno.Themes"
 	  xmlns:android="http://uno.ui/android"
 	  xmlns:not_android="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	  mc:Ignorable="android">
@@ -110,11 +110,11 @@
 										</ToggleButton.Content>
 
 										<!-- IsChecked:True Content -->
-										<um:ControlExtensions.AlternateContent>
+										<ut:ControlExtensions.AlternateContent>
 
 											<!-- Icon -->
 											<u:PathControl Style="{StaticResource FilledHeartPathControlStyle}" />
-										</um:ControlExtensions.AlternateContent>
+										</ut:ControlExtensions.AlternateContent>
 									</ToggleButton>
 								</Grid>
 							</DataTemplate>

diff --git a/src/app/ApplicationTemplate.Shared.Views/Content/DadJokes/DadJokesSearchPage.xaml b/src/app/ApplicationTemplate.Shared.Views/Content/DadJokes/DadJokesSearchPage.xaml
@@ -4,7 +4,7 @@
 	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	  xmlns:dl="using:Chinook.DataLoader"
 	  xmlns:u="using:Nventive.View.Controls"
-	  xmlns:um="using:Uno.Material"
+	  xmlns:ut="using:Uno.Themes"
 	  xmlns:android="http://uno.ui/android"
 	  xmlns:not_android="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	  mc:Ignorable="android">
@@ -139,11 +139,11 @@
 										</ToggleButton.Content>
 
 										<!-- IsChecked:True Content -->
-										<um:ControlExtensions.AlternateContent>
+										<ut:ControlExtensions.AlternateContent>
 
 											<!-- Icon -->
 											<u:PathControl Style="{StaticResource FilledHeartPathControlStyle}" />
-										</um:ControlExtensions.AlternateContent>
+										</ut:ControlExtensions.AlternateContent>
 									</ToggleButton>
 								</Grid>
 							</DataTemplate>

diff --git a/src/app/ApplicationTemplate.Shared.Views/Content/DadJokes/DadJokesSearchPage.xaml.cs b/src/app/ApplicationTemplate.Shared.Views/Content/DadJokes/DadJokesSearchPage.xaml.cs
@@ -1,4 +1,4 @@
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 
 // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 

diff --git a/src/app/ApplicationTemplate.Windows/ApplicationTemplate.Windows.csproj b/src/app/ApplicationTemplate.Windows/ApplicationTemplate.Windows.csproj
@@ -70,8 +70,8 @@
 	<ItemGroup>
 		<PackageReference Include="Chinook.BackButtonManager.Uno.WinUI" Version="2.1.0" />
 		<PackageReference Include="Chinook.DataLoader.Uno.WinUI" Version="2.0.0" />
-		<PackageReference Include="Chinook.DynamicMvvm.Uno.WinUI" Version="2.0.0" />
-		<PackageReference Include="Chinook.SectionsNavigation.Uno.WinUI" Version="3.0.0" />
+		<PackageReference Include="Chinook.DynamicMvvm.Uno.WinUI" Version="2.1.0" />
+		<PackageReference Include="Chinook.SectionsNavigation.Uno.WinUI" Version="3.0.2" />
 		<PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" />
 		<PackageReference Include="ExtendedSplashScreen.Uno.WinUI" Version="2.0.0" />
 		<PackageReference Include="MessageDialogService.Uno.WinUI" Version="2.0.0" />
@@ -86,8 +86,9 @@
 		<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.Material.WinUI" Version="4.0.6" />
-		<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="5.0.17" />
+		<PackageReference Include="Uno.Material.WinUI" Version="4.2.0-dev.18" />
+		<PackageReference Include="Uno.Themes.WinUI" Version="4.2.0-dev.18" />
+		<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="5.2.0-dev.32" />
 	</ItemGroup>
 
 	<ItemGroup>