Merge branch 'main' of https://github.com/files-community/Files into terminal

Author: gave92

.github/workflows/deploy-preview.yml

@@ -0,0 +1,171 @@
+name: Deploy Preview Pipeline
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+    environment: Deployments
+    strategy:
+      fail-fast: false
+      matrix:
+        configuration: [Preview]
+        platform: [x64]
+    env:
+      SOLUTION_NAME: 'Files.sln'
+      PACKAGE_PROJECT_DIR: 'src\Files.App (Package)'
+      PACKAGE_PROJECT_PATH: 'src\Files.App (Package)\Files.Package.wapproj'
+      TEST_PROJECT_PATH: 'tests\Files.InteractionTests\Files.InteractionTests.csproj'
+      CONFIGURATION: ${{ matrix.configuration }}
+      PLATFORM: ${{ matrix.platform }}
+      APPX_BUNDLE_PLATFORMS: 'x64|arm64'
+      WORKING_DIR: ${{ github.workspace }} # Default: D:\a\Files\Files\
+      ARTIFACTS_STAGING_DIR:  ${{ github.workspace }}\artifacts
+      APPX_PACKAGE_DIR: ${{ github.workspace }}\artifacts\AppxPackages
+
+    steps:
+    - name: Checkout the repository
+      uses: actions/checkout@v3
+
+    - name: Setup MSBuild
+      uses: microsoft/setup-msbuild@v1
+
+    - name: Setup NuGet
+      uses: NuGet/setup-nuget@v1.1.1
+
+    - name: Setup .NET 7
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '7.0.x'
+
+    # TODO: Move the command to PowerShell script instead
+    - name: Update Package.appxmanifest
+      shell: pwsh
+      run: |
+        [xml]$xmlDoc = Get-Content "$env:PACKAGE_PROJECT_DIR\Package.appxmanifest"
+        $xmlDoc.Package.Identity.Name="FilesPreview"
+        $xmlDoc.Package.Identity.Publisher="$env:SIDELOAD_PUBLISHER_SECRET"
+        $xmlDoc.Package.Properties.DisplayName="Files - Preview"
+        $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files - Preview"
+        $xmlDoc.Save("$env:PACKAGE_PROJECT_DIR\Package.appxmanifest")
+      env:
+        SIDELOAD_PUBLISHER_SECRET: ${{ secrets.SIDELOAD_PUBLISHER_SECRET }}
+
+    # TODO: Move the command to PowerShell script instead
+    - name: Use the ${{ env.CONFIGURATION }} logo sets
+      shell: pwsh
+      run: |
+        Get-ChildItem "$env:WORKING_DIR\src" -Include *.csproj, *.appxmanifest, *.wapproj, *.xaml -recurse | ForEach -Process `
+        { `
+          (Get-Content $_ -Raw | ForEach -Process { $_ -replace "Assets\\AppTiles\\Dev", "Assets\AppTiles\Preview" }) | `
+          Set-Content $_ -NoNewline `
+        }
+
+    - name: Inject the Bing Maps API token
+      shell: pwsh
+      run: |
+        Get-ChildItem "$env:WORKING_DIR\src" -Include *.cs -recurse | ForEach-Object -Process `
+        { `
+          (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "bingmapskey.secret", "$env:BING_MAPS_SECRET" }) | `
+          Set-Content $_ -NoNewline `
+        }
+      env:
+        BING_MAPS_SECRET: ${{ secrets.BING_MAPS_SECRET }}
+
+    - name: Inject the AppCenter token
+      shell: pwsh
+      run: |
+        Get-ChildItem "$env:WORKING_DIR\src" -Include *.cs -recurse | ForEach-Object -Process `
+        { `
+          (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "appcenter.secret", "$env:APP_CENTER_SECRET" }) | `
+          Set-Content $_ -NoNewline `
+        }
+      env:
+        APP_CENTER_SECRET: ${{ secrets.APP_CENTER_SECRET }}
+
+    - name: Inject the GitHub OAuth client ID
+      run: |
+        Get-ChildItem "$env:WORKING_DIR\src" -Include *.cs -recurse | ForEach-Object -Process `
+        { `
+          (Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "githubclientid.secret", "$env:GH_OAUTH_CLIENT_ID" }) | `
+          Set-Content $_ -NoNewline `
+        }
+      env:
+        GH_OAUTH_CLIENT_ID: ${{ secrets.GH_OAUTH_CLIENT_ID }}
+
+    - name: Use Windows SDK Preview
+      shell: cmd
+      run: |
+        for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt
+
+    - name: Restore NuGet
+      shell: pwsh
+      run: 'nuget restore $env:SOLUTION_NAME'
+
+    - name: Restore ${{ env.SOLUTION_NAME  }}
+      shell: pwsh
+      run: |
+        msbuild $env:SOLUTION_NAME `
+        -t:Restore `
+        -p:Platform=$env:PLATFORM `
+        -p:Configuration=$env:CONFIGURATION `
+        -p:PublishReadyToRun=true
+
+    - name: Build ${{ env.SOLUTION_NAME }}
+      shell: pwsh
+      run: |
+        msbuild "$env:PACKAGE_PROJECT_PATH" `
+        -t:Build `
+        -t:_GenerateAppxPackage `
+        -p:Platform=$env:PLATFORM `
+        -p:Configuration=$env:CONFIGURATION `
+        -p:AppxBundlePlatforms=$env:APPX_BUNDLE_PLATFORMS `
+        -p:AppxPackageDir="$env:APPX_PACKAGE_DIR" `
+        -p:AppxBundle=Always `
+        -p:UapAppxPackageBuildMode=Sideload `
+        -p:GenerateAppInstallerFile=True `
+        -p:AppInstallerUri=https://cdn.files.community/files/preview/
+
+    - name: Remove empty files from the packages
+      shell: bash
+      run: find $ARTIFACTS_STAGING_DIR -empty -delete
+
+    - name: Sign files with Azure Code Signing
+      uses: azure/azure-code-signing-action@v0.2.21
+      with:
+        azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+        azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
+        azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
+        endpoint: https://wus2.codesigning.azure.net/
+        code-signing-account-name: ${{ secrets.SIGNING_ACCOUNT_NAME }}
+        certificate-profile-name: ${{ secrets.SIGNING_PROFILE_NAME }}
+        files-folder: ${{ env.APPX_PACKAGE_DIR }}
+        files-folder-filter: msixbundle
+        files-folder-recurse: true
+        files-folder-depth: 4
+        file-digest: SHA256
+        timestamp-rfc3161: http://timestamp.acs.microsoft.com
+        timestamp-digest: SHA256
+
+    - uses: azure/login@v1
+      with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+    - name: Upload to blob storage
+      uses: azure/powershell@v1
+      with:
+        inlineScript: |
+         az storage blob upload-batch --account-name "filescommunity" --destination "files" --destination-path "test" --source ${{ env.APPX_PACKAGE_DIR }} --overwrite true
+        azPSVersion: "latest"
+
+    # Azure logout
+    - name: logout
+      run: |
+          az logout
+          
+    - name: Upload the packages to GitHub Actions
+      uses: actions/upload-artifact@v3
+      with:
+        name: 'Appx Packages (${{ env.CONFIGURATION }}, ${{ env.PLATFORM }})'
+        path: ${{ env.ARTIFACTS_STAGING_DIR }}

README.md

@@ -6,12 +6,8 @@
 [![Build Status](https://dev.azure.com/filescommunity/Files/_apis/build/status/Build%20Pipeline?branchName=main)](https://dev.azure.com/filescommunity/Files/_build/latest?definitionId=4&branchName=main)
 [![Crowdin](https://badges.crowdin.net/files-app/localized.svg)](https://crowdin.com/project/files-app)
 [![Discord](https://discordapp.com/api/guilds/725513575971684472/widget.png)](https://discord.gg/files)
-<a style="text-decoration:none" href="https://files.community/download">
-    <img src="https://img.shields.io/badge/Download%20Installer-blue.svg?style=flat-round" alt="Download link" />
-</a>
-<a style="text-decoration:none" href="https://files.community/docs">
-    <img src="https://img.shields.io/badge/View%20Documentation-purple.svg?style=flat-round" alt="Documentation link" />
-</a>
+[![Download](https://img.shields.io/badge/Download%20Installer-blue.svg?style=flat-round)](https://files.community/download)
+[![Documentation](https://img.shields.io/badge/View%20Documentation-purple.svg?style=flat-round)](https://files.community/download")
 
 Introducing Files, the ultimate file manager app for Windows. With its sleek and intuitive design, navigating through your files has never been easier. Files features tabs for easy switching between different folders, a column view for quick file browsing, and dual pane support for efficient file management. In addition, you can easily create and extract archives with just a few clicks, making file compression and decompression a breeze.
 

src/Files.App (Package)/Files.Package.wapproj

@@ -85,24 +85,29 @@
       <Platform>x86</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+
   <PropertyGroup>
     <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
     <PathToXAMLWinRTImplementations>Files.App\</PathToXAMLWinRTImplementations>
   </PropertyGroup>
+
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
     <Content Include="Assets\AppTiles\Dev\**" />
     <Content Include="Package.appinstaller" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Files.App\Files.App.csproj">
       <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
       <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
     </ProjectReference>
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" IncludeAssets="build" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" IncludeAssets="build" />

src/Files.App (Package)/Package.appxmanifest

@@ -16,7 +16,7 @@
     <Identity
         Name="FilesDev"
         Publisher="CN=Files"
-        Version="2.5.31.0" />
+        Version="3.0.0.0" />
 
     <Properties>
         <DisplayName>Files - Dev</DisplayName>

src/Files.App/App.xaml.cs

@@ -264,7 +264,7 @@ private void EnsureSuperEarlyWindow()
 
 			// Hook events for the window
 			window.Activated += Window_Activated;
-			window.Closed += Window_ClosedAsync;
+			window.Closed += Window_Closed;
 
 			// Attempt to activate it
 			window.Activate();
@@ -294,7 +294,7 @@ public void OnActivated(AppActivationArguments activatedEventArgs)
 		/// </summary>
 		/// <param name="sender">The source of the suspend request.</param>
 		/// <param name="args">Details about the suspend request.</param>
-		private async void Window_ClosedAsync(object sender, WindowEventArgs args)
+		private async void Window_Closed(object sender, WindowEventArgs args)
 		{
 			// Save application state and stop any background activity
 

src/Files.App/Data/Contexts/Multitasking/MultitaskingContext.cs

@@ -17,8 +17,8 @@ internal class MultitaskingContext : ObservableObject, IMultitaskingContext
 		private ushort tabCount = 0;
 		public ushort TabCount => tabCount;
 
-		public TabBarItem CurrentTabItem => MainPageViewModel.AppInstances[currentTabIndex];
-		public TabBarItem SelectedTabItem => MainPageViewModel.AppInstances[selectedTabIndex];
+		public TabBarItem CurrentTabItem => MainPageViewModel.AppInstances.ElementAtOrDefault(currentTabIndex);
+		public TabBarItem SelectedTabItem => MainPageViewModel.AppInstances.ElementAtOrDefault(selectedTabIndex);
 
 		private ushort currentTabIndex = 0;
 		public ushort CurrentTabIndex => currentTabIndex;

src/Files.App/Data/Items/DriveItem.cs

@@ -204,6 +204,7 @@ public FrameworkElement? ItemDecorator
 			{
 				if (!IsRemovable)
 					return null; // Removable items don't need the eject button
+
 				var itemDecorator = new Button()
 				{
 					Style = Application.Current.Resources["SidebarEjectButtonStyle"] as Style,
@@ -214,12 +215,16 @@ public FrameworkElement? ItemDecorator
 						Width = 16
 					}
 				};
-				itemDecorator.Click += ItemDecorator_ClickAsync;
+
+				ToolTipService.SetToolTip(itemDecorator, "Eject".GetLocalizedResource());
+
+				itemDecorator.Click += ItemDecorator_Click;
+        
 				return itemDecorator;
 			}
 		}
 
-		private async void ItemDecorator_ClickAsync(object sender, RoutedEventArgs e)
+		private async void ItemDecorator_Click(object sender, RoutedEventArgs e)
 		{
 			var result = await DriveHelpers.EjectDeviceAsync(Path);
 			await UIHelpers.ShowDeviceEjectResultAsync(Type, result);

src/Files.App/Data/Items/FileTagItem.cs

@@ -2,8 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using CommunityToolkit.WinUI.Helpers;
-using Files.App.Converters;
-using Files.Core.ViewModels.FileTags;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Markup;

src/Files.App/Data/Models/DrivesViewModel.cs

@@ -40,17 +40,17 @@ public DrivesViewModel(IRemovableDrivesService removableDrivesService, ISizeProv
 			watcher = removableDrivesService.CreateWatcher();
 			watcher.DeviceAdded += Watcher_DeviceAdded;
 			watcher.DeviceRemoved += Watcher_DeviceRemoved;
-			watcher.DeviceModified += Watcher_DeviceModifiedAsync;
-			watcher.EnumerationCompleted += Watcher_EnumerationCompletedAsync;
+			watcher.DeviceModified += Watcher_DeviceModified;
+			watcher.EnumerationCompleted += Watcher_EnumerationCompleted;
 		}
 
-		private async void Watcher_EnumerationCompletedAsync(object? sender, System.EventArgs e)
+		private async void Watcher_EnumerationCompleted(object? sender, System.EventArgs e)
 		{
 			logger.LogDebug("Watcher_EnumerationCompleted");
 			await folderSizeProvider.CleanAsync();
 		}
 
-		private async void Watcher_DeviceModifiedAsync(object? sender, string e)
+		private async void Watcher_DeviceModified(object? sender, string e)
 		{
 			var matchingDriveEjected = Drives.FirstOrDefault(x => Path.GetFullPath(x.Path) == Path.GetFullPath(e));
 			if (matchingDriveEjected != null)
@@ -68,7 +68,7 @@ private void Watcher_DeviceRemoved(object? sender, string e)
 			}
 
 			// Update the collection on the ui-thread.
-			Watcher_EnumerationCompletedAsync(null, EventArgs.Empty);
+			Watcher_EnumerationCompleted(null, EventArgs.Empty);
 		}
 
 		private void Watcher_DeviceAdded(object? sender, ILocatableFolder e)
@@ -90,7 +90,7 @@ private void Watcher_DeviceAdded(object? sender, ILocatableFolder e)
 				Drives.Add(e);
 			}
 
-			Watcher_EnumerationCompletedAsync(null, EventArgs.Empty);
+			Watcher_EnumerationCompleted(null, EventArgs.Empty);
 		}
 
 		public async Task UpdateDrivesAsync()
@@ -116,8 +116,8 @@ public void Dispose()
 			watcher.Stop();
 			watcher.DeviceAdded -= Watcher_DeviceAdded;
 			watcher.DeviceRemoved -= Watcher_DeviceRemoved;
-			watcher.DeviceModified -= Watcher_DeviceModifiedAsync;
-			watcher.EnumerationCompleted -= Watcher_EnumerationCompletedAsync;
+			watcher.DeviceModified -= Watcher_DeviceModified;
+			watcher.EnumerationCompleted -= Watcher_EnumerationCompleted;
 		}
 	}
 }