Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit a6b39a9

Browse files
authored
Code Quality: Use Satori GC for x64 and arm64 package (#17487)
1 parent 7ff4753 commit a6b39a9

File tree

5 files changed

+50
-4
lines changed

5 files changed

+50
-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
@@ -51,4 +51,5 @@
5151
<ProjectReference Include="..\Files.Shared\Files.Shared.csproj" />
5252
</ItemGroup>
5353

54+
<Import Project="..\Satori.targets" Condition=" '$(Platform)' != 'x86' " />
5455
</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: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<Project>
2+
<Target Name="FetchSatori" AfterTargets="ResolveRuntimePackAssets">
3+
<DownloadFile
4+
SourceUrl="https://github.com/files-community/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+
<Delete Files="@(SatoriArchive)" />
18+
</Target>
19+
20+
<Target Name="IncludeSatoriInRuntimePackAssets" AfterTargets="ExtractSatori" DependsOnTargets="ExtractSatori">
21+
<ItemGroup>
22+
<RuntimePackAsset Remove="@(RuntimePackAsset)"
23+
Condition=" '%(RuntimePackAsset.Filename)' == 'coreclr'
24+
Or '%(RuntimePackAsset.Filename)' == 'clrjit'
25+
Or '%(RuntimePackAsset.Filename)' == 'System.Private.CoreLib' " />
26+
27+
<SatoriRuntimePackAsset Include="$(IntermediateOutputPath)Satori\System.Private.CoreLib.dll">
28+
<AssetType>runtime</AssetType>
29+
</SatoriRuntimePackAsset>
30+
<SatoriRuntimePackAsset Include="$(IntermediateOutputPath)Satori\clrjit.dll;$(IntermediateOutputPath)Satori\coreclr.dll">
31+
<AssetType>native</AssetType>
32+
<DropFromSingleFile>true</DropFromSingleFile>
33+
</SatoriRuntimePackAsset>
34+
<RuntimePackAsset Include="@(SatoriRuntimePackAsset)">
35+
<DestinationSubPath>%(Filename)%(Extension)</DestinationSubPath>
36+
<RuntimeIdentifier>$(RuntimeIdentifier)</RuntimeIdentifier>
37+
<CopyLocal>true</CopyLocal>
38+
<NuGetPackageId>Microsoft.NETCore.App.Runtime.win-x64</NuGetPackageId>
39+
<FileVersion>42.42.42.42424</FileVersion>
40+
<NuGetPackageVersion>42.42.42.42424</NuGetPackageVersion>
41+
</RuntimePackAsset>
42+
</ItemGroup>
43+
</Target>
44+
</Project>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /