From 67c67408c4328adcd5b6e14938516fa4e19c82a6 Mon Sep 17 00:00:00 2001
From: Sheil Kumar <smk2007@gmail.com>
Date: Mon, 8 Mar 2021 15:27:11 -0800
Subject: [PATCH] Only set _native folder for Microsoft.AI.MachineLearning
 package (#6939)

* only set _native folder for Microsoft.AI.MachineLearning package

Co-authored-by: Sheil Kumar <sheilk@microsoft.com>
---
 tools/nuget/generate_nuspec_for_native_nuget.py | 7 ++++++-
 tools/nuget/validate_nuget.py                   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/nuget/generate_nuspec_for_native_nuget.py b/tools/nuget/generate_nuspec_for_native_nuget.py
index ec3afa8f29..256c7a7d0e 100644
--- a/tools/nuget/generate_nuspec_for_native_nuget.py
+++ b/tools/nuget/generate_nuspec_for_native_nuget.py
@@ -216,9 +216,14 @@ def generate_files(list, args):
         copy_command = "cp"
         runtimes_target = '" target="runtimes\\linux-'
 
+    if is_windowsai_package:
+        runtimes_native_folder = '_native'
+    else:
+        runtimes_native_folder = 'native'
+
     runtimes = '{}{}\\{}"'.format(runtimes_target,
                                   args.target_architecture,
-                                  'lib\\uap10.0' if args.is_store_build else '_native')
+                                  'lib\\uap10.0' if args.is_store_build else runtimes_native_folder)
 
     # Process headers
     files_list.append('<file src=' + '"' + os.path.join(args.sources_path,
diff --git a/tools/nuget/validate_nuget.py b/tools/nuget/validate_nuget.py
index 92d08e68b4..77b916d79f 100644
--- a/tools/nuget/validate_nuget.py
+++ b/tools/nuget/validate_nuget.py
@@ -119,7 +119,7 @@ def main():
 
         # Check if the relevant dlls are present in the Nuget/Zip
         print('Checking if the Nuget contains relevant dlls')
-        is_windows_ai_package = os.path.basename(full_nuget_path).startswith('Microsoft')
+        is_windows_ai_package = os.path.basename(full_nuget_path).startswith('Microsoft.AI.MachineLearning')
         check_if_dlls_are_present(is_windows_ai_package, args.platforms_supported, zip_file)
 
         # Check if the Nuget has been signed