Skip to content

Commit d11a561

Browse files
gave92gave92
authored
Merge branch 'main' into terminal
2 parents 7a2a827 + aaefa0a commit d11a561

Some content is hidden

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

42 files changed

+317
-131
lines changed

‎.github/scripts/Configure-AppxManifest.ps1‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ elseif ($Branch -eq "StorePreview")
8080
(Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "Assets\\AppTiles\\Dev", "Assets\AppTiles\Preview" }) | `
8181
Set-Content $_ -NoNewline `
8282
}
83+
84+
Get-ChildItem $WorkingDir -Include *.cs, *.cpp -recurse | ForEach-Object -Process `
85+
{ `
86+
(Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "files-dev", "files-preview" }) | `
87+
Set-Content $_ -NoNewline `
88+
}
8389
}
8490
elseif ($Branch -eq "SideloadStable")
8591
{
@@ -121,8 +127,8 @@ elseif ($Branch -eq "StoreStable")
121127
$xmlDoc.Package.Capabilities.RemoveChild($pm)
122128

123129
# Update app protocol and execution alias
124-
$ap.SetAttribute("Name", "files");
125-
$aea.RemoveChild($aea.FirstChild); # Avoid duplication
130+
$ap.SetAttribute("Name", "files-stable");
131+
$ea.SetAttribute("Alias", "files-stable.exe");
126132

127133
# Save modified Package.appxmanifest
128134
$xmlDoc.Save($PackageManifestPath)
@@ -135,7 +141,7 @@ elseif ($Branch -eq "StoreStable")
135141

136142
Get-ChildItem $WorkingDir -Include *.cs, *.cpp -recurse | ForEach-Object -Process `
137143
{ `
138-
(Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "files-dev", "files" }) | `
144+
(Get-Content $_ -Raw | ForEach-Object -Process { $_ -replace "files-dev", "files-stable" }) | `
139145
Set-Content $_ -NoNewline `
140146
}
141147
}

‎.github/workflows/cd-sideload-preview.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
PACKAGE_PROJECT_DIR: 'src\Files.App (Package)'
3737
PACKAGE_PROJECT_PATH: 'src\Files.App (Package)\Files.Package.wapproj'
3838
PACKAGE_MANIFEST_PATH: 'src\Files.App (Package)\Package.appxmanifest'
39+
LAUNCHER_PROJECT_PATH: 'src\Files.App.Launcher\Files.App.Launcher.vcxproj'
3940
TEST_PROJECT_PATH: 'tests\Files.InteractionTests\Files.InteractionTests.csproj'
4041
APP_INSTALLER_SIDELOAD_URL: 'https://cdn.files.community/files/preview/'
4142

@@ -86,6 +87,13 @@ jobs:
8687
-p:Configuration=$env:CONFIGURATION `
8788
-p:PublishReadyToRun=true
8889
90+
- name: Build launcher project
91+
shell: pwsh
92+
run: |
93+
msbuild "$env:LAUNCHER_PROJECT_PATH" `
94+
-p:Platform=$env:PLATFORM `
95+
-p:Configuration=$env:CONFIGURATION
96+
8997
- name: Build & package Files
9098
shell: pwsh
9199
run: |

‎.github/workflows/cd-sideload-stable.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
PACKAGE_PROJECT_DIR: 'src\Files.App (Package)'
3737
PACKAGE_PROJECT_PATH: 'src\Files.App (Package)\Files.Package.wapproj'
3838
PACKAGE_MANIFEST_PATH: 'src\Files.App (Package)\Package.appxmanifest'
39+
LAUNCHER_PROJECT_PATH: 'src\Files.App.Launcher\Files.App.Launcher.vcxproj'
3940
TEST_PROJECT_PATH: 'tests\Files.InteractionTests\Files.InteractionTests.csproj'
4041
APP_INSTALLER_SIDELOAD_URL: 'https://cdn.files.community/files/stable/'
4142

@@ -85,6 +86,13 @@ jobs:
8586
-p:Platform=$env:PLATFORM `
8687
-p:Configuration=$env:CONFIGURATION `
8788
-p:PublishReadyToRun=true
89+
90+
- name: Build launcher project
91+
shell: pwsh
92+
run: |
93+
msbuild "$env:LAUNCHER_PROJECT_PATH" `
94+
-p:Platform=$env:PLATFORM `
95+
-p:Configuration=$env:CONFIGURATION
8896
8997
- name: Build & package Files
9098
shell: pwsh

‎.github/workflows/cd-store-preview.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
PACKAGE_PROJECT_DIR: '${{ github.workspace }}\src\Files.App (Package)'
3636
PACKAGE_PROJECT_PATH: '${{ github.workspace }}\src\Files.App (Package)\Files.Package.wapproj'
3737
PACKAGE_MANIFEST_PATH: '${{ github.workspace }}\src\Files.App (Package)\Package.appxmanifest'
38+
LAUNCHER_PROJECT_PATH: 'src\Files.App.Launcher\Files.App.Launcher.vcxproj'
3839

3940
steps:
4041
- name: Checkout the repository
@@ -83,6 +84,13 @@ jobs:
8384
-p:Configuration=$env:CONFIGURATION `
8485
-p:PublishReadyToRun=true
8586
87+
- name: Build launcher project
88+
shell: pwsh
89+
run: |
90+
msbuild "$env:LAUNCHER_PROJECT_PATH" `
91+
-p:Platform=$env:PLATFORM `
92+
-p:Configuration=$env:CONFIGURATION
93+
8694
- name: Build & package Files
8795
shell: pwsh
8896
run: |

‎.github/workflows/cd-store-stable.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
PACKAGE_PROJECT_DIR: '${{ github.workspace }}\src\Files.App (Package)'
3636
PACKAGE_PROJECT_PATH: '${{ github.workspace }}\src\Files.App (Package)\Files.Package.wapproj'
3737
PACKAGE_MANIFEST_PATH: '${{ github.workspace }}\src\Files.App (Package)\Package.appxmanifest'
38+
LAUNCHER_PROJECT_PATH: 'src\Files.App.Launcher\Files.App.Launcher.vcxproj'
3839

3940
steps:
4041
- name: Checkout the repository
@@ -83,6 +84,13 @@ jobs:
8384
-p:Configuration=$env:CONFIGURATION `
8485
-p:PublishReadyToRun=true
8586
87+
- name: Build launcher project
88+
shell: pwsh
89+
run: |
90+
msbuild "$env:LAUNCHER_PROJECT_PATH" `
91+
-p:Platform=$env:PLATFORM `
92+
-p:Configuration=$env:CONFIGURATION
93+
8694
- name: Build & package Files
8795
shell: pwsh
8896
run: |

‎Files.sln‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ EndProject
2727
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App", "src\Files.App\Files.App.csproj", "{6F431D82-A5FF-4833-B5E4-702E1E523126}"
2828
ProjectSection(ProjectDependencies) = postProject
2929
{1EE996D6-885E-4403-A461-26C7A4E14D26} = {1EE996D6-885E-4403-A461-26C7A4E14D26}
30-
{A2FF3F3B-8EBC-4108-B99D-1476B7876656} = {A2FF3F3B-8EBC-4108-B99D-1476B7876656}
31-
{EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6} = {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}
30+
{25FD5045-6D4C-4DD0-B3AC-613AB59CBB07} = {25FD5045-6D4C-4DD0-B3AC-613AB59CBB07}
3231
{7756A1A4-17B5-4E6B-9B12-F19AA868A225} = {7756A1A4-17B5-4E6B-9B12-F19AA868A225}
32+
{A2FF3F3B-8EBC-4108-B99D-1476B7876656} = {A2FF3F3B-8EBC-4108-B99D-1476B7876656}
3333
{B3FE3F3B-CECC-4918-B72B-5488C3774125} = {B3FE3F3B-CECC-4918-B72B-5488C3774125}
34+
{EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6} = {EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}
3435
EndProjectSection
3536
EndProject
3637
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Files.Package", "src\Files.App (Package)\Files.Package.wapproj", "{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}"

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Identity
1717
Name="FilesDev"
1818
Publisher="CN=Files"
19-
Version="3.8.1.0" />
19+
Version="3.8.10.0" />
2020

2121
<Properties>
2222
<DisplayName>Files - Dev</DisplayName>
@@ -118,25 +118,13 @@
118118
</uap3:AppExtensionHost>
119119
</uap3:Extension>
120120

121-
<uap:Extension Category="windows.protocol">
122-
<!-- This is kept for backward compatibility. -->
123-
<uap:Protocol ReturnResults="none" Name="files-uwp" />
124-
</uap:Extension>
125-
126-
<uap:Extension Category="windows.protocol">
127-
<!-- This is kept for backward compatibility. -->
128-
<uap:Protocol ReturnResults="none" Name="files" />
129-
</uap:Extension>
130-
131121
<uap:Extension Category="windows.protocol">
132122
<!-- This value changes based on the build branch by CI (files-stable, files-preview, files-dev). -->
133123
<uap:Protocol ReturnResults="none" Name="files-dev" />
134124
</uap:Extension>
135125

136126
<uap5:Extension Category="windows.appExecutionAlias">
137127
<uap5:AppExecutionAlias>
138-
<!-- This is kept for backward compatibility. -->
139-
<uap5:ExecutionAlias Alias="files.exe" />
140128
<!-- This value changes based on the build branch by CI (files-stable, files-preview, files-dev). -->
141129
<uap5:ExecutionAlias Alias="files-dev.exe" />
142130
</uap5:AppExecutionAlias>

‎src/Files.App.Controls/ThemedIcon/ThemedIcon.Properties.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ protected virtual void OnOutlineIconPropertyChanged(string oldValue, string newV
3232
protected virtual void OnColorPropertyChanged(Brush oldValue, Brush newValue)
3333
{
3434
OnIconTypeChanged();
35+
OnIconColorChanged();
3536
}
3637

3738
protected virtual void OnIconTypePropertyChanged(ThemedIconTypes oldValue, ThemedIconTypes newValue)

‎src/Files.App.Controls/ThemedIcon/ThemedIcon.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,5 +240,14 @@ private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArg
240240
{
241241
UpdateVisualStates();
242242
}
243+
244+
private void OnIconColorChanged()
245+
{
246+
if (GetTemplateChild(OutlineIconPath) is Path outlinePath)
247+
outlinePath.Fill = (Brush)this.GetValue(ColorProperty);
248+
249+
if (GetTemplateChild(FilledIconPath) is Path fillPath)
250+
fillPath.Fill = (Brush)this.GetValue(ColorProperty);
251+
}
243252
}
244253
}

‎src/Files.App/Actions/Content/Tags/OpenAllTaggedActions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public async Task ExecuteAsync(object? parameter = null)
4747
await Task.WhenAll(filePaths.Select(path => NavigationHelpers.OpenPath(path, _pageContext.ShellPage!)));
4848

4949
foreach (var path in folderPaths)
50-
await NavigationHelpers.OpenPathInNewTab(path, false);
50+
await NavigationHelpers.OpenPathInNewTab(path);
5151
}
5252

5353
private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

0 commit comments

Comments
 (0)