Merge remote-tracking branch 'upstream/main' into 5bfa/CQ-PreviewHandlerVanaraRemoval

Author: 0x5bfa

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: Bug Report
-description: Create a bug report to help improve Files
+description: Create a bug report to help improve Files.
 labels: [bug]
 body:
 
@@ -38,7 +38,7 @@ body:
     id: files_version
     attributes:
       label: Files Version
-      description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version
+      description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version.
       placeholder: "e.g. 2.0.34.0"
     validations:
       required: true
@@ -48,11 +48,21 @@ body:
     id: windows_version
     attributes:
       label: Windows Version
-      description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version
+      description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version.
       placeholder: "e.g. 10.0.22621.1848"
     validations:
       required: true
 
+    # User ID
+  - type: input
+    id: user_id
+    attributes:
+      label: User ID
+      description: Your User ID is a GUID that can be matched up with bug reports in Sentry. To copy your User ID, access it from Settings -> About -> Copy -> User ID.
+      placeholder: "74750836-5885-4eeb-964f-8177cb4babf6"
+    validations:
+      required: false
+
   # Log File
   - type: textarea
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,5 +1,5 @@
 name: Feature Request
-description: This project thrives from differentiation from competing apps. Suggest an idea for Files
+description: This project thrives from differentiation from competing apps. Suggest an idea for Files.
 labels: [feature request]
 body:
 
@@ -23,7 +23,7 @@ body:
   - type: textarea
     attributes:
       label: Requirements
-      description: Describe all the requirements to make your idea happen
+      description: Describe all the requirements to make your idea happen.
       value: |
         - This proposal will accomplish X
         - This proposal will accomplish Y
@@ -36,7 +36,7 @@ body:
     id: files_version
     attributes:
       label: Files Version
-      description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version
+      description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version.
       placeholder: 'e.g. 2.0.36.0'
     validations:
       required: true
@@ -46,7 +46,7 @@ body:
     id: windows_version
     attributes:
       label: Windows Version
-      description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version
+      description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version.
       placeholder: "e.g. 10.0.22621.1848"
     validations:
       required: true

.github/README.md

@@ -30,7 +30,7 @@ You can also use the preview version alongside the stable release to get early a
   </picture></a>
   &ensp;
   <!-- Classic Installer Badge -->
-  <a style="text-decoration:none" href="https://cdn.files.community/files/download/Files.Stable.exe">
+  <a style="text-decoration:none" href="https://files.community/appinstallers/Files.stable.appinstaller">
     <picture>
       <source media="(prefers-color-scheme: light)" srcset="./assets/ClassicInstallerBadge-dark.png" width="220" />
       <img src="./assets/ClassicInstallerBadge-light.png" width="220" />

.github/scripts/Configure-AppxManifest.ps1

@@ -20,6 +20,7 @@ if ($Branch -eq "Preview")
     $xmlDoc.Package.Identity.Name="FilesPreview"
     $xmlDoc.Package.Properties.DisplayName="Files - Preview"
     $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files - Preview"
+    $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files - Preview"
     $xmlDoc.Save($PackageManifestPath)
 
     Get-ChildItem $WorkingDir -Include *.csproj, *.appxmanifest, *.wapproj, *.xaml -recurse | ForEach-Object -Process `
@@ -34,6 +35,7 @@ elseif ($Branch -eq "Stable")
     $xmlDoc.Package.Identity.Name="Files"
     $xmlDoc.Package.Properties.DisplayName="Files"
     $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
+    $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files"
     $xmlDoc.Save($PackageManifestPath)
 
     Get-ChildItem $WorkingDir -Include *.csproj, *.appxmanifest, *.wapproj, *.xaml -recurse | ForEach-Object -Process `
@@ -46,8 +48,9 @@ elseif ($Branch -eq "Store")
 {
     # Set identities
     $xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP"
-    $xmlDoc.Package.Properties.DisplayName="Files"
+    $xmlDoc.Package.Properties.DisplayName="Files App"
     $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
+    $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files"
 
     # Remove an capability that is used for the sideload
     $nsmgr = New-Object System.Xml.XmlNamespaceManager($xmlDoc.NameTable)

.gitignore

@@ -9,6 +9,7 @@ Files.App.SaveDialog*.dll
 Files.App.Launcher.exe
 
 # User-specific files
+*.rsuser
 *.suo
 *.user
 *.userosscache
@@ -17,17 +18,24 @@ Files.App.Launcher.exe
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Mono auto generated files
+mono_crash.*
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
 x64/
 x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+[Ll]ogs/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -41,9 +49,10 @@ Generated\ Files/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUNIT
+# NUnit
 *.VisualState.xml
 TestResult.xml
+nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -57,6 +66,10 @@ BenchmarkDotNet.Artifacts/
 project.lock.json
 project.fragment.lock.json
 artifacts/
+**/Properties/launchSettings.json
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
 
 # StyleCop
 StyleCopReport.xml
@@ -65,6 +78,7 @@ StyleCopReport.xml
 *_i.c
 *_p.c
 *_i.h
+*_h.h
 *.ilk
 *.meta
 *.obj
@@ -81,7 +95,9 @@ StyleCopReport.xml
 *.tlh
 *.tmp
 *.tmp_proj
+*_wpftmp.csproj
 *.log
+*.tlog
 *.vspscc
 *.vssscc
 .builds
@@ -136,6 +152,11 @@ _TeamCity*
 .axoCover/*
 !.axoCover/settings.json
 
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -173,14 +194,16 @@ publish/
 *.azurePubxml
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
 # checkin your Azure Web App publish settings, but sensitive information contained
 # in these scripts will be unencrypted
 PublishScripts/
 
-# NuGet Packages
+# NuGet Symbol Packages
+*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
@@ -205,12 +228,14 @@ BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
+*.appxbundle
+*.appxupload
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!?*.[Cc]ache/
 
 # Others
 ClientBin/
@@ -221,10 +246,11 @@ ClientBin/
 *.jfm
 src/**/*.pfx
 tests/**/*.pfx
+*.pfx
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -255,6 +281,9 @@ ServiceFabricBackup/
 *.bim.layout
 *.bim_*.settings
 *.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -275,6 +304,17 @@ node_modules/
 # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
 *.vbw
 
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -290,12 +330,9 @@ paket-files/
 # FAKE - F# Make
 .fake/
 
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
+# CodeRush personal settings
 .cr/
+.cr/personal
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
@@ -320,7 +357,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -329,6 +366,45 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder 
+# MFractors (Xamarin productivity tool) working folder
 .mfractor/
-Files.Extensions/nul
+
+# Local History for Visual Studio
+.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# JetBrains Rider
+*.sln.iml
+.idea/

builds/azure-pipelines-release.yml

@@ -60,8 +60,9 @@ jobs:
         [xml]$xmlDoc = Get-Content '$(Build.SourcesDirectory)\src\Files.App (Package)\Package.appxmanifest'
         $xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP"
         $xmlDoc.Package.Identity.Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7"
-        $xmlDoc.Package.Properties.DisplayName="Files"
+        $xmlDoc.Package.Properties.DisplayName="Files App"
         $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
+        $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files"
         # Removes packageManagement from Store release
         $nsmgr = New-Object System.Xml.XmlNamespaceManager($xmlDoc.NameTable)
         $nsmgr.AddNamespace("pkg", "http://schemas.microsoft.com/appx/manifest/foundation/windows10")

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

@@ -16,7 +16,7 @@
     <Identity
         Name="FilesDev"
         Publisher="CN=Files"
-        Version="3.7.5.0" />
+        Version="3.7.7.0" />
 
     <Properties>
         <DisplayName>Files - Dev</DisplayName>
@@ -98,7 +98,7 @@
                     Wide310x150Logo="Assets\AppTiles\Dev\Wide310x150Logo.png"
                     Square71x71Logo="Assets\AppTiles\Dev\Small71x71Logo.png"
                     Square310x310Logo="Assets\AppTiles\Dev\Large310x310Logo.png"
-                    ShortName="Files">
+                    ShortName="Files - Dev">
                     <uap:ShowNameOnTiles>
                         <uap:ShowOn Tile="square150x150Logo" />
                         <uap:ShowOn Tile="wide310x150Logo" />

src/Files.App/Data/Commands/Manager/CommandManager.cs

@@ -483,7 +483,7 @@ ActionsSettingsService.ActionsV2 is not null
 					.SelectMany(command => command.HotKeys, (command, hotKey) => (Command: command, HotKey: hotKey))
 					.ToImmutableDictionary(item => item.HotKey, item => item.Command);
 
-				App.Logger.LogWarning(ex, "The app found some keys in different commands are duplicated and are using default key bindings for those commands.");
+				App.Logger.LogInformation(ex, "The app found some keys in different commands are duplicated and are using default key bindings for those commands.");
 			}
 			catch (Exception ex)
 			{

src/Files.App/Data/Contracts/IInfoPaneSettingsService.cs

@@ -10,7 +10,7 @@ public interface IInfoPaneSettingsService : IBaseSettingsService, INotifyPropert
 		/// <summary>
 		/// Gets or sets a value indicating if the preview pane is enabled.
 		/// </summary>
-		bool IsEnabled { get; set; }
+		bool IsInfoPaneEnabled { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating the height of the pane in a horizontal layout.