From 6682124c9363cd63aee254bb328a8fd94a0fc7bd Mon Sep 17 00:00:00 2001
From: Steven He <hez2010@outlook.com>
Date: Sun, 24 Aug 2025 02:18:31 +0900
Subject: [PATCH 1/4] Use Satori GC for x64 and arm64 package

---
 Directory.Build.props                         |  4 +-
 src/Files.App (Package)/Files.Package.wapproj |  2 +-
 src/Files.App.Server/Files.App.Server.csproj  |  1 +
 src/Files.App/Files.App.csproj                |  3 +-
 src/Satori.targets                            | 43 +++++++++++++++++++
 5 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 src/Satori.targets

diff --git a/Directory.Build.props b/Directory.Build.props
index 1eaa9e68097e..0f438c001ceb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
-<!--  Copyright (c) Files Community. Licensed under the MIT License.  -->
+<!--  Copyright (c) Files Community. Licensed under the MIT License.  -->
 <Project>
   <PropertyGroup>
     <TargetFrameworkVersion>net9.0</TargetFrameworkVersion>
-    <TargetWindowsVersion>10.0.22621.0</TargetWindowsVersion>
+    <TargetWindowsVersion>10.0.26100.0</TargetWindowsVersion>
     <MinimalWindowsVersion>10.0.19041.0</MinimalWindowsVersion>
     <WindowsSdkPackageVersion>10.0.26100.67-preview</WindowsSdkPackageVersion>
     <WindowsTargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</WindowsTargetFramework>
diff --git a/src/Files.App (Package)/Files.Package.wapproj b/src/Files.App (Package)/Files.Package.wapproj
index e403169454e7..eda9604694c9 100644
--- a/src/Files.App (Package)/Files.Package.wapproj	
+++ b/src/Files.App (Package)/Files.Package.wapproj	
@@ -2,7 +2,7 @@
 <Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>8f60fd8e-1921-47d6-97b0-d26d7b3a4999</ProjectGuid>
-    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <AssetTargetFallback>net9.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
     <DefaultLanguage>en-US</DefaultLanguage>
diff --git a/src/Files.App.Server/Files.App.Server.csproj b/src/Files.App.Server/Files.App.Server.csproj
index 5e02acb3840c..2a274a147ddd 100644
--- a/src/Files.App.Server/Files.App.Server.csproj
+++ b/src/Files.App.Server/Files.App.Server.csproj
@@ -50,4 +50,5 @@
         <ProjectReference Include="..\Files.Shared\Files.Shared.csproj" />
     </ItemGroup>
 
+    <Import Project="..\Satori.targets" Condition=" '$(Platform)' != 'x86' " />
 </Project>
diff --git a/src/Files.App/Files.App.csproj b/src/Files.App/Files.App.csproj
index 6ed8fc5d9166..872cd58d1cd9 100644
--- a/src/Files.App/Files.App.csproj
+++ b/src/Files.App/Files.App.csproj
@@ -136,5 +136,6 @@
 	<ItemGroup>
 		<AdditionalFiles Include="Strings\en-US\Resources.resw" />
 	</ItemGroup>
-  
+
+  <Import Project="..\Satori.targets" Condition=" '$(Platform)' != 'x86' " />
 </Project>
diff --git a/src/Satori.targets b/src/Satori.targets
new file mode 100644
index 000000000000..d0ce2ec5f48d
--- /dev/null
+++ b/src/Satori.targets
@@ -0,0 +1,43 @@
+<Project>
+  <Target Name="FetchSatori" AfterTargets="ResolveRuntimePackAssets">
+    <DownloadFile
+        SourceUrl="https://github.com/hez2010/Satori/releases/latest/download/windows_$(Platform).zip"
+        DestinationFolder="$(IntermediateOutputPath)$([System.Guid]::NewGuid().ToString('N'))"
+        Retries="3">
+      <Output TaskParameter="DownloadedFile" ItemName="SatoriArchive" />
+    </DownloadFile>
+  </Target>
+
+  <Target Name="ExtractSatori" AfterTargets="FetchSatori" DependsOnTargets="FetchSatori">
+    <Unzip
+        SourceFiles="@(SatoriArchive)"
+        DestinationFolder="$(IntermediateOutputPath)Satori"
+        OverwriteReadOnlyFiles="true"
+    />
+  </Target>
+
+  <Target Name="IncludeSatoriInRuntimePackAssets" AfterTargets="ExtractSatori" DependsOnTargets="ExtractSatori">
+    <ItemGroup>
+      <RuntimePackAsset Remove="@(RuntimePackAsset)"
+                        Condition=" '%(RuntimePackAsset.Filename)' == 'coreclr'
+                                 Or '%(RuntimePackAsset.Filename)' == 'clrjit'
+                                 Or '%(RuntimePackAsset.Filename)' == 'System.Private.CoreLib' " />
+
+      <SatoriRuntimePackAsset Include="$(IntermediateOutputPath)Satori\System.Private.CoreLib.dll">
+        <AssetType>runtime</AssetType>
+      </SatoriRuntimePackAsset>
+      <SatoriRuntimePackAsset Include="$(IntermediateOutputPath)Satori\clrjit.dll;$(IntermediateOutputPath)Satori\coreclr.dll">
+        <AssetType>native</AssetType>
+        <DropFromSingleFile>true</DropFromSingleFile>
+      </SatoriRuntimePackAsset>
+      <RuntimePackAsset Include="@(SatoriRuntimePackAsset)">
+        <DestinationSubPath>%(Filename)%(Extension)</DestinationSubPath>
+        <RuntimeIdentifier>$(RuntimeIdentifier)</RuntimeIdentifier>
+        <CopyLocal>true</CopyLocal>
+        <NuGetPackageId>Microsoft.NETCore.App.Runtime.win-x64</NuGetPackageId>
+        <FileVersion>42.42.42.42424</FileVersion>
+        <NuGetPackageVersion>42.42.42.42424</NuGetPackageVersion>
+      </RuntimePackAsset>
+    </ItemGroup>
+  </Target>
+</Project>
\ No newline at end of file

From 414ee5727e1418f3af3cdb920442dc93a273a880 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sat, 23 Aug 2025 22:45:17 -0400
Subject: [PATCH 2/4] Build: v3.9.19

---
 src/Files.App (Package)/Package.appxmanifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Files.App (Package)/Package.appxmanifest b/src/Files.App (Package)/Package.appxmanifest
index 9841f2a6544f..1c2e8f114765 100644
--- a/src/Files.App (Package)/Package.appxmanifest	
+++ b/src/Files.App (Package)/Package.appxmanifest	
@@ -16,7 +16,7 @@
     <Identity
         Name="FilesDev"
         Publisher="CN=Files"
-        Version="3.9.18.0" />
+        Version="3.9.19.0" />
 
     <Properties>
         <DisplayName>Files - Dev</DisplayName>

From 5fa4ec52f18703d9e9fb29c6a6b82d5eb04b7f72 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sat, 23 Aug 2025 22:45:26 -0400
Subject: [PATCH 3/4] Revert "Build: v3.9.19"

This reverts commit 414ee5727e1418f3af3cdb920442dc93a273a880.
---
 src/Files.App (Package)/Package.appxmanifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Files.App (Package)/Package.appxmanifest b/src/Files.App (Package)/Package.appxmanifest
index 1c2e8f114765..9841f2a6544f 100644
--- a/src/Files.App (Package)/Package.appxmanifest	
+++ b/src/Files.App (Package)/Package.appxmanifest	
@@ -16,7 +16,7 @@
     <Identity
         Name="FilesDev"
         Publisher="CN=Files"
-        Version="3.9.19.0" />
+        Version="3.9.18.0" />
 
     <Properties>
         <DisplayName>Files - Dev</DisplayName>

From e2d5d7a9c46886db34ee1d81606a5a96d4196294 Mon Sep 17 00:00:00 2001
From: Steven He <hez2010@outlook.com>
Date: Sun, 24 Aug 2025 13:48:05 +0900
Subject: [PATCH 4/4] Cleanup the downloaded archive

---
 src/Satori.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Satori.targets b/src/Satori.targets
index d0ce2ec5f48d..92f660eaa5d4 100644
--- a/src/Satori.targets
+++ b/src/Satori.targets
@@ -14,6 +14,7 @@
         DestinationFolder="$(IntermediateOutputPath)Satori"
         OverwriteReadOnlyFiles="true"
     />
+    <Delete Files="@(SatoriArchive)" />
   </Target>
 
   <Target Name="IncludeSatoriInRuntimePackAssets" AfterTargets="ExtractSatori" DependsOnTargets="ExtractSatori">
@@ -40,4 +41,4 @@
       </RuntimePackAsset>
     </ItemGroup>
   </Target>
-</Project>
\ No newline at end of file
+</Project>