Skip to content

Commit 7a4c39e

Browse files
Merge
2 parents eea72f1 + 4e806de commit 7a4c39e

File tree

2,849 files changed

+5653
-4712
lines changed

Some content is hidden

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

2,849 files changed

+5653
-4712
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ body:
1818
3. Scroll down to '....'
1919
validations:
2020
required: true
21+
- type: textarea
22+
attributes:
23+
label: Steps to fix
24+
description: describe all the requirements to fix the issue (if left blank, issue will likely be closed without discussion).
25+
value: |
26+
- eg. Fix crash that occurs when...
27+
- eg. Correct action happens when clicking...
28+
validations:
29+
required: true
2130
- type: input
2231
id: files-version
2332
attributes:

README.md

Lines changed: 1 addition & 1 deletion

builds/azure-pipelines-release.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ parameters:
2626
values:
2727
- 'Files (Preview)'
2828
- 'Files'
29+
- name: iconVariant
30+
displayName: Icon Variant
31+
type: string
32+
default: 'Preview'
33+
values:
34+
- 'Preview'
35+
- 'Release'
2936

3037
variables:
3138
- group: BuildPipelineVariables
@@ -57,14 +64,14 @@ jobs:
5764
$xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest')
5865
failOnStderr: true
5966

60-
# This replaces references to the dev icon with the regular release icon
67+
# This replaces references to the dev icon with the specified icon variant
6168
- task: PowerShell@2
6269
displayName: 'Use Correct Logo'
6370
inputs:
6471
targetType: 'inline'
6572
script: |
6673
gci $(Build.SourcesDirectory)\src -Include *.csproj, *.appxmanifest, *.wapproj -recurse | ForEach -Process {
67-
(Get-Content $_ -Raw | ForEach -Process {$_ -replace "Assets\\AppTilesDev", "Assets\AppTiles"}) | Set-Content $_ -NoNewline
74+
(Get-Content $_ -Raw | ForEach -Process {$_ -replace "Assets\\AppTiles\\Dev", "Assets\AppTiles\${{parameters.iconVariant}}"}) | Set-Content $_ -NoNewline
6875
}
6976
failOnStderr: true
7077

@@ -171,14 +178,14 @@ jobs:
171178
$xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest')
172179
failOnStderr: true
173180

174-
# This replaces references to the dev icon with the regular release icon
181+
# This replaces references to the dev icon with the specified icon variant
175182
- task: PowerShell@2
176-
displayName: 'Use Release Logo'
183+
displayName: 'Use Correct Logo'
177184
inputs:
178185
targetType: 'inline'
179186
script: |
180187
gci $(Build.SourcesDirectory)\src -Include *.csproj, *.appxmanifest, *.wapproj -recurse | ForEach -Process {
181-
(Get-Content $_ -Raw | ForEach -Process {$_ -replace "Assets\\AppTilesDev", "Assets\AppTiles"}) | Set-Content $_ -NoNewline
188+
(Get-Content $_ -Raw | ForEach -Process {$_ -replace "Assets\\AppTiles\\Dev", "Assets\AppTiles\${{parameters.iconVariant}}"}) | Set-Content $_ -NoNewline
182189
}
183190
failOnStderr: true
184191

src/Files.App/App.xaml

Lines changed: 1350 additions & 5 deletions
Large diffs are not rendered by default.

src/Files.App/App.xaml.cs

Lines changed: 434 additions & 453 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)