Skip to content

Fix Microsoft.AI.MachineLearning .NET5 publishing and C# Store Release build #7373

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

Merged
smk2007 merged 2 commits into from
Apr 19, 2021
Merged

Fix Microsoft.AI.MachineLearning .NET5 publishing and C# Store Release build #7373

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
b7f37be
fix .net publishing
Apr 19, 2021
2b34b64
make experimental api build with microsoft.ai.machinelearning.idl import
Apr 19, 2021
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
1 change: 1 addition & 0 deletions cmake/winml_cppwinrt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ function(target_cppwinrt
/metadata_dir ${sdk_metadata_directory}
/W1 /char signed /nomidl /nologo /winrt
/no_settings_comment /no_def_idir /target "NT60"
/I ${CMAKE_CURRENT_BINARY_DIR}/winml_api
/I ${idl_source_directory}
/I ${um_sdk_directory}
/I ${shared_sdk_directory}
Expand Down
4 changes: 4 additions & 0 deletions csharp/src/Microsoft.AI.MachineLearning.Interop/Microsoft.AI.MachineLearning.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,8 @@
<Message Text="$([System.String]::Format('$(WindowsAIBinplaceMessage)', '$(WindowsAIBinary)', '$(OnnxRuntimeBinary)'))" />
<Copy SkipUnchangedFiles="True" SourceFiles="$(WindowsAIBinary);$(OnnxRuntimeBinary)" DestinationFolder="$(OutDir)" />
</Target>

<ItemGroup>
<ReferenceCopyLocalPaths Include="$(WindowsAIBinary);$(OnnxRuntimeBinary)" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion winml/api/Microsoft.AI.MachineLearning.Experimental.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@

import "Windows.Foundation.idl";
import "dualapipartitionattribute.idl";
import "Windows.AI.MachineLearning.idl";

#include <sdkddkver.h>

#ifdef BUILD_INBOX
import "Windows.AI.MachineLearning.idl";
#define ROOT_NS Windows
#define INBOX_ONLY(x) x
#define OTB_ONLY(x)
#else
import "Microsoft.AI.MachineLearning.idl";
Comment thread
smk2007 marked this conversation as resolved.
#define INBOX_ONLY(x)
#define OTB_ONLY(x) x
#endif
Expand Down