Skip to content

Code Quality: Use Satori GC for x64 and arm64 package #17487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 4, 2025
Merged

Code Quality: Use Satori GC for x64 and arm64 package #17487

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6682124
Use Satori GC for x64 and arm64 package
hez2010 Aug 23, 2025
414ee57
Build: v3.9.19
yaira2 Aug 24, 2025
5fa4ec5
Revert "Build: v3.9.19"
yaira2 Aug 24, 2025
e2d5d7a
Cleanup the downloaded archive
hez2010 Aug 24, 2025
310c0ad
Update Satori.targets
hez2010 Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App (Package)/Files.Package.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/Files.App.Server/Files.App.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,5 @@
<ProjectReference Include="..\Files.Shared\Files.Shared.csproj" />
</ItemGroup>

<Import Project="..\Satori.targets" Condition=" '$(Platform)' != 'x86' " />
</Project>
3 changes: 2 additions & 1 deletion src/Files.App/Files.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,5 +136,6 @@
<ItemGroup>
<AdditionalFiles Include="Strings\en-US\Resources.resw" />
</ItemGroup>


<Import Project="..\Satori.targets" Condition=" '$(Platform)' != 'x86' " />
</Project>
44 changes: 44 additions & 0 deletions src/Satori.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<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"
/>
<Delete Files="@(SatoriArchive)" />
</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>
Loading