From 1711b05c5d8b1fa6a56a39ddbe3294307f3ae025 Mon Sep 17 00:00:00 2001
From: Dwayne Robinson <fdwr@hotmail.com>
Date: Tue, 5 Jul 2022 12:44:15 -0700
Subject: [PATCH 1/2] Update to DML 1.9

---
 .pipelines/nuget_config/x64/packages.config     | 2 +-
 .pipelines/nuget_config/x86/packages.config     | 2 +-
 cmake/external/dml.cmake                        | 2 +-
 packages.config                                 | 2 +-
 tools/nuget/generate_nuspec_for_native_nuget.py | 4 +---
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.pipelines/nuget_config/x64/packages.config b/.pipelines/nuget_config/x64/packages.config
index 1f73d55fd789..e903904d4487 100644
--- a/.pipelines/nuget_config/x64/packages.config
+++ b/.pipelines/nuget_config/x64/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="python" version="3.7.9" targetFramework="native" />
-  <package id="Microsoft.AI.DirectML.Preview" version="1.9.0-devb9b146539f535988728c8eb4791840db54add4a7" targetFramework="native" />
+  <package id="Microsoft.AI.DirectML" version="1.9.0" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.201201.7" targetFramework="native" />
 </packages>
diff --git a/.pipelines/nuget_config/x86/packages.config b/.pipelines/nuget_config/x86/packages.config
index 9d111765e881..169e97324554 100644
--- a/.pipelines/nuget_config/x86/packages.config
+++ b/.pipelines/nuget_config/x86/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="pythonx86" version="3.7.9" targetFramework="native" />
-  <package id="Microsoft.AI.DirectML.Preview" version="1.9.0-devb9b146539f535988728c8eb4791840db54add4a7" targetFramework="native" />
+  <package id="Microsoft.AI.DirectML" version="1.9.0" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.201201.7" targetFramework="native" />
 </packages>
diff --git a/cmake/external/dml.cmake b/cmake/external/dml.cmake
index 667ef7214551..dcb31bbe1976 100644
--- a/cmake/external/dml.cmake
+++ b/cmake/external/dml.cmake
@@ -40,7 +40,7 @@ if (NOT onnxruntime_USE_CUSTOM_DIRECTML)
   set(NUGET_CONFIG ${PROJECT_SOURCE_DIR}/../NuGet.config)
   set(PACKAGES_CONFIG ${PROJECT_SOURCE_DIR}/../packages.config)
   get_filename_component(PACKAGES_DIR ${CMAKE_CURRENT_BINARY_DIR}/../packages ABSOLUTE)
-  set(DML_PACKAGE_DIR ${PACKAGES_DIR}/Microsoft.AI.DirectML.Preview.1.9.0-devb9b146539f535988728c8eb4791840db54add4a7)
+  set(DML_PACKAGE_DIR ${PACKAGES_DIR}/Microsoft.AI.DirectML.1.9.0)
   set(DML_SHARED_LIB DirectML.dll)
 
   # Restore nuget packages, which will pull down the DirectML redist package.
diff --git a/packages.config b/packages.config
index 69b9e2bf8d13..cfd05eebef50 100644
--- a/packages.config
+++ b/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="GoogleTestAdapter" version="0.17.1" targetFramework="net46" />
-  <package id="Microsoft.AI.DirectML.Preview" version="1.9.0-devb9b146539f535988728c8eb4791840db54add4a7" targetFramework="native" />
+  <package id="Microsoft.AI.DirectML" version="1.9.0" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.201201.7" targetFramework="native" />
 </packages>
diff --git a/tools/nuget/generate_nuspec_for_native_nuget.py b/tools/nuget/generate_nuspec_for_native_nuget.py
index 46af293e8dc4..115b58652417 100644
--- a/tools/nuget/generate_nuspec_for_native_nuget.py
+++ b/tools/nuget/generate_nuspec_for_native_nuget.py
@@ -188,9 +188,7 @@ def generate_dependencies(xml_text, package_name, version, dependency_id, depend
         xml_text.append("</dependencies>")
         return
 
-    dml_dependency = (
-        '<dependency id="Microsoft.AI.DirectML.Preview" version="1.9.0-devb9b146539f535988728c8eb4791840db54add4a7"/>'
-    )
+    dml_dependency = ('<dependency id="Microsoft.AI.DirectML" version="1.9.0"/>')
 
     if package_name == "Microsoft.AI.MachineLearning":
         xml_text.append("<dependencies>")

From 057325c11d026d3ca08c4b574d44db4686dae5af Mon Sep 17 00:00:00 2001
From: Dwayne Robinson <fdwr@hotmail.com>
Date: Tue, 5 Jul 2022 13:15:59 -0700
Subject: [PATCH 2/2] Appease obnoxious Python formatting tool

---
 tools/nuget/generate_nuspec_for_native_nuget.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/nuget/generate_nuspec_for_native_nuget.py b/tools/nuget/generate_nuspec_for_native_nuget.py
index 115b58652417..207e2c53b3a1 100644
--- a/tools/nuget/generate_nuspec_for_native_nuget.py
+++ b/tools/nuget/generate_nuspec_for_native_nuget.py
@@ -188,7 +188,7 @@ def generate_dependencies(xml_text, package_name, version, dependency_id, depend
         xml_text.append("</dependencies>")
         return
 
-    dml_dependency = ('<dependency id="Microsoft.AI.DirectML" version="1.9.0"/>')
+    dml_dependency = '<dependency id="Microsoft.AI.DirectML" version="1.9.0"/>'
 
     if package_name == "Microsoft.AI.MachineLearning":
         xml_text.append("<dependencies>")