Skip to content

Commit d71f66d

Browse files
0x5bfa0x5bfa
authored
Merge branch 'main' into 5bfa/CQ-PreviewHandlerVanaraRemoval
2 parents fa4adc3 + 2a95708 commit d71f66d

File tree

94 files changed

+2714
-8245
lines changed

Some content is hidden

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

94 files changed

+2714
-8245
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ jobs:
114114
$fileContent | Set-Content $localFilePath
115115
116116
- name: Sign Files with Azure Trusted Signing
117-
uses: azure/trusted-signing-action@v0.3.20
117+
uses: azure/trusted-signing-action@v0.4.0
118118
with:
119119
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
120120
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
121121
azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
122122
endpoint: https://eus.codesigning.azure.net/
123-
code-signing-account-name: ${{ secrets.SIGNING_ACCOUNT_NAME }}
123+
trusted-signing-account-name: ${{ secrets.SIGNING_ACCOUNT_NAME }}
124124
certificate-profile-name: ${{ secrets.SIGNING_PROFILE_NAME }}
125125
files-folder: ${{ env.APPX_PACKAGE_DIR }}
126126
files-folder-filter: msixbundle

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ jobs:
114114
$fileContent | Set-Content $localFilePath
115115
116116
- name: Sign Files with Azure Trusted Signing
117-
uses: azure/trusted-signing-action@v0.3.20
117+
uses: azure/trusted-signing-action@v0.4.0
118118
with:
119119
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
120120
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
121121
azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
122122
endpoint: https://eus.codesigning.azure.net/
123-
code-signing-account-name: ${{ secrets.SIGNING_ACCOUNT_NAME }}
123+
trusted-signing-account-name: ${{ secrets.SIGNING_ACCOUNT_NAME }}
124124
certificate-profile-name: ${{ secrets.SIGNING_PROFILE_NAME }}
125125
files-folder: ${{ env.APPX_PACKAGE_DIR }}
126126
files-folder-filter: msixbundle

‎Files.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,4 +626,4 @@ Global
626626
GlobalSection(ExtensibilityGlobals) = postSolution
627627
SolutionGuid = {0E62043C-A7A1-4982-9EC9-4CDB2939B776}
628628
EndGlobalSection
629-
EndGlobal
629+
EndGlobal

‎builds/azure-pipelines-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
- task: UseDotNet@2
122122
inputs:
123123
packageType: sdk
124-
version: 8.0.x
124+
version: 8.0.303
125125
includePreviewVersions: false
126126

127127
- task: CmdLine@2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<DisableXbfLineInfo>False</DisableXbfLineInfo>
1515
<GenerateTestArtifacts>True</GenerateTestArtifacts>
1616
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
17-
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;be-BY;bg;ca;cs-CZ;da;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hr-HR;hu-HU;id-ID;it-IT;ja-JP;ka;km-KH;ko-KR;ku-Arab;lt-LT;lv-LV;ms-MY;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sq-AL;sr-Cyrl;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
17+
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;be-BY;bg;ca;cs-CZ;da;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hr-HR;hu-HU;id-ID;it-IT;ja-JP;ka;km-KH;ko-KR;lt-LT;lv-LV;ms-MY;nb-NO;nl-NL;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sq-AL;sr-Cyrl;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
1818
<UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
1919
<HoursBetweenUpdateChecks>255</HoursBetweenUpdateChecks>
2020
<EntryPointProjectUniqueName>..\Files.App\Files.App.csproj</EntryPointProjectUniqueName>

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

Lines changed: 1 addition & 3 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.6.17.0" />
19+
Version="3.7.5.0" />
2020

2121
<Properties>
2222
<DisplayName>Files - Dev</DisplayName>
@@ -57,13 +57,11 @@
5757
<Resource Language="ka" />
5858
<Resource Language="km-KH" />
5959
<Resource Language="ko-KR" />
60-
<Resource Language="ku-Arab" />
6160
<Resource Language="lt-LT" />
6261
<Resource Language="lv-LV" />
6362
<Resource Language="ms-MY" />
6463
<Resource Language="nb-NO" />
6564
<Resource Language="nl-NL" />
66-
<Resource Language="or-IN" />
6765
<Resource Language="pl-PL" />
6866
<Resource Language="pt-BR" />
6967
<Resource Language="pt-PT" />

‎src/Files.App.CsWin32/Windows.Win32.ComPtr.cs‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Files Community
1+
// Copyright (c) 2024 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

44
using System;
@@ -8,38 +8,44 @@
88

99
namespace Windows.Win32
1010
{
11+
/// <summary>
12+
/// Contains a COM pointer and a set of methods to work with the pointer safely.
13+
/// </summary>
1114
public unsafe struct ComPtr<T> : IDisposable where T : unmanaged
1215
{
13-
private T* ptr;
16+
private T* _ptr;
1417

15-
public T* Value
16-
=> this.ptr;
18+
public bool IsNull
19+
=> _ptr == default;
1720

18-
public T** Address
19-
=> (T**)Unsafe.AsPointer(ref Unsafe.AsRef(in this));
21+
public ComPtr(T* ptr)
22+
{
23+
_ptr = ptr;
2024

21-
public bool IsNull
22-
=> ptr == default;
25+
if (ptr is not null)
26+
((IUnknown*)ptr)->AddRef();
27+
}
2328

24-
public ComPtr(T* other)
29+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
30+
public readonly T* Get()
2531
{
26-
this.ptr = other;
32+
return _ptr;
33+
}
2734

28-
if (other is not null)
29-
{
30-
_ = ((IUnknown*)other)->AddRef();
31-
}
35+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
36+
public readonly T** GetAddressOf()
37+
{
38+
return (T**)Unsafe.AsPointer(ref Unsafe.AsRef(in this));
3239
}
3340

41+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
3442
public void Dispose()
3543
{
36-
T* pointer = this.ptr;
37-
38-
if (pointer is not null)
44+
T* ptr = _ptr;
45+
if (ptr is not null)
3946
{
40-
this.ptr = null;
41-
42-
_ = ((IUnknown*)pointer)->Release();
47+
_ptr = null;
48+
((IUnknown*)ptr)->Release();
4349
}
4450
}
4551
}

‎src/Files.App.Server/Files.App.Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>WinExe</OutputType>
55
<DefaultLanguage>en-US</DefaultLanguage>
66
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
7-
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;be-BY;bg;ca;cs-CZ;da;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hr-HR;hu-HU;id-ID;it-IT;ja-JP;ka;km-KH;ko-KR;ku-Arab;lt-LT;lv-LV;ms-MY;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sq-AL;sr-Cyrl;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
7+
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;be-BY;bg;ca;cs-CZ;da;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hr-HR;hu-HU;id-ID;it-IT;ja-JP;ka;km-KH;ko-KR;lt-LT;lv-LV;ms-MY;nb-NO;nl-NL;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sq-AL;sr-Cyrl;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
88
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
99
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
1010
<ImplicitUsings>enable</ImplicitUsings>

‎src/Files.App/Actions/FileSystem/OpenItemAction.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ public RichGlyph Glyph
2222
public HotKey HotKey
2323
=> new(Keys.Enter);
2424

25-
private const int MaxOpenCount = 10;
2625

2726
public bool IsExecutable =>
2827
context.HasSelection &&
29-
context.SelectedItems.Count <= MaxOpenCount &&
3028
!(context.ShellPage is ColumnShellPage &&
3129
context.SelectedItem?.PrimaryItemAttribute == StorageItemTypes.Folder);
3230

‎src/Files.App/App.xaml.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ async Task ActivateAsync()
159159
}
160160

161161
await AppLifecycleHelper.InitializeAppComponentsAsync();
162-
163-
AppLifecycleHelper.IsLaunchInitialized = true;
164162
}
165163
}
166164

0 commit comments

Comments
 (0)