Movatterモバイル変換


[0]ホーム

URL:


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

Commite01ffb9

Browse files
authored
Force build failure if AOT compiler is missing, and avoid bad path (#52784)
An error in paths was introduced last week. Work around that, and make it a fatal build failure if the AOT compiler is missing in future to catch this faster
1 parent0979434 commite01ffb9

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

‎src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<PublishReadyToRun>false</PublishReadyToRun>
1414
<HostJsonTargetPath>tools/</HostJsonTargetPath>
1515
<PermitDllAndExeFilesLackingFileVersion>true</PermitDllAndExeFilesLackingFileVersion>
16+
<AotCompilerFileName>mono-aot-cross</AotCompilerFileName>
17+
<AotCompilerFileName Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(AotCompilerFileName).exe</AotCompilerFileName>
1618
</PropertyGroup>
1719

1820
<ItemGroup>
@@ -22,5 +24,6 @@
2224

2325
<Target Name="ValidateProperties" BeforeTargets="GenerateNuspec">
2426
<Error Condition="'$(TargetCrossRid)' == ''" Text="TargetCrossRid not set" />
27+
<Error Condition="!Exists('$(MonoAotCrossDir)$(TargetCrossRid)\$(AotCompilerFileName)')" Text="Cross compiler not found in $(MonoAotCrossDir)$(TargetCrossRid)" />
2528
</Target>
2629
</Project>

‎src/mono/monoaotcross.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
<_MonoAOTCrossFilesInclude="$(ArtifactsBinDir)mono\$(MonoAotTargetOS).$(MonoAotTargetArchitecture).$(Configuration)\cross\$(MonoAotTargetRid.ToLower())\**" />
4747
</ItemGroup>
4848

49-
<MessageText="Copying @(_MonoAOTCrossFiles) to $(RealRuntimeBinDir)cross\$(MonoAotTargetRid.ToLower())"Importance="High" />
49+
<MessageText="Copying @(_MonoAOTCrossFiles) to $(RealRuntimeBinDir)cross\$(TargetOS.ToLower())-$(TargetArchitecture.ToLower())\$(MonoAotTargetRid.ToLower())"Importance="High" />
5050

51-
<CopySourceFiles="@(_MonoAOTCrossFiles)"DestinationFolder="$(RealRuntimeBinDir)cross\$(MonoAotTargetRid.ToLower())">
51+
<CopySourceFiles="@(_MonoAOTCrossFiles)"DestinationFolder="$(RealRuntimeBinDir)cross\$(TargetOS.ToLower())-$(TargetArchitecture.ToLower())\$(MonoAotTargetRid.ToLower())">
5252
<OutputTaskParameter="DestinationFiles"ItemName="FileWrites"/>
5353
</Copy>
5454
</Target>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp