Merge

Author: ferrariofilippo

builds/azure-pipelines-release.yml

@@ -95,8 +95,8 @@ jobs:
     inputs:
       targetType: 'inline'
       script: |
-        gci $(Build.SourcesDirectory)\src -Include app.xaml.cs -recurse | ForEach -Process {
-        (Get-Content $_ -Raw | ForEach -Process {$_ -replace "AppCenter.Start("", typeof(Analytics), typeof(Crashes));", "AppCenter.Start("$(appcenter.secret)", typeof(Analytics), typeof(Crashes));) | Set-Content $_ -NoNewline
+        gci $(Build.SourcesDirectory)\src -Include *.cs -recurse | ForEach -Process {
+        (Get-Content $_ -Raw | ForEach -Process {$_ -replace "appcenter.secret", "$(appcenter.secret)"}) | Set-Content $_ -NoNewline
         }
       failOnStderr: true
 
@@ -156,6 +156,12 @@ jobs:
       ContainerName: 'files'
       BlobPrefix: '${{parameters.releaseBranch}}'
 
+  - task: tfx-cloudflare-purge@1
+    inputs:
+      username: '$(cloudflare.username)'
+      apikey: '$(cloudflare.apikey)'
+      zonename: '$(cloudflare.zoneid)'
+
 ### Store release ###
 - job: StoreRelease
   timeoutInMinutes: 120

builds/azure-pipelines.yml

@@ -46,19 +46,6 @@ steps:
     TargetFolder: '$(Build.SourcesDirectory)\src\Files.App\Resources'
     overWrite: true
 
-- task: DownloadSecureFile@1
-  name: appCenterDevKey
-  displayName: 'Download AppCenter Dev Key'
-  inputs:
-    secureFile: 'AppCenterKey.txt'
-
-- task: CopyFiles@2
-  inputs:
-    SourceFolder: '$(Agent.TempDirectory)'
-    Contents: '$(appCenterDevKey.secureFilePath)'
-    TargetFolder: '$(Build.SourcesDirectory)\src\Files.App\Resources'
-    overWrite: true
-
 - task: UseDotNet@2
   inputs:
     packageType: sdk

src/Files.App/App.xaml.cs

@@ -2,7 +2,6 @@
 using CommunityToolkit.WinUI;
 using CommunityToolkit.WinUI.Helpers;
 using CommunityToolkit.WinUI.Notifications;
-using Files.App.Controllers;
 using Files.App.DataModels;
 using Files.App.Extensions;
 using Files.App.Filesystem;
@@ -30,6 +29,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Microsoft.Windows.AppLifecycle;
 using System;
 using System.Diagnostics;
@@ -54,6 +54,7 @@ public partial class App : Application
 		private static bool ShowErrorNotification = false;
 
 		public static string OutputPath { get; set; }
+		public static CommandBarFlyout? LastOpenedFlyout { get; set; }
 		public static StorageHistoryWrapper HistoryWrapper = new StorageHistoryWrapper();
 		public static SettingsViewModel AppSettings { get; private set; }
 		public static AppModel AppModel { get; private set; }
@@ -95,7 +96,7 @@ public App()
 			Services = ConfigureServices();
 			Ioc.Default.ConfigureServices(Services);
 			LogoPath = Package.Current.DisplayName == "Files - Dev" ? Constants.AssetPaths.DevLogo
-					: (Package.Current.DisplayName == "Files - Preview" ? Constants.AssetPaths.PreviewLogo : Constants.AssetPaths.StableLogo);
+					: (Package.Current.DisplayName == "Files (Preview)" ? Constants.AssetPaths.PreviewLogo : Constants.AssetPaths.StableLogo);
 		}
 
 		private IServiceProvider ConfigureServices()
@@ -177,7 +178,7 @@ private static Task StartAppCenter()
 			{
 				// AppCenter secret is injected in builds/azure-pipelines-release.yml
 				if (!AppCenter.Configured)
-					AppCenter.Start("", typeof(Analytics), typeof(Crashes));
+					AppCenter.Start("appcenter.secret", typeof(Analytics), typeof(Crashes));
 			}
 			catch (Exception ex)
 			{
@@ -287,6 +288,15 @@ private async void Window_Closed(object sender, WindowEventArgs args)
 		{
 			// Save application state and stop any background activity
 
+			// A Workaround for the crash (#10110)
+			if (LastOpenedFlyout?.IsOpen ?? false)
+			{
+				args.Handled = true;
+				LastOpenedFlyout.Closed += (sender, e) => App.Current.Exit();
+				LastOpenedFlyout.Hide();
+				return;
+			}
+
 			await Task.Yield(); // Method can take a long time, make sure the window is hidden
 
 			SaveSessionTabs();