Merge branch 'feature/dotnet8' into dev/cama/dotnet8

nventive · Jan 9, 2024 · 2c54a39 · 2c54a39
2 parents bfc89ea + 727b755
commit 2c54a39
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 34 deletions.
diff --git a/.azure-pipelines-api-integration-tests.yml b/.azure-pipelines-api-integration-tests.yml
@@ -1,5 +1,5 @@
 schedules:
-- cron: "00 05 * * Mon-Sun" # Format is "Minutes Hours DayOfMonth Month DayOfWeek" in UTC (that's why 05 is 1h EST)
+- cron: "00 05 * * *" # Format is "Minutes Hours DayOfMonth Month DayOfWeek" in UTC (that's why 05 is 1h EST)
   displayName: 'Nightly weekdays build - 1:00 EST'
   always: true # Start a new run even if the code didn't change (because packages might have changed).
   branches:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ Prefix your items with `(Template)` if the change is about the template and not
 - 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).
 - Remove all triggers on the API Integration tests CI.
+- Ensures API Integration tests CI runs every day of the week.
 
 ## 2.1.X
 - Install `GooseAnalyzers` to enable the `SA1600` rule with its scope limited to interfaces and improve xml documentation.

diff --git a/build/stage-release-appcenter.yml b/build/stage-release-appcenter.yml
@@ -62,8 +62,6 @@ jobs:
 - deployment: AppCenter_iOS
   pool:
     vmImage: $(macOSHostedAgentImage)
-    demands:
-    - fastlane
   variables:
   - name: artifactName
     value: $(iOSArtifactName)_${{ parameters.applicationEnvironment }}

diff --git a/src/app/ApplicationTemplate.Access/ApplicationTemplate.Access.csproj b/src/app/ApplicationTemplate.Access/ApplicationTemplate.Access.csproj
@@ -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="2.0.0-feature.Uno5.2" />
+		<PackageReference Include="Reactive.Annex" Version="2.0.0" />
 		<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.5.0-feature.Uno5Update.49" />
-		<PackageReference Include="Nventive.Persistence" Version="0.5.0-feature.Uno5Update.49" />
+		<PackageReference Include="Nventive.Persistence.Reactive" Version="0.5.0" />
+		<PackageReference Include="Nventive.Persistence" Version="0.5.0" />
 		<PackageReference Include="System.Reactive" Version="5.0.0" />
 	</ItemGroup>
 </Project>
diff --git a/src/app/ApplicationTemplate.Mobile/ApplicationTemplate.Mobile.csproj b/src/app/ApplicationTemplate.Mobile/ApplicationTemplate.Mobile.csproj
@@ -17,15 +17,15 @@
 		<TrimMode>partial</TrimMode>
 	</PropertyGroup>
 	<ItemGroup>
-		<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="Chinook.BackButtonManager.Uno.WinUI" Version="2.0.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="ExtendedSplashScreen.Uno.WinUI" Version="2.0.0" />
+		<PackageReference Include="MessageDialogService.Uno.WinUI" Version="2.0.0" />
+		<PackageReference Include="Nventive.Persistence.Uno.WinUI" Version="0.5.0" />
+		<PackageReference Include="Nventive.View.Uno.WinUI" Version="0.6.0" />
+		<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" />

diff --git a/src/app/ApplicationTemplate.Presentation/ApplicationTemplate.Presentation.csproj b/src/app/ApplicationTemplate.Presentation/ApplicationTemplate.Presentation.csproj
@@ -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="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="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.DataLoader" Version="2.0.0" />
+		<PackageReference Include="Chinook.DataLoader.DynamicMvvm" Version="2.0.0" />
+		<PackageReference Include="Chinook.BackButtonManager" Version="2.0.0" />
+		<PackageReference Include="Chinook.SectionsNavigation" Version="3.0.0" />
+		<PackageReference Include="Chinook.SectionsNavigation.Reactive" Version="3.0.0" />
+		<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" />
 	</ItemGroup>

diff --git a/src/app/ApplicationTemplate.Shared.Views/App.xaml.cs b/src/app/ApplicationTemplate.Shared.Views/App.xaml.cs
@@ -81,9 +81,11 @@ private void InitializeAndStart()
 #endif
 //+:cnd:noEmit
 
+//-:cnd:noEmit
 #if DEBUG
 		CurrentWindow.EnableHotReload();
 #endif
+//+:cnd:noEmit
 
 		_ = Task.Run(() => Startup.Start());
 	}

diff --git a/src/app/ApplicationTemplate.Windows/ApplicationTemplate.Windows.csproj b/src/app/ApplicationTemplate.Windows/ApplicationTemplate.Windows.csproj
@@ -68,20 +68,20 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<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="Chinook.BackButtonManager.Uno.WinUI" Version="2.0.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="CommunityToolkit.WinUI" Version="7.1.2" />
-		<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="ExtendedSplashScreen.Uno.WinUI" Version="2.0.0" />
+		<PackageReference Include="MessageDialogService.Uno.WinUI" Version="2.0.0" />
 		<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="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="Nventive.Persistence.Uno.WinUI" Version="0.5.0" />
+		<PackageReference Include="Nventive.View.Uno.WinUI" Version="0.6.0" />
+		<PackageReference Include="Reactive.Annex.Uno.WinUI" Version="2.0.0" />
 		<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" />