Refactor props and targets of Microsoft.ML.OnnxRuntime and DllImport#27351
Open
Refactor props and targets of Microsoft.ML.OnnxRuntime and DllImport#27351
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR refactors the MSBuild assets and the C#
DllImportResolverto simplify native library deployment and improve cross-platform support (Windows, Linux, macOS). It also adds build-time verification to ensure native binaries are automatically copied to the output directory.Summary of Changes
1. Refactored MSBuild Assets (
props.xmlandtargets.xml)props.xml: Removed complex conditional logic for linking native libraries in Windows. The logic now focuses on providing the correct include and import library paths based on the target architecture (x64, ARM64).targets.xml:2. Streamlined
DllImportResolverruntimes/subfolders inNativeMethods.shared.cs.onnxruntimelibrary name to its platform-specific filename:onnxruntime.dlllibonnxruntime.solibonnxruntime.dylib3. End-to-End Build Verification
runtest.batandruntest.shto perform adotnet buildfollowed by a check for the existence of the native library (onnxruntime.dllorlibonnxruntime.so/dylib) in thebin/directory.Benefits Compared to Original Files
libprefix).dotnet testwhich might obscure build-time copy failures.Tests
Verified in Nuget Test and Foundry Local Package Pipelines