Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
478e01f
HelloiOS sample improvements and sync with main branch
ivanpovazan May 23, 2023
9ca9c3f
Fix the way we are passing extra linker arguments from AppleAppBuilder
ivanpovazan May 23, 2023
daa1c0c
Use ILC collected linker arguments for bundling the application
ivanpovazan May 23, 2023
37b1550
Use better naming in the Makefile
ivanpovazan May 23, 2023
c94e9f0
Prepare grounds for PublishAotUsingRuntimePack = true
ivanpovazan May 23, 2023
9afd5fb
Update ILCompiler paths to handle PublishAotUsingRuntimePack=true
filipnavara May 9, 2023
5f2fe86
Enable using runtime pack from NuGet
ivanpovazan May 23, 2023
08126df
Use publish instead
ivanpovazan May 25, 2023
a8665ce
FIXME: revert once testing is finished
ivanpovazan May 23, 2023
c2eeead
Cleaning up the code
ivanpovazan May 25, 2023
2e6c29c
Fix for using publish targets
ivanpovazan May 29, 2023
65de62f
Prevent building invalid Microsoft.DotNet.ILCompiler package
ivanpovazan May 31, 2023
ae968cf
Updating README.md to reflect the changes
ivanpovazan Jun 1, 2023
ce1c9c4
PR feedback
ivanpovazan Jun 1, 2023
d4da903
Merge remote-tracking branch 'upstream/main' into hellios-packs
ivanpovazan Jun 1, 2023
808b121
Fix markdownlint errors
ivanpovazan Jun 1, 2023
5693fd3
Escape NativeAOT bundling targets
ivanpovazan Jun 2, 2023
a221b5a
Use local folder for restore packages
ivanpovazan Jun 2, 2023
6514512
PR feedback on documentation
ivanpovazan Jun 2, 2023
7c0fd97
Use IlcSdkPath instead of IlcPrivateSdkPath
filipnavara Jun 3, 2023
c9d5543
Revert "FIXME: revert once testing is finished"
ivanpovazan Jun 5, 2023
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
Prev Previous commit
Next Next commit
Enable using runtime pack from NuGet
  • Loading branch information
ivanpovazan committed May 23, 2023
commit 5f2fe86ec85945233937b5ade23e68c2eacd87c9
11 changes: 1 addition & 10 deletions src/mono/sample/iOS-NativeAOT/Program.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

<!-- FIXME: We do not use publish targets yet, but we need to create a publish directory -->
<PublishDir Condition="'$(PublishDir)' == ''">$(OutputPath)/publish</PublishDir>
<UseLocalTargetingRuntimePack Condition="'$(PublishAotUsingRuntimePack)' == 'true'">false</UseLocalTargetingRuntimePack>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -44,16 +45,6 @@
</PropertyGroup>
</Target>

<!-- Use locally built runtime pack -->
<Target Name="_UseLocalRuntimePackPath"
Condition="'$(PublishAotUsingRuntimePack)' == 'true'"
AfterTargets="ResolveFrameworkReferences">
<ItemGroup>
<ResolvedFrameworkReference Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App'"
RuntimePackPath="$(CoreCLRArtifactsPath)" />
</ItemGroup>
</Target>

<Target Name="BuildAppBundle"
AfterTargets="Build"
DependsOnTargets="ConfigureIlcPathsForiOSCrossCompilation;SetupProperties;ComputeIlcCompileInputs;IlcCompile">
Expand Down