merge

.gitattributes

@@ -61,3 +61,5 @@
 #*.PDF   diff=astextplain
 #*.rtf   diff=astextplain
 #*.RTF   diff=astextplain
+
+*.h linguist-language=C++

.github/CONTRIBUTING.md

@@ -6,7 +6,7 @@ We are happy to hear your feedback for the future of Files. Check the
 submitted similar feedback. You can add your feedback to existing issues or you can open a new issue.
 
 We always look at your feedback when we decide what to work on next and we look forward to hearing your ideas. Remember that
-all community interactions must abide by the [Code of Conduct](https://github.com/files-community/Files/blob/main/CODE_OF_CONDUCT.md).
+all community interactions must abide by the [Code of Conduct](./CODE_OF_CONDUCT.md).
 
 ## Finding issues you can help with
 Looking for something to work on?

.github/FUNDING.yml

@@ -1 +1 @@
-github: [yaira2, Josh65-2201, marcelwgn, gave92]
+github: [yair100, Josh65-2201, "0x5BFA"]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,8 +1,16 @@
 name: Bug Report
-description: Create a bug report to help improve Files
-labels: [bug]
+description: Create a bug report to help improve Files.
+type: 'Bug'
+title: 'Bug: '
 body:
 
+  # Tip to warn of checking for existing issues
+  - type: markdown
+    attributes:
+      value: |
+        > [!TIP]
+        > Have you checked for similar issues? There's a possibility the bug you are experiencing has already been reported. Please do a thorough search before creating a new issue.
+
   # Description
   - type: textarea
     attributes:
@@ -23,22 +31,12 @@ body:
     validations:
       required: true
 
-  # Requirements
-  - type: textarea
-    attributes:
-      label: Requirements
-      description: describe the expected behavior (eg. Fix crash that occurs when...). If left blank, the issue will likely be closed without discussion.
-      value: |
-        - e.g. Fix crash that occurs when...
-    validations:
-      required: true
-
   # Files Version
   - type: input
     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,20 +46,39 @@ 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
+
+  # Note that the user should always upload the report rather than pasting it.
+  - type: markdown
+    attributes:
+      value: |
+        > [!IMPORTANT]
+        > Please **upload** the log file by clicking "Attach files".
+        >
+        > The log file can be accessed from **Settings → About → Open log location**. If you cannot access the UI, you can locate the file [manually](https://files.community/docs/getting-started/faq#:~:text=How%20to%20Locate%20the%20Log%20File).
+        >
+        > Feel free to remove potentially sensitive information such as usernames or drive names before uploading the file.
+
   # Log File
   - type: textarea
     attributes:
       label: Log File
       description: |
         Please upload the log file as an attachment (DO NOT COPY OR PASTE THE CONTENTS INTO THIS FIELD)
       placeholder: |
-        To upload the log, access it from Settings -> About -> Open log location; Or
-        - Select the `debug.log` file from `%localappdata%\Packages\49306atecsolution.FilesUWP_et10x9a9vyk8t\LocalState`
-        - Drag and drop the file to upload as an attachment 
+        Please upload the log file as an attachment (DO NOT COPY OR PASTE THE CONTENTS INTO THIS FIELD)
     validations:
       required: true

.github/ISSUE_TEMPLATE/code_quality_issue.yml

@@ -1,19 +1,33 @@
 name: Code Quality Issue
 description: Create a code quality issue to help Files keep a clean codebase
-labels: [codebase quality]
+type: 'Code quality'
+title: 'Code Quality: '
 body:
+
+  # Tip to warn of checking for existing issues
+  - type: markdown
+    attributes:
+      value: |
+        > [!TIP]
+        > Have you checked for similar code quality issues? There's a possibility your suggestion is already being tracked. Please do a thorough search before creating a new issue.
+
+  # Issue body
   - type: textarea
     attributes:
       label: Description
       description: A clear and concise description of what the code quality issue is.
     validations:
       required: true
+
+  # Related code
   - type: textarea
     attributes:
       label: Concerned code
       description: A list of the different files and/or areas of the code concerned by the issue.
     validations:
       required: true
+
+  # Gains
   - type: textarea
     attributes:
       label: Gains
@@ -24,6 +38,8 @@ body:
         - eg. Clarifying the responsibility of class C.
     validations:
       required: true
+
+  # Requirements
   - type: textarea
     attributes:
       label: Requirements
@@ -32,6 +48,8 @@ body:
         - eg. Using a specific design pattern.
         - eg. Separating Interface I into three new interfaces I1, I2 and I3.
         - eg. Regrouping the duplicated process into a new helper.
+
+  # Remarks
   - type: textarea
     attributes:
       label: Comments

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,8 +1,16 @@
 name: Feature Request
-description: This project thrives from differentiation from competing apps. Suggest an idea for Files
-labels: [feature request]
+description: This project thrives from differentiation from competing apps. Suggest an idea for Files.
+type: 'Feature request'
+title: 'Feature: '
 body:
 
+  # Tip to warn of checking for existing issues
+  - type: markdown
+    attributes:
+      value: |
+        > [!TIP]
+        >Have you checked for similar feature requests? There's a possibility your suggestion is already being tracked. Please do a thorough search before creating a new issue.
+
   # Description
   - type: textarea
     attributes:
@@ -23,7 +31,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 +44,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 +54,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/NOTICE.md

@@ -199,35 +199,6 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
-## INI File Parser
-
-**Source**: [https://github.com/rickyah/ini-parser](https://github.com/rickyah/ini-parser)
-
-### License
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2008 Ricardo Amores Hernández
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-```
-
 ## SevenZipSharp
 
 **Source**: [https://github.com/files-community/SevenZipSharp](https://github.com/files-community/SevenZipSharp)
@@ -645,16 +616,16 @@ A "contributor" is any person that distributes its contribution under this licen
 (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
 ```
 
-## Vanara
+## libgit2sharp
 
-**Source**: [https://github.com/dahall/Vanara](https://github.com/dahall/Vanara)
+**Source**: [https://github.com/libgit2/libgit2sharp](https://github.com/libgit2/libgit2sharp)
 
 ### License
 
 ```
 MIT License
 
-Copyright (c) 2017 David Hall
+Copyright (c) LibGit2Sharp contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -663,58 +634,57 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 ```
 
-## WinUIEx
+## DiscUtils
 
-**Source**: [https://github.com/dotMorten/WinUIEx](https://github.com/dotMorten/WinUIEx)
+**Source**: [https://github.com/DiscUtils/DiscUtils](https://github.com/DiscUtils/DiscUtils)
 
 ### License
 
 ```
-MIT License
-
-Copyright (c) 2021 Morten Nielsen
+Copyright (c) 2008-2011, Kenneth Bell
+Copyright (c) 2014, Quamotion
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
 ```
 
-## libgit2sharp
+## NaturalStringComparer
 
-**Source**: [https://github.com/libgit2/libgit2sharp](https://github.com/libgit2/libgit2sharp)
+**Source**: [https://github.com/GihanSoft/NaturalStringComparer](https://github.com/GihanSoft/NaturalStringComparer)
 
 ### License
 
 ```
 MIT License
 
-Copyright (c) LibGit2Sharp contributors
+Copyright (c) 2018 Mohammad Babayi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -723,43 +693,30 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 ```
 
-## DiscUtils
+## Dongle.GuidRVAGen
 
-**Source**: [https://github.com/DiscUtils/DiscUtils](https://github.com/DiscUtils/DiscUtils)
+**Source**: [https://github.com/dongle-the-gadget/GuidRVAGen](https://github.com/dongle-the-gadget/GuidRVAGen)
 
 ### License
 
 ```
-Copyright (c) 2008-2011, Kenneth Bell
-Copyright (c) 2014, Quamotion
+Copyright (c) 2024 Dongle
 
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-```
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+```