Skip to content

Commit 6d0c92d

Browse files
committed
Merge branch 'MoveItemRefactoring' of https://github.com/QuaintMako/Files into MoveItemRefactoring
2 parents ced6761 + 1cc4d03 commit 6d0c92d

File tree

112 files changed

+4440
-1843
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+4440
-1843
lines changed

.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github: [yaira2]
1+
github: [yaira2, Josh-65]

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@ body:
3232
attributes:
3333
label: Files Version
3434
description: Which version of Files are you using? The version number can be found by going to Files' Settings > About
35-
placeholder: "e.g. Version: 2.0.34.0 OS Version: 10.0.22000.282"
35+
placeholder: "e.g. Version: 2.0.34.0 OS Version: 10.0.22000.000"
3636
validations:
3737
required: true
3838
- type: input
3939
attributes:
4040
label: Windows Version
4141
description: Which version of Windows are you using? Press <kbd>Win</kbd> + <kbd>Pause/Break</kbd> and copy.
42-
placeholder: e.g. Windows 11 21H2 22000.194
42+
placeholder: e.g. Windows 11 21H2 22000.000
4343
validations:
4444
required: true
4545
- type: textarea
4646
attributes:
4747
label: Relevant Assets/Logs
4848
description: |
49-
A list of assets (logs, screenshots, etc) relevant to this bug. This issue will be closed if the applications log files are not included.
49+
A list of assets (logs, screenshots, etc) relevant to this bug. This issue will be closed if the applications log file is not included.
5050
5151
Tip: You can attach image(s) or log file(s) by clicking this area to highlight it and then dragging files in.
5252
placeholder: |
5353
To upload the log, access it from Settings -> About -> Open log location; Or
54-
- Copy the `debug.log` and `debug_fulltrust.log` files from `%localappdata%\Packages\49306atecsolution.FilesUWP_et10x9a9vyk8t\LocalState`
54+
- Copy the `debug.log` file from `%localappdata%\Packages\49306atecsolution.FilesUWP_et10x9a9vyk8t\LocalState`
5555
- Drag and drop them into this text area.
5656
validations:
5757
required: true

README.md

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,47 +16,46 @@
1616
<img src="https://img.shields.io/badge/Preview-Download-blue.svg?style=flat-round" alt="Preview link" />
1717
</a>
1818

19-
## What is Files?
20-
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.
19+
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.
2120

22-
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).
21+
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).
2322

2423
## Privacy
25-
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.
24+
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.
2625

2726
## FAQ
28-
Have any questions? Check out our [documentation site](https://files.community/docs)!
27+
Have any questions? Check out our [documentation](https://files.community/docs)!
2928

3029
## Building from source
3130

32-
### 1: Prerequisites
31+
### 1. Prerequisites
3332

34-
- [Git](https://git-scm.com)
3533
- [Visual Studio 2022](https://visualstudio.microsoft.com/vs/) with the following individual components:
36-
- Windows 11 SDK (10.0.22000)
37-
- MSVC v143 - VS 2022 C++ x64/x86 build tools
38-
- C++ ATL for latest v143 build tools (x86 & x64)
39-
- [.Net7 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
40-
- [WinApp SDK Runtime 1.2](https://learn.microsoft.com/en-us/windows/apps/windows-app-sdk/downloads#current-releases)
41-
42-
### 2: Clone the repository.
34+
- Windows 11 SDK (10.0.22621.0)
35+
- .NET 7 SDK
36+
- MSVC v143 - VS 2022 C++ x64/x86 or ARM64 build tools (latest)
37+
- C++ ATL for latest v143 build tools (x86 & x64 or ARM64)
38+
- Git for Windows
39+
- [Windows App SDK 1.2](https://learn.microsoft.com/en-us/windows/apps/windows-app-sdk/downloads#current-releases)
40+
41+
### 2. Clone the repository
4342

4443
```ps
4544
git clone https://github.com/files-community/Files
4645
```
4746

4847
This will create a local copy of the repository.
4948

50-
### 3: Build the project
49+
### 3. Build the project
5150

52-
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’.
51+
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’.
5352

54-
In the architecture pane, select the correct architecture for your system as Debug which should look like this:
53+
In the top pane, select the items which correspond to your desired build mode and the processor architecture of your device like below:
5554
![image](https://user-images.githubusercontent.com/39923744/148721296-2bd132d0-4a4d-4555-8f58-16b00b18ade3.png)
5655

5756
## Contributors
5857

59-
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.
58+
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.
6059

6160
## Screenshots
6261

builds/azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pool:
77
variables:
88
solution: '**/*.sln'
99
buildPlatform: 'x64'
10-
buildConfiguration: 'Debug'
10+
buildConfiguration: 'Release'
1111
appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\'
1212

1313
steps:
@@ -117,7 +117,7 @@ steps:
117117
inputs:
118118
testSelector: 'testAssemblies'
119119
testAssemblyVer2: |
120-
**\$(buildConfiguration)\Files.InteractionTests\net7.0\Files.InteractionTests.dll
120+
**\*Files.InteractionTests.dll
121121
!**\*TestAdapter.dll
122122
!**\obj\**
123123
searchFolder: '$(System.DefaultWorkingDirectory)'
Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net7.0-windows10.0.22000.0</TargetFramework>
4-
<AssemblyName>BackgroundTasks</AssemblyName>
5-
<DefaultLanguage>en-US</DefaultLanguage>
6-
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
7-
<IsTrimmable>true</IsTrimmable>
8-
<Configurations>Debug;Release;Sideload</Configurations>
9-
<Platforms>x86;x64;ARM64</Platforms>
10-
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
11-
</PropertyGroup>
12-
<PropertyGroup>
13-
<CsWinRTComponent>true</CsWinRTComponent>
14-
<CsWinRTWindowsMetadata>10.0.22000.0</CsWinRTWindowsMetadata>
15-
<CsWinRTGeneratedFilesDir>$(MSBuildProjectDirectory)\bin\$(Platform)\$(Configuration)</CsWinRTGeneratedFilesDir>
16-
</PropertyGroup>
17-
<ItemGroup>
18-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.1" />
19-
</ItemGroup>
2+
<PropertyGroup>
3+
<TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
4+
<AssemblyName>BackgroundTasks</AssemblyName>
5+
<DefaultLanguage>en-US</DefaultLanguage>
6+
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
7+
<IsTrimmable>true</IsTrimmable>
8+
<Configurations>Debug;Release;Sideload</Configurations>
9+
<Platforms>x86;x64;ARM64</Platforms>
10+
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
11+
</PropertyGroup>
12+
<PropertyGroup>
13+
<CsWinRTComponent>true</CsWinRTComponent>
14+
<CsWinRTWindowsMetadata>10.0.22621.0</CsWinRTWindowsMetadata>
15+
<CsWinRTGeneratedFilesDir>$(MSBuildProjectDirectory)\bin\$(Platform)\$(Configuration)</CsWinRTGeneratedFilesDir>
16+
</PropertyGroup>
17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.1" />
19+
</ItemGroup>
2020
</Project>
Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0'">
4-
<VisualStudioVersion>17.0</VisualStudioVersion>
5-
</PropertyGroup>
6-
<ItemGroup Label="ProjectConfigurations">
7-
<ProjectConfiguration Include="Debug|x86">
8-
<Configuration>Debug</Configuration>
9-
<Platform>x86</Platform>
10-
</ProjectConfiguration>
11-
<ProjectConfiguration Include="Release|x86">
12-
<Configuration>Release</Configuration>
13-
<Platform>x86</Platform>
14-
</ProjectConfiguration>
15-
<ProjectConfiguration Include="Sideload|x86">
16-
<Configuration>Sideload</Configuration>
17-
<Platform>x86</Platform>
18-
</ProjectConfiguration>
19-
<ProjectConfiguration Include="Debug|x64">
20-
<Configuration>Debug</Configuration>
21-
<Platform>x64</Platform>
22-
</ProjectConfiguration>
23-
<ProjectConfiguration Include="Release|x64">
24-
<Configuration>Release</Configuration>
25-
<Platform>x64</Platform>
26-
</ProjectConfiguration>
27-
<ProjectConfiguration Include="Sideload|x64">
28-
<Configuration>Sideload</Configuration>
29-
<Platform>x64</Platform>
30-
</ProjectConfiguration>
31-
<ProjectConfiguration Include="Debug|ARM64">
32-
<Configuration>Debug</Configuration>
33-
<Platform>ARM64</Platform>
34-
</ProjectConfiguration>
35-
<ProjectConfiguration Include="Release|ARM64">
36-
<Configuration>Release</Configuration>
37-
<Platform>ARM64</Platform>
38-
</ProjectConfiguration>
39-
<ProjectConfiguration Include="Sideload|ARM64">
40-
<Configuration>Sideload</Configuration>
41-
<Platform>ARM64</Platform>
42-
</ProjectConfiguration>
43-
</ItemGroup>
44-
<PropertyGroup>
45-
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
46-
<PathToXAMLWinRTImplementations>Files.App\</PathToXAMLWinRTImplementations>
47-
</PropertyGroup>
48-
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
49-
<PropertyGroup>
50-
<ProjectGuid>8f60fd8e-1921-47d6-97b0-d26d7b3a4999</ProjectGuid>
51-
<TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
52-
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
53-
<AssetTargetFallback>net7.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
54-
<DefaultLanguage>en-US</DefaultLanguage>
55-
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
56-
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
57-
<AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
58-
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
59-
<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
60-
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
61-
<DisableXbfLineInfo>False</DisableXbfLineInfo>
62-
<GenerateTestArtifacts>True</GenerateTestArtifacts>
63-
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
64-
<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;ro-RO;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
65-
<UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
66-
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
67-
<EntryPointProjectUniqueName>..\Files.App\Files.App.csproj</EntryPointProjectUniqueName>
68-
<AppxBundle>Always</AppxBundle>
69-
</PropertyGroup>
70-
<ItemGroup>
71-
<AppxManifest Include="Package.appxmanifest">
72-
<SubType>Designer</SubType>
73-
</AppxManifest>
74-
</ItemGroup>
75-
<ItemGroup>
76-
<Content Include="Assets\AppTiles\Dev\**" />
77-
<Content Include="Package.appinstaller" />
78-
</ItemGroup>
79-
<ItemGroup>
80-
<ProjectReference Include="..\Files.App\Files.App.csproj">
81-
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
82-
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
83-
</ProjectReference>
84-
</ItemGroup>
85-
<ItemGroup>
86-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" IncludeAssets="build" />
87-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" IncludeAssets="build" />
88-
</ItemGroup>
89-
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
90-
</Project>
3+
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0'">
4+
<VisualStudioVersion>17.0</VisualStudioVersion>
5+
</PropertyGroup>
6+
<ItemGroup Label="ProjectConfigurations">
7+
<ProjectConfiguration Include="Debug|x86">
8+
<Configuration>Debug</Configuration>
9+
<Platform>x86</Platform>
10+
</ProjectConfiguration>
11+
<ProjectConfiguration Include="Release|x86">
12+
<Configuration>Release</Configuration>
13+
<Platform>x86</Platform>
14+
</ProjectConfiguration>
15+
<ProjectConfiguration Include="Sideload|x86">
16+
<Configuration>Sideload</Configuration>
17+
<Platform>x86</Platform>
18+
</ProjectConfiguration>
19+
<ProjectConfiguration Include="Debug|x64">
20+
<Configuration>Debug</Configuration>
21+
<Platform>x64</Platform>
22+
</ProjectConfiguration>
23+
<ProjectConfiguration Include="Release|x64">
24+
<Configuration>Release</Configuration>
25+
<Platform>x64</Platform>
26+
</ProjectConfiguration>
27+
<ProjectConfiguration Include="Sideload|x64">
28+
<Configuration>Sideload</Configuration>
29+
<Platform>x64</Platform>
30+
</ProjectConfiguration>
31+
<ProjectConfiguration Include="Debug|ARM64">
32+
<Configuration>Debug</Configuration>
33+
<Platform>ARM64</Platform>
34+
</ProjectConfiguration>
35+
<ProjectConfiguration Include="Release|ARM64">
36+
<Configuration>Release</Configuration>
37+
<Platform>ARM64</Platform>
38+
</ProjectConfiguration>
39+
<ProjectConfiguration Include="Sideload|ARM64">
40+
<Configuration>Sideload</Configuration>
41+
<Platform>ARM64</Platform>
42+
</ProjectConfiguration>
43+
</ItemGroup>
44+
<PropertyGroup>
45+
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
46+
<PathToXAMLWinRTImplementations>Files.App\</PathToXAMLWinRTImplementations>
47+
</PropertyGroup>
48+
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
49+
<PropertyGroup>
50+
<ProjectGuid>8f60fd8e-1921-47d6-97b0-d26d7b3a4999</ProjectGuid>
51+
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
52+
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
53+
<AssetTargetFallback>net7.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
54+
<DefaultLanguage>en-US</DefaultLanguage>
55+
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
56+
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
57+
<AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
58+
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
59+
<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
60+
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
61+
<DisableXbfLineInfo>False</DisableXbfLineInfo>
62+
<GenerateTestArtifacts>True</GenerateTestArtifacts>
63+
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
64+
<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>
65+
<UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
66+
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
67+
<EntryPointProjectUniqueName>..\Files.App\Files.App.csproj</EntryPointProjectUniqueName>
68+
<AppxBundle>Always</AppxBundle>
69+
</PropertyGroup>
70+
<ItemGroup>
71+
<AppxManifest Include="Package.appxmanifest">
72+
<SubType>Designer</SubType>
73+
</AppxManifest>
74+
</ItemGroup>
75+
<ItemGroup>
76+
<Content Include="Assets\AppTiles\Dev\**" />
77+
<Content Include="Package.appinstaller" />
78+
</ItemGroup>
79+
<ItemGroup>
80+
<ProjectReference Include="..\Files.App\Files.App.csproj">
81+
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
82+
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
83+
</ProjectReference>
84+
</ItemGroup>
85+
<ItemGroup>
86+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" IncludeAssets="build" />
87+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" IncludeAssets="build" />
88+
</ItemGroup>
89+
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
90+
</Project>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
1010
xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
1111
IgnorableNamespaces="uap uap5 mp rescap desktop4 desktop">
12-
<Identity Name="FilesDev" Publisher="CN=Files" Version="2.3.61.0" />
12+
<Identity Name="FilesDev" Publisher="CN=Files" Version="2.4.3.0" />
1313
<Properties>
1414
<DisplayName>Files - Dev</DisplayName>
1515
<PublisherDisplayName>Yair A</PublisherDisplayName>
@@ -33,6 +33,7 @@
3333
<Resource Language="en-GB"/>
3434
<Resource Language="es-ES"/>
3535
<Resource Language="es-419"/>
36+
<Resource Language="fi-FI"/>
3637
<Resource Language="fil-PH"/>
3738
<Resource Language="fr-FR"/>
3839
<Resource Language="he-IL"/>

0 commit comments

Comments
 (0)