Merge branch 'main' into dev/columnview-fix-accent

Author: marcelwgn

.github/FUNDING.yml

@@ -1 +1 @@
-github: [yaichenbaum]
+github: [yaira2, Josh-65]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -32,26 +32,26 @@ body:
     attributes:
       label: Files Version
       description: Which version of Files are you using? The version number can be found by going to Files' Settings > About
-      placeholder: "e.g. Version: 2.0.34.0 OS Version: 10.0.22000.282"
+      placeholder: "e.g. Version: 2.0.34.0 OS Version: 10.0.22000.000"
     validations:
       required: true
   - type: input
     attributes:
       label: Windows Version
       description: Which version of Windows are you using? Press <kbd>Win</kbd> + <kbd>Pause/Break</kbd> and copy.
-      placeholder: e.g. Windows 11 21H2 22000.194
+      placeholder: e.g. Windows 11 21H2 22000.000
     validations:
       required: true
   - type: textarea
     attributes:
       label: Relevant Assets/Logs
       description: |
-        A list of assets (logs, screenshots, etc) relevant to this bug. This issue will be closed if the applications log files are not included.
+        A list of assets (logs, screenshots, etc) relevant to this bug. This issue will be closed if the applications log file is not included.
 
         Tip: You can attach image(s) or log file(s) by clicking this area to highlight it and then dragging files in.
       placeholder: |
         To upload the log, access it from Settings -> About -> Open log location; Or
-        - Copy the `debug.log` and `debug_fulltrust.log` files from `%localappdata%\Packages\49306atecsolution.FilesUWP_et10x9a9vyk8t\LocalState`
+        - Copy the `debug.log` file from `%localappdata%\Packages\49306atecsolution.FilesUWP_et10x9a9vyk8t\LocalState`
         - Drag and drop them into this text area.
     validations:
       required: true

README.md

@@ -16,45 +16,46 @@
     <img src="https://img.shields.io/badge/Preview-Download-blue.svg?style=flat-round" alt="Preview link" />
 </a>
 
-## What is Files?
-Files is a file manager for Windows with a powerful yet intuitive design. It has features like multiple tabs, panes, columns, shell extensions in the context menu and tags.
+Files is a file manager that lets you easily organize content on your device. Robust multitasking experiences, helpful tags, and deep integrations add to an intuitive design – openly developed right here.
 
-We welcome discussions and contributions to our repository, however to help maintain a healthy community, please read our [code of conduct](https://github.com/files-community/Files/blob/main/CODE_OF_CONDUCT.md).
+We welcome feedback items and approved community contributions! Vague ideas are difficult to act on, so you'll need to fill out the correct issue template with detailed information such as related links or screenshots. Keep discussions constructive by reading our [code of conduct](https://github.com/files-community/Files/blob/main/CODE_OF_CONDUCT.md).
 
 ## Privacy
-We use App Center to track which settings are being used, find bugs, and fix crashes. Information sent to App Center is anonymous and free of any user or contextual data.
+This project uses App Center to drive and inform quality improvements. We may collect anonymous information not limited to the settings in use and crash reports. All information sent is free of any user-identifying or contextual data.
 
 ## FAQ
-Have any questions? Check out our [documentation site](https://files.community/docs)!
+Have any questions? Check out our [documentation](https://files.community/docs)!
 
 ## Building from source
 
-### 1: Prerequisites
+### 1. Prerequisites
 
-- [Git](https://git-scm.com)
-- [Visual Studio 2022](https://visualstudio.microsoft.com/vs/) with the UWP Development Kit and following individual components:
-    - Windows 11 SDK (10.0.22000)
-    - MSVC v143 - VS 2022 C++ x64/x86 build tools
-    - C++ ATL for latest v143 build tools (x86 & x64)
-
-### 2: Clone the repository.
+- [Visual Studio 2022](https://visualstudio.microsoft.com/vs/) with the following individual components:
+    - Windows 11 SDK (10.0.22621.0)
+    - .NET 7 SDK
+    - MSVC v143 - VS 2022 C++ x64/x86 or ARM64 build tools (latest)
+    - C++ ATL for latest v143 build tools (x86 & x64 or ARM64)
+    - Git for Windows
+- [Windows App SDK 1.2](https://learn.microsoft.com/en-us/windows/apps/windows-app-sdk/downloads#current-releases)
+    
+### 2. Clone the repository
 
 ```ps
 git clone https://github.com/files-community/Files
 ```
 
 This will create a local copy of the repository.
 
-### 3: Build the project
+### 3. Build the project
 
-To build the app in development mode, open the sln file in Visual Studio (Files.sln) and set the Files.Package project as the startup item by right-clicking on `Files.Package` in the solution explorer & hitting ‘Set as Startup item’.
+To build Files for development, open the `Files.sln` item in Visual Studio. Right-click on the `Files.Package` packaging project in solution explorer and select ‘Set as Startup item’.
 
-In the architecture pane, select the correct architecture for your system as Debug which should look like this:
+In the top pane, select the items which correspond to your desired build mode and the processor architecture of your device like below:
 ![image](https://user-images.githubusercontent.com/39923744/148721296-2bd132d0-4a4d-4555-8f58-16b00b18ade3.png)
 
 ## Contributors
 
-Want to contribute to this project? Feel free to open an [issue](https://github.com/files-community/Files/issues) or [pull request](https://github.com/files-community/Files/pulls). View our [Contributing guidelines](https://github.com/files-community/Files/blob/main/.github/CONTRIBUTING.md) to make sure you're up to date on the latest guidelines for contributing to the Files codebase.
+Want to contribute to this project? Let us know with an [issue](https://github.com/files-community/Files/issues) that communicates your intent to create a [pull request](https://github.com/files-community/Files/pulls). Also, view our [contributing guidelines](https://github.com/files-community/Files/blob/main/.github/CONTRIBUTING.md) to make sure you're up to date on the coding conventions.
 
 ## Screenshots
 

builds/azure-pipelines.yml

@@ -7,7 +7,7 @@ pool:
 variables:
   solution: '**/*.sln'
   buildPlatform: 'x64'
-  buildConfiguration: 'Debug'
+  buildConfiguration: 'Release'
   appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\'
 
 steps:
@@ -91,36 +91,36 @@ steps:
     command: 'build'
     arguments: './tests/Files.InteractionTests/Files.InteractionTests.csproj --configuration $(buildConfiguration)'
 
-#- task: PowerShell@2
-#  inputs:
-#    targetType: 'inline'
-#    script: |
-#      # Find correct folder and run app install script.
-#      cd $(appxPackageDir)
-
-#      $AppBundle = Get-ChildItem -Filter Files*Test -Name
-#      echo $AppBundle
-#      cd $AppBundle
-#      ./Install.ps1 -Force
-#      Get-AppxPackage
-#    errorActionPreference: 'continue'
-#    failOnStderr: true
-#    workingDirectory: '$(System.DefaultWorkingDirectory)'
-
-
-#- task: Windows Application Driver@0
-#  inputs:
-#    OperationType: 'Start'
-#    AgentResolution: '1080p'
-
-#- task: VSTest@2
-#  inputs:
-#    testSelector: 'testAssemblies'
-#    testAssemblyVer2: |
-#      **\$(buildConfiguration)\Files.InteractionTests\net7.0\Files.InteractionTests.dll
-#      !**\*TestAdapter.dll
-#      !**\obj\**
-#    searchFolder: '$(System.DefaultWorkingDirectory)'
+- task: PowerShell@2
+  inputs:
+    targetType: 'inline'
+    script: |
+      # Find correct folder and run app install script.
+      cd $(appxPackageDir)
+
+      $AppBundle = Get-ChildItem -Filter Files*Test -Name
+      echo $AppBundle
+      cd $AppBundle
+      ./Install.ps1 -Force
+      Get-AppxPackage
+    errorActionPreference: 'continue'
+    failOnStderr: true
+    workingDirectory: '$(System.DefaultWorkingDirectory)'
+
+
+- task: Windows Application Driver@0
+  inputs:
+    OperationType: 'Start'
+    AgentResolution: '1080p'
+
+- task: VSTest@2
+  inputs:
+    testSelector: 'testAssemblies'
+    testAssemblyVer2: |
+      **\*Files.InteractionTests.dll
+      !**\*TestAdapter.dll
+      !**\obj\**
+    searchFolder: '$(System.DefaultWorkingDirectory)'
 
 - task: CopyFiles@2
   displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
@@ -132,4 +132,4 @@ steps:
 - task: PublishBuildArtifacts@1
   displayName: 'Publish Artifact: drop'
   inputs:
-    PathtoPublish: '$(build.artifactstagingdirectory)'
+    PathtoPublish: '$(build.artifactstagingdirectory)'

src/BackgroundTasks/BackgroundTasks.csproj

@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net7.0-windows10.0.22000.0</TargetFramework>
-    <AssemblyName>BackgroundTasks</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <IsTrimmable>true</IsTrimmable>
-    <Configurations>Debug;Release;Sideload</Configurations>
-    <Platforms>x86;x64;ARM64</Platforms>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-  </PropertyGroup>
-  <PropertyGroup>
-    <CsWinRTComponent>true</CsWinRTComponent>
-    <CsWinRTWindowsMetadata>10.0.22000.0</CsWinRTWindowsMetadata>
-    <CsWinRTGeneratedFilesDir>$(MSBuildProjectDirectory)\bin\$(Platform)\$(Configuration)</CsWinRTGeneratedFilesDir>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.0" />
-  </ItemGroup>
+    <PropertyGroup>
+        <TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
+        <AssemblyName>BackgroundTasks</AssemblyName>
+        <DefaultLanguage>en-US</DefaultLanguage>
+        <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+        <IsTrimmable>true</IsTrimmable>
+        <Configurations>Debug;Release;Sideload</Configurations>
+        <Platforms>x86;x64;ARM64</Platforms>
+        <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    </PropertyGroup>
+    <PropertyGroup>
+        <CsWinRTComponent>true</CsWinRTComponent>
+        <CsWinRTWindowsMetadata>10.0.22621.0</CsWinRTWindowsMetadata>
+        <CsWinRTGeneratedFilesDir>$(MSBuildProjectDirectory)\bin\$(Platform)\$(Configuration)</CsWinRTGeneratedFilesDir>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.1" />
+    </ItemGroup>
 </Project>

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

@@ -1,90 +1,90 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0'">
-    <VisualStudioVersion>17.0</VisualStudioVersion>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Sideload|x86">
-      <Configuration>Sideload</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Sideload|x64">
-      <Configuration>Sideload</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Sideload|ARM64">
-      <Configuration>Sideload</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-    <PathToXAMLWinRTImplementations>Files.App\</PathToXAMLWinRTImplementations>
-  </PropertyGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-  <PropertyGroup>
-    <ProjectGuid>8f60fd8e-1921-47d6-97b0-d26d7b3a4999</ProjectGuid>
-    <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <AssetTargetFallback>net7.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
-    <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
-    <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
-    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
-    <DisableXbfLineInfo>False</DisableXbfLineInfo>
-    <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
-    <AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fil-PH;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
-    <UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
-    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <EntryPointProjectUniqueName>..\Files.App\Files.App.csproj</EntryPointProjectUniqueName>
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <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.2.220930.4-preview2" IncludeAssets="build" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" IncludeAssets="build" />
-  </ItemGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+    <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0'">
+        <VisualStudioVersion>17.0</VisualStudioVersion>
+    </PropertyGroup>
+    <ItemGroup Label="ProjectConfigurations">
+        <ProjectConfiguration Include="Debug|x86">
+            <Configuration>Debug</Configuration>
+            <Platform>x86</Platform>
+        </ProjectConfiguration>
+        <ProjectConfiguration Include="Release|x86">
+            <Configuration>Release</Configuration>
+            <Platform>x86</Platform>
+        </ProjectConfiguration>
+        <ProjectConfiguration Include="Sideload|x86">
+            <Configuration>Sideload</Configuration>
+            <Platform>x86</Platform>
+        </ProjectConfiguration>
+        <ProjectConfiguration Include="Debug|x64">
+            <Configuration>Debug</Configuration>
+            <Platform>x64</Platform>
+        </ProjectConfiguration>
+        <ProjectConfiguration Include="Release|x64">
+            <Configuration>Release</Configuration>
+            <Platform>x64</Platform>
+        </ProjectConfiguration>
+        <ProjectConfiguration Include="Sideload|x64">
+            <Configuration>Sideload</Configuration>
+            <Platform>x64</Platform>
+        </ProjectConfiguration>
+        <ProjectConfiguration Include="Debug|ARM64">
+            <Configuration>Debug</Configuration>
+            <Platform>ARM64</Platform>
+        </ProjectConfiguration>
+        <ProjectConfiguration Include="Release|ARM64">
+            <Configuration>Release</Configuration>
+            <Platform>ARM64</Platform>
+        </ProjectConfiguration>
+        <ProjectConfiguration Include="Sideload|ARM64">
+            <Configuration>Sideload</Configuration>
+            <Platform>ARM64</Platform>
+        </ProjectConfiguration>
+    </ItemGroup>
+    <PropertyGroup>
+        <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+        <PathToXAMLWinRTImplementations>Files.App\</PathToXAMLWinRTImplementations>
+    </PropertyGroup>
+    <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+    <PropertyGroup>
+        <ProjectGuid>8f60fd8e-1921-47d6-97b0-d26d7b3a4999</ProjectGuid>
+        <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
+        <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+        <AssetTargetFallback>net7.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+        <DefaultLanguage>en-US</DefaultLanguage>
+        <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+        <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+        <AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
+        <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
+        <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
+        <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+        <DisableXbfLineInfo>False</DisableXbfLineInfo>
+        <GenerateTestArtifacts>True</GenerateTestArtifacts>
+        <AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
+        <AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
+        <UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
+        <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+        <EntryPointProjectUniqueName>..\Files.App\Files.App.csproj</EntryPointProjectUniqueName>
+        <AppxBundle>Always</AppxBundle>
+    </PropertyGroup>
+    <ItemGroup>
+        <AppxManifest Include="Package.appxmanifest">
+            <SubType>Designer</SubType>
+        </AppxManifest>
+    </ItemGroup>
+    <ItemGroup>
+        <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.2.221209.1" IncludeAssets="build" />
+        <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" IncludeAssets="build" />
+    </ItemGroup>
+    <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>