Skip to content
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

Jump to bottom

Make src/native/managed projects use Microsoft.DotNet.ILCompiler version from Version.props #100845

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Make src/native/managed projects use Microsoft.DotNet.ILCompiler version from Version.props #100845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c810eab
Use Microsoft.DotNet.ILCompiler version from Version.props
elinor-fung Apr 9, 2024
484ed4d
Remove unnecessary publish - just need LinkNative
elinor-fung Apr 9, 2024
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
5 changes: 3 additions & 2 deletions src/native/managed/compile-native.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Build.Traversal" DefaultTargets="Publish">
<Project Sdk="Microsoft.Build.Traversal">
<PropertyGroup>
<!-- We always want to use release for publishing using NativeAOT -->
<NativeLibsPublishConfiguration>Release</NativeLibsPublishConfiguration>
Expand Down Expand Up @@ -58,6 +58,7 @@
<ProjectReference Include="@(NativeLibsProjectsToBuild)"
ReferenceOutputAssembly="false"
AdditionalProperties="%(AdditionalProperties);$(SplitSubprojectProps)"
Condition="$(SupportsNativeAotComponents)"/>
Targets="LinkNative"
Condition="$(SupportsNativeAotComponents)"/>
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions src/native/managed/native-library.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
the same way as eng/native/functions.cmake strip_symbols
-->
<StripSymbols>false</StripSymbols>
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
</PropertyGroup>

<!-- set the shared library name. this helps the native linker correctly reference this shared
Expand All @@ -32,4 +33,9 @@
<!-- passed by compile-native.proj to set - -gcc-toolchain=$(ROOTFS_DIR)/usr -->
<CustomLinkerArg Condition="'$(CustomLinkerArgToolchainArg)' != ''" Include="$(CustomLinkerArgToolchainArg)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
<PackageReference Include="runtime.$(ToolsRID).Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
</ItemGroup>
</Project>
Loading