Skip to content

Commit 6682124

Browse files
committed
Use Satori GC for x64 and arm64 package
1 parent 14ad7cc commit 6682124

File tree

5 files changed

+49
-4
lines changed

5 files changed

+49
-4
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<!-- Copyright (c) Files Community. Licensed under the MIT License. -->
1+
<!-- Copyright (c) Files Community. Licensed under the MIT License. -->
22
<Project>
33
<PropertyGroup>
44
<TargetFrameworkVersion>net9.0</TargetFrameworkVersion>
5-
<TargetWindowsVersion>10.0.22621.0</TargetWindowsVersion>
5+
<TargetWindowsVersion>10.0.26100.0</TargetWindowsVersion>
66
<MinimalWindowsVersion>10.0.19041.0</MinimalWindowsVersion>
77
<WindowsSdkPackageVersion>10.0.26100.67-preview</WindowsSdkPackageVersion>
88
<WindowsTargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</WindowsTargetFramework>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<ProjectGuid>8f60fd8e-1921-47d6-97b0-d26d7b3a4999</ProjectGuid>
5-
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
5+
<TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
66
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
77
<AssetTargetFallback>net9.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
88
<DefaultLanguage>en-US</DefaultLanguage>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,5 @@
5050
<ProjectReference Include="..\Files.Shared\Files.Shared.csproj" />
5151
</ItemGroup>
5252

53+
<Import Project="..\Satori.targets" Condition=" '$(Platform)' != 'x86' " />
5354
</Project>

src/Files.App/Files.App.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,5 +136,6 @@
136136
<ItemGroup>
137137
<AdditionalFiles Include="Strings\en-US\Resources.resw" />
138138
</ItemGroup>
139-
139+
140+
<Import Project="..\Satori.targets" Condition=" '$(Platform)' != 'x86' " />
140141
</Project>

src/Satori.targets

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<Project>
2+
<Target Name="FetchSatori" AfterTargets="ResolveRuntimePackAssets">
3+
<DownloadFile
4+
SourceUrl="https://github.com/hez2010/Satori/releases/latest/download/windows_$(Platform).zip"
5+
DestinationFolder="$(IntermediateOutputPath)$([System.Guid]::NewGuid().ToString('N'))"
6+
Retries="3">
7+
<Output TaskParameter="DownloadedFile" ItemName="SatoriArchive" />
8+
</DownloadFile>
9+
</Target>
10+
11+
<Target Name="ExtractSatori" AfterTargets="FetchSatori" DependsOnTargets="FetchSatori">
12+
<Unzip
13+
SourceFiles="@(SatoriArchive)"
14+
DestinationFolder="$(IntermediateOutputPath)Satori"
15+
OverwriteReadOnlyFiles="true"
16+
/>
17+
</Target>
18+
19+
<Target Name="IncludeSatoriInRuntimePackAssets" AfterTargets="ExtractSatori" DependsOnTargets="ExtractSatori">
20+
<ItemGroup>
21+
<RuntimePackAsset Remove="@(RuntimePackAsset)"
22+
Condition=" '%(RuntimePackAsset.Filename)' == 'coreclr'
23+
Or '%(RuntimePackAsset.Filename)' == 'clrjit'
24+
Or '%(RuntimePackAsset.Filename)' == 'System.Private.CoreLib' " />
25+
26+
<SatoriRuntimePackAsset Include="$(IntermediateOutputPath)Satori\System.Private.CoreLib.dll">
27+
<AssetType>runtime</AssetType>
28+
</SatoriRuntimePackAsset>
29+
<SatoriRuntimePackAsset Include="$(IntermediateOutputPath)Satori\clrjit.dll;$(IntermediateOutputPath)Satori\coreclr.dll">
30+
<AssetType>native</AssetType>
31+
<DropFromSingleFile>true</DropFromSingleFile>
32+
</SatoriRuntimePackAsset>
33+
<RuntimePackAsset Include="@(SatoriRuntimePackAsset)">
34+
<DestinationSubPath>%(Filename)%(Extension)</DestinationSubPath>
35+
<RuntimeIdentifier>$(RuntimeIdentifier)</RuntimeIdentifier>
36+
<CopyLocal>true</CopyLocal>
37+
<NuGetPackageId>Microsoft.NETCore.App.Runtime.win-x64</NuGetPackageId>
38+
<FileVersion>42.42.42.42424</FileVersion>
39+
<NuGetPackageVersion>42.42.42.42424</NuGetPackageVersion>
40+
</RuntimePackAsset>
41+
</ItemGroup>
42+
</Target>
43+
</Project>

0 commit comments

Comments
 (0)