From 265db2ad96b01c0ac32439214f482fb05706cc69 Mon Sep 17 00:00:00 2001
From: Sheil Kumar <smk2007@gmail.com>
Date: Mon, 19 Apr 2021 15:36:43 -0700
Subject: [PATCH] Fix Microsoft.AI.MachineLearning .NET5 publishing and C#
 Store Release build (#7373)

* fix .net publishing

* make experimental api build with microsoft.ai.machinelearning.idl import

Co-authored-by: Sheil Kumar <sheilk@microsoft.com>
---
 cmake/winml_cppwinrt.cmake                                    | 1 +
 .../Microsoft.AI.MachineLearning.targets                      | 4 ++++
 winml/api/Microsoft.AI.MachineLearning.Experimental.idl       | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmake/winml_cppwinrt.cmake b/cmake/winml_cppwinrt.cmake
index 8061033fd2..e0d2f40ea9 100644
--- a/cmake/winml_cppwinrt.cmake
+++ b/cmake/winml_cppwinrt.cmake
@@ -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}
diff --git a/csharp/src/Microsoft.AI.MachineLearning.Interop/Microsoft.AI.MachineLearning.targets b/csharp/src/Microsoft.AI.MachineLearning.Interop/Microsoft.AI.MachineLearning.targets
index 9477e7ef89..397a8d1373 100644
--- a/csharp/src/Microsoft.AI.MachineLearning.Interop/Microsoft.AI.MachineLearning.targets
+++ b/csharp/src/Microsoft.AI.MachineLearning.Interop/Microsoft.AI.MachineLearning.targets
@@ -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>
diff --git a/winml/api/Microsoft.AI.MachineLearning.Experimental.idl b/winml/api/Microsoft.AI.MachineLearning.Experimental.idl
index f9806db92b..fcc1bec60a 100644
--- a/winml/api/Microsoft.AI.MachineLearning.Experimental.idl
+++ b/winml/api/Microsoft.AI.MachineLearning.Experimental.idl
@@ -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";
 #define INBOX_ONLY(x)
 #define OTB_ONLY(x) x
 #endif