Skip to content

Commit 55c40d7

Browse files
0x5bfa0x5bfa
committed
Merge remote-tracking branch 'upstream/main' into 5bfa/CQ-PreviewHandlerVanaraRemoval
2 parents d71f66d + 99b8408 commit 55c40d7

File tree

73 files changed

+794
-420
lines changed

Some content is hidden

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

73 files changed

+794
-420
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Bug Report
2-
description: Create a bug report to help improve Files
2+
description: Create a bug report to help improve Files.
33
labels: [bug]
44
body:
55

@@ -38,7 +38,7 @@ body:
3838
id: files_version
3939
attributes:
4040
label: Files Version
41-
description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version
41+
description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version.
4242
placeholder: "e.g. 2.0.34.0"
4343
validations:
4444
required: true
@@ -48,11 +48,21 @@ body:
4848
id: windows_version
4949
attributes:
5050
label: Windows Version
51-
description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version
51+
description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version.
5252
placeholder: "e.g. 10.0.22621.1848"
5353
validations:
5454
required: true
5555

56+
# User ID
57+
- type: input
58+
id: user_id
59+
attributes:
60+
label: User ID
61+
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.
62+
placeholder: "74750836-5885-4eeb-964f-8177cb4babf6"
63+
validations:
64+
required: false
65+
5666
# Log File
5767
- type: textarea
5868
attributes:

‎.github/ISSUE_TEMPLATE/feature_request.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Feature Request
2-
description: This project thrives from differentiation from competing apps. Suggest an idea for Files
2+
description: This project thrives from differentiation from competing apps. Suggest an idea for Files.
33
labels: [feature request]
44
body:
55

@@ -23,7 +23,7 @@ body:
2323
- type: textarea
2424
attributes:
2525
label: Requirements
26-
description: Describe all the requirements to make your idea happen
26+
description: Describe all the requirements to make your idea happen.
2727
value: |
2828
- This proposal will accomplish X
2929
- This proposal will accomplish Y
@@ -36,7 +36,7 @@ body:
3636
id: files_version
3737
attributes:
3838
label: Files Version
39-
description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version
39+
description: Which version of Files are you using? To copy your Files version, access it from Settings -> About -> Copy -> Files version.
4040
placeholder: 'e.g. 2.0.36.0'
4141
validations:
4242
required: true
@@ -46,7 +46,7 @@ body:
4646
id: windows_version
4747
attributes:
4848
label: Windows Version
49-
description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version
49+
description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version.
5050
placeholder: "e.g. 10.0.22621.1848"
5151
validations:
5252
required: true

‎.github/README.md

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

‎.github/scripts/Configure-AppxManifest.ps1

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ if ($Branch -eq "Preview")
2020
$xmlDoc.Package.Identity.Name="FilesPreview"
2121
$xmlDoc.Package.Properties.DisplayName="Files - Preview"
2222
$xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files - Preview"
23+
$xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files - Preview"
2324
$xmlDoc.Save($PackageManifestPath)
2425

2526
Get-ChildItem $WorkingDir -Include *.csproj, *.appxmanifest, *.wapproj, *.xaml -recurse | ForEach-Object -Process `
@@ -34,6 +35,7 @@ elseif ($Branch -eq "Stable")
3435
$xmlDoc.Package.Identity.Name="Files"
3536
$xmlDoc.Package.Properties.DisplayName="Files"
3637
$xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
38+
$xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files"
3739
$xmlDoc.Save($PackageManifestPath)
3840

3941
Get-ChildItem $WorkingDir -Include *.csproj, *.appxmanifest, *.wapproj, *.xaml -recurse | ForEach-Object -Process `
@@ -46,8 +48,9 @@ elseif ($Branch -eq "Store")
4648
{
4749
# Set identities
4850
$xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP"
49-
$xmlDoc.Package.Properties.DisplayName="Files"
51+
$xmlDoc.Package.Properties.DisplayName="Files App"
5052
$xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
53+
$xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files"
5154

5255
# Remove an capability that is used for the sideload
5356
$nsmgr = New-Object System.Xml.XmlNamespaceManager($xmlDoc.NameTable)

‎.gitignore

+88-12
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Files.App.SaveDialog*.dll
99
Files.App.Launcher.exe
1010

1111
# User-specific files
12+
*.rsuser
1213
*.suo
1314
*.user
1415
*.userosscache
@@ -17,17 +18,24 @@ Files.App.Launcher.exe
1718
# User-specific files (MonoDevelop/Xamarin Studio)
1819
*.userprefs
1920

21+
# Mono auto generated files
22+
mono_crash.*
23+
2024
# Build results
2125
[Dd]ebug/
2226
[Dd]ebugPublic/
2327
[Rr]elease/
2428
[Rr]eleases/
2529
x64/
2630
x86/
31+
[Ww][Ii][Nn]32/
32+
[Aa][Rr][Mm]/
33+
[Aa][Rr][Mm]64/
2734
bld/
2835
[Bb]in/
2936
[Oo]bj/
3037
[Ll]og/
38+
[Ll]ogs/
3139

3240
# Visual Studio 2015/2017 cache/options directory
3341
.vs/
@@ -41,9 +49,10 @@ Generated\ Files/
4149
[Tt]est[Rr]esult*/
4250
[Bb]uild[Ll]og.*
4351

44-
# NUNIT
52+
# NUnit
4553
*.VisualState.xml
4654
TestResult.xml
55+
nunit-*.xml
4756

4857
# Build Results of an ATL Project
4958
[Dd]ebugPS/
@@ -57,6 +66,10 @@ BenchmarkDotNet.Artifacts/
5766
project.lock.json
5867
project.fragment.lock.json
5968
artifacts/
69+
**/Properties/launchSettings.json
70+
71+
# ASP.NET Scaffolding
72+
ScaffoldingReadMe.txt
6073

6174
# StyleCop
6275
StyleCopReport.xml
@@ -65,6 +78,7 @@ StyleCopReport.xml
6578
*_i.c
6679
*_p.c
6780
*_i.h
81+
*_h.h
6882
*.ilk
6983
*.meta
7084
*.obj
@@ -81,7 +95,9 @@ StyleCopReport.xml
8195
*.tlh
8296
*.tmp
8397
*.tmp_proj
98+
*_wpftmp.csproj
8499
*.log
100+
*.tlog
85101
*.vspscc
86102
*.vssscc
87103
.builds
@@ -136,6 +152,11 @@ _TeamCity*
136152
.axoCover/*
137153
!.axoCover/settings.json
138154

155+
# Coverlet is a free, cross platform Code Coverage Tool
156+
coverage*.json
157+
coverage*.xml
158+
coverage*.info
159+
139160
# Visual Studio code coverage results
140161
*.coverage
141162
*.coveragexml
@@ -173,14 +194,16 @@ publish/
173194
*.azurePubxml
174195
# Note: Comment the next line if you want to checkin your web deploy settings,
175196
# but database connection strings (with potential passwords) will be unencrypted
197+
*.pubxml
176198
*.publishproj
177199

178200
# Microsoft Azure Web App publish settings. Comment the next line if you want to
179201
# checkin your Azure Web App publish settings, but sensitive information contained
180202
# in these scripts will be unencrypted
181203
PublishScripts/
182204

183-
# NuGet Packages
205+
# NuGet Symbol Packages
206+
*.snupkg
184207
# The packages folder can be ignored because of Package Restore
185208
**/[Pp]ackages/*
186209
# except build/, which is used as an MSBuild target.
@@ -205,12 +228,14 @@ BundleArtifacts/
205228
Package.StoreAssociation.xml
206229
_pkginfo.txt
207230
*.appx
231+
*.appxbundle
232+
*.appxupload
208233

209234
# Visual Studio cache files
210235
# files ending in .cache can be ignored
211236
*.[Cc]ache
212237
# but keep track of directories ending in .cache
213-
!*.[Cc]ache/
238+
!?*.[Cc]ache/
214239

215240
# Others
216241
ClientBin/
@@ -221,10 +246,11 @@ ClientBin/
221246
*.jfm
222247
src/**/*.pfx
223248
tests/**/*.pfx
249+
*.pfx
224250
*.publishsettings
225251
orleans.codegen.cs
226252

227-
# Including strong name files can present a security risk
253+
# Including strong name files can present a security risk
228254
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
229255
#*.snk
230256

@@ -255,6 +281,9 @@ ServiceFabricBackup/
255281
*.bim.layout
256282
*.bim_*.settings
257283
*.rptproj.rsuser
284+
*- [Bb]ackup.rdl
285+
*- [Bb]ackup ([0-9]).rdl
286+
*- [Bb]ackup ([0-9][0-9]).rdl
258287

259288
# Microsoft Fakes
260289
FakesAssemblies/
@@ -275,6 +304,17 @@ node_modules/
275304
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
276305
*.vbw
277306

307+
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
308+
*.vbp
309+
310+
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
311+
*.dsw
312+
*.dsp
313+
314+
# Visual Studio 6 technical files
315+
*.ncb
316+
*.aps
317+
278318
# Visual Studio LightSwitch build output
279319
**/*.HTMLClient/GeneratedArtifacts
280320
**/*.DesktopClient/GeneratedArtifacts
@@ -290,12 +330,9 @@ paket-files/
290330
# FAKE - F# Make
291331
.fake/
292332

293-
# JetBrains Rider
294-
.idea/
295-
*.sln.iml
296-
297-
# CodeRush
333+
# CodeRush personal settings
298334
.cr/
335+
.cr/personal
299336

300337
# Python Tools for Visual Studio (PTVS)
301338
__pycache__/
@@ -320,7 +357,7 @@ __pycache__/
320357
# OpenCover UI analysis results
321358
OpenCover/
322359

323-
# Azure Stream Analytics local run output
360+
# Azure Stream Analytics local run output
324361
ASALocalRun/
325362

326363
# MSBuild Binary and Structured Log
@@ -329,6 +366,45 @@ ASALocalRun/
329366
# NVidia Nsight GPU debugger configuration file
330367
*.nvuser
331368

332-
# MFractors (Xamarin productivity tool) working folder
369+
# MFractors (Xamarin productivity tool) working folder
333370
.mfractor/
334-
Files.Extensions/nul
371+
372+
# Local History for Visual Studio
373+
.localhistory/
374+
375+
# Visual Studio History (VSHistory) files
376+
.vshistory/
377+
378+
# BeatPulse healthcheck temp database
379+
healthchecksdb
380+
381+
# Backup folder for Package Reference Convert tool in Visual Studio 2017
382+
MigrationBackup/
383+
384+
# Ionide (cross platform F# VS Code tools) working folder
385+
.ionide/
386+
387+
# Fody - auto-generated XML schema
388+
FodyWeavers.xsd
389+
390+
# VS Code files for those working on multiple tools
391+
.vscode/*
392+
!.vscode/settings.json
393+
!.vscode/tasks.json
394+
!.vscode/launch.json
395+
!.vscode/extensions.json
396+
*.code-workspace
397+
398+
# Local History for Visual Studio Code
399+
.history/
400+
401+
# Windows Installer files from build outputs
402+
*.cab
403+
*.msi
404+
*.msix
405+
*.msm
406+
*.msp
407+
408+
# JetBrains Rider
409+
*.sln.iml
410+
.idea/

‎builds/azure-pipelines-release.yml

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Identity
1717
Name="FilesDev"
1818
Publisher="CN=Files"
19-
Version="3.7.5.0" />
19+
Version="3.7.7.0" />
2020

2121
<Properties>
2222
<DisplayName>Files - Dev</DisplayName>
@@ -98,7 +98,7 @@
9898
Wide310x150Logo="Assets\AppTiles\Dev\Wide310x150Logo.png"
9999
Square71x71Logo="Assets\AppTiles\Dev\Small71x71Logo.png"
100100
Square310x310Logo="Assets\AppTiles\Dev\Large310x310Logo.png"
101-
ShortName="Files">
101+
ShortName="Files - Dev">
102102
<uap:ShowNameOnTiles>
103103
<uap:ShowOn Tile="square150x150Logo" />
104104
<uap:ShowOn Tile="wide310x150Logo" />

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ ActionsSettingsService.ActionsV2 is not null
483483
.SelectMany(command => command.HotKeys, (command, hotKey) => (Command: command, HotKey: hotKey))
484484
.ToImmutableDictionary(item => item.HotKey, item => item.Command);
485485

486-
App.Logger.LogWarning(ex, "The app found some keys in different commands are duplicated and are using default key bindings for those commands.");
486+
App.Logger.LogInformation(ex, "The app found some keys in different commands are duplicated and are using default key bindings for those commands.");
487487
}
488488
catch (Exception ex)
489489
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public interface IInfoPaneSettingsService : IBaseSettingsService, INotifyPropert
1010
/// <summary>
1111
/// Gets or sets a value indicating if the preview pane is enabled.
1212
/// </summary>
13-
bool IsEnabled { get; set; }
13+
bool IsInfoPaneEnabled { get; set; }
1414

1515
/// <summary>
1616
/// Gets or sets a value indicating the height of the pane in a horizontal layout.

0 commit comments

Comments
 (0)