Merge branch 'main' into 5bfa/CQ-PreviewHandlerVanaraRemoval

Author: 0x5bfa

.github/workflows/cd-preview.yml

@@ -49,7 +49,7 @@ jobs:
     - name: Setup .NET 8
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.x'
+        global-json-file: global.json
 
     - name: Configure the package manifest, logo, and secrets
       shell: pwsh

.github/workflows/cd-stable.yml

@@ -49,7 +49,7 @@ jobs:
     - name: Setup .NET 8
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.x'
+        global-json-file: global.json
 
     - name: Configure the package manifest, logo, and secrets
       shell: pwsh

.github/workflows/ci.yml

@@ -60,7 +60,11 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 2
-    
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v4
+      with:
+        global-json-file: global.json
+
     - name: Install XamlStyler console
       run: 'dotnet tool install --global XamlStyler.Console'
 
@@ -107,7 +111,7 @@ jobs:
     - name: Setup .NET 8
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.x'
+        global-json-file: global.json
 
     - name: Restore NuGet
       shell: pwsh
@@ -205,6 +209,10 @@ jobs:
 
     - name: Checkout the repository
       uses: actions/checkout@v4
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v4
+      with:
+        global-json-file: global.json
 
     - name: Download the packages from the Artifacts
       uses: actions/download-artifact@v4

.github/workflows/format-xaml.yml

@@ -46,6 +46,11 @@ jobs:
       - uses: actions/checkout@v4
         if: env.CAN_RUN == 1
 
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+
       - name: Set git identity
         if: env.CAN_RUN == 1
         run: |

global.json

@@ -0,0 +1,5 @@
+{
+	"sdk": {
+		"version": "8.0.303"
+	}
+}

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

@@ -16,7 +16,7 @@
     <Identity
         Name="FilesDev"
         Publisher="CN=Files"
-        Version="3.6.8.0" />
+        Version="3.6.17.0" />
 
     <Properties>
         <DisplayName>Files - Dev</DisplayName>

src/Files.App.CsWin32/NativeMethods.json

@@ -4,17 +4,7 @@
 	"public": true,
 	"comInterop": {
 		"preserveSigMethods": [
-			"IEnumShellItems.Next",
-			"IInitializeWithFile.Initialize",
-			"IInitializeWithItem.Initialize",
-			"IInitializeWithStream.Initialize",
-			"IPreviewHandler.QueryFocus",
-			"IPreviewHandler.SetRect",
-			"IObjectWithSite.SetSite",
-			"IPreviewHandler.SetWindow",
-			"IPreviewHandlerVisuals.SetBackgroundColor",
-			"IPreviewHandlerVisuals.SetFont",
-			"IPreviewHandlerVisuals.SetTextColor",
+			"*"
 		]
 	}
 }

src/Files.App.CsWin32/NativeMethods.txt

@@ -120,6 +120,18 @@ WindowsCreateString
 WindowsDeleteString
 IPreviewHandler
 AssocQueryString
+GetModuleHandle
+SHEmptyRecycleBin
+SHFileOperation
+SHGetFolderPath
+SHGFP_TYPE
+SHGetKnownFolderItem
+SHQUERYRBINFO
+SHQueryRecycleBin
+FileOperation
+IFileOperation
+IShellItem2
+PSGetPropertyKeyFromName
 ShellExecuteEx
 E_FAIL
 S_OK

src/Files.App.CsWin32/Windows.Win32.Extras.cs

@@ -0,0 +1,34 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using System;
+using System.Runtime.InteropServices;
+using Windows.Win32.Foundation;
+
+namespace Windows.Win32
+{
+	namespace Graphics.Gdi
+	{
+		[UnmanagedFunctionPointer(CallingConvention.Winapi)]
+		public unsafe delegate BOOL MONITORENUMPROC([In] HMONITOR param0, [In] HDC param1, [In][Out] RECT* param2, [In] LPARAM param3);
+	}
+
+	namespace UI.WindowsAndMessaging
+	{
+		[UnmanagedFunctionPointer(CallingConvention.Winapi)]
+		public delegate LRESULT WNDPROC(HWND hWnd, uint msg, WPARAM wParam, LPARAM lParam);
+	}
+
+	namespace UI.Shell
+	{
+		public static partial class FOLDERID
+		{
+			public readonly static Guid FOLDERID_RecycleBinFolder = new(0xB7534046, 0x3ECB, 0x4C18, 0xBE, 0x4E, 0x64, 0xCD, 0x4C, 0xB7, 0xD6, 0xAC);
+		}
+
+		public static partial class BHID
+		{
+			public readonly static Guid BHID_EnumItems = new(0x94f60519, 0x2850, 0x4924, 0xaa, 0x5a, 0xd1, 0x5e, 0x84, 0x86, 0x80, 0x39);
+		}
+	}
+}