Fix release pipeline issues for the next release

.pipelines/codeql.yaml

@@ -41,6 +41,7 @@ stages:
     - task: onebranch.pipeline.tsaoptions@1
       displayName: 'OneBranch TSAOptions'
       inputs:
+        tsaConfigFilePath: '$(Build.Repository.LocalPath)/.config/tsaoptions.json'
         appendSourceBranchName: false
     - task: CredScan@3
       displayName: 🔍 Run CredScan
@@ -63,4 +64,5 @@ stages:
       condition: and (succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
       continueOnError: true
       inputs:
+        tsaConfigFilePath: '$(Build.Repository.LocalPath)/.config/tsaoptions.json'
         GdnPublishTsaOnboard: true

.pipelines/nuget-publishing.yml

@@ -51,17 +51,17 @@ parameters:
 - name: ort_version
   displayName: 'OnnxRuntime version'
   type: string
-  default: '1.19.0-dev-20240805-1630-ee2fe87e2d'
+  default: '1.20.0-dev-20241023-1635-2d00351d7b'
 
 - name: ort_cuda_version
   displayName: 'OnnxRuntime GPU version'
   type: string
-  default: '1.19.0-dev-20240805-0337-88c811b638'
+  default: '1.20.0-dev-20241022-1606-2d00351d7b'
 
 - name: ort_dml_version
   displayName: 'OnnxRuntime DML version'
   type: string
-  default: '1.19.0-dev-20240805-1630-ee2fe87e2d'
+  default: '1.20.0-dev-20241023-1635-2d00351d7b'
 
 - name: cuda_version
   displayName: 'CUDA version'

.pipelines/pypl-publishing.yml

@@ -37,38 +37,13 @@ parameters:
 - name: enable_linux_rocm
   displayName: 'Whether Linux ROCm package is built.'
   type: boolean
-  default: true
+  default: false
 
 - name: enable_macos_cpu
   displayName: 'Whether MacOS CPU package is built.'
   type: boolean
   default: true
 
-- name: ort_version
-  displayName: 'OnnxRuntime version'
-  type: string
-  default: '1.19.0-dev-20240805-1630-ee2fe87e2d'
-
-- name: ort_cuda_118_version
-  displayName: 'OnnxRuntime GPU version for CUDA 11.8'
-  type: string
-  default: '1.18.0-dev-20240426-0614-b842effa29'
-
-- name: ort_cuda_122_version
-  displayName: 'OnnxRuntime GPU version for CUDA 12.2'
-  type: string
-  default: '1.19.0-dev-20240805-0337-88c811b638'
-
-- name: ort_dml_version
-  displayName: 'OnnxRuntime DML version'
-  type: string
-  default: '1.19.0-dev-20240805-1630-ee2fe87e2d'
-
-- name: ort_rocm_version
-  displayName: 'OnnxRuntime ROCm version'
-  type: string
-  default: '1.19.0-dev-20240805-0337-88c811b638'
-
 - name: cuda_versions
   displayName: 'CUDA versions'
   type: string
@@ -103,11 +78,6 @@ stages:
     enable_win_dml: ${{ parameters.enable_win_dml }}
     enable_win_arm64_cpu: ${{ parameters.enable_win_arm64_cpu }}
     enable_macos_cpu: ${{ parameters.enable_macos_cpu }}
-    ort_version: ${{ parameters.ort_version }}
-    ort_cuda_118_version: ${{ parameters.ort_cuda_118_version }}
-    ort_cuda_122_version: ${{ parameters.ort_cuda_122_version }}
-    ort_rocm_version: ${{ parameters.ort_rocm_version }}
-    ort_dml_version: ${{ parameters.ort_dml_version }}
     cuda_versions: ${{ parameters.cuda_versions }}
     build_config: ${{ parameters.build_config }}
 - ${{ if eq(parameters.enable_post_packaging_validation, true) }}:
@@ -120,10 +90,5 @@ stages:
       enable_win_dml: ${{ parameters.enable_win_dml }}
       enable_win_arm64_cpu: ${{ parameters.enable_win_arm64_cpu }}
       enable_macos_cpu: ${{ parameters.enable_macos_cpu }}
-      ort_version: ${{ parameters.ort_version }}
-      ort_cuda_118_version: ${{ parameters.ort_cuda_118_version }}
-      ort_cuda_122_version: ${{ parameters.ort_cuda_122_version }}
-      ort_rocm_version: ${{ parameters.ort_rocm_version }}
-      ort_dml_version: ${{ parameters.ort_dml_version }}
       cuda_versions: ${{ parameters.cuda_versions }}
       SpecificArtifact: false

.pipelines/stages/jobs/capi-packaging-job.yml

@@ -62,36 +62,6 @@ jobs:
     value: ${{ parameters.os }}
   - name: feed_name
     value: '7982ae20-ed19-4a35-a362-a96ac99897b7'
-  - name: ort_filename
-    ${{ if eq(parameters.ep, 'cpu') }}:
-      value: 'Microsoft.ML.OnnxRuntime'
-    ${{ elseif eq(parameters.ep, 'cuda') }}:
-      ${{if eq(parameters.os, 'win') }}:
-        value: 'Microsoft.ML.OnnxRuntime.Gpu.Windows'
-      ${{ else }}:
-        value: 'Microsoft.ML.OnnxRuntime.Gpu.Linux'
-    ${{ elseif eq(parameters.ep, 'directml')}}:
-      value: 'Microsoft.ML.OnnxRuntime.DirectML'
-    ${{ elseif eq(parameters.ep, 'rocm')}}:
-      value: 'Microsoft.ML.OnnxRuntime.ROCm'
-    ${{ else }}:
-      value: 'Microsoft.ML.OnnxRuntime'
-
-  - name: ortHome
-    value: 'ort'
-  - name: dml_dir
-    value: 'Microsoft.AI.DirectML.1.15.1'
-  - name: dml_zip
-    value: 'Microsoft.AI.DirectML.1.15.1.zip'
-  - name: dml_url
-    value: "https://www.nuget.org/api/v2/package/Microsoft.AI.DirectML/1.15.1"
-
-  - name: d3d12_dir
-    value: 'Microsoft.Direct3D.D3D12.1.614.0'
-  - name: d3d12_zip
-    value: 'Microsoft.Direct3D.D3D12.1.614.0.zip'
-  - name: d3d12_url
-    value: "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.614.0"
 
   workspace:
     clean: all
@@ -107,18 +77,11 @@ jobs:
     displayName: Copy python 3.11.0 version to agent tools directory
     condition: and(eq(variables['arch'], 'arm64'), eq(variables['os'], 'win'))
 
-  - ${{ if eq(parameters.arch, 'arm64') }}:
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: 3.11
-        addToPath: true
-        architecture: $(arch)
-  - ${{ else }}:
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: 3.10
-        addToPath: true
-        architecture: $(arch)
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: 3.11
+      addToPath: true
+      architecture: $(arch)
 
   - ${{ if eq(parameters.os, 'linux') }}:
     - template: steps/capi-linux-step.yml

.pipelines/stages/jobs/py-packaging-job.yml

@@ -3,8 +3,6 @@ parameters:
   type: string
 - name: ep
   type: string
-- name: ort_version
-  type: string
 - name: cuda_version
   type: string
   default: ''
@@ -53,12 +51,6 @@ jobs:
           PyNoDotVer: '312'
     ${{ else }}:
       matrix:
-        Python38:
-          PyDotVer: '3.8'
-          PyNoDotVer: '38'
-        Python39:
-          PyDotVer: '3.9'
-          PyNoDotVer: '39'
         Python310:
           PyDotVer: '3.10'
           PyNoDotVer: '310'
@@ -68,7 +60,10 @@ jobs:
         Python312:
           PyDotVer: '3.12'
           PyNoDotVer: '312'
-
+        Python313:
+          PyDotVer: '3.13'
+          PyNoDotVer: '313'
+
   timeoutInMinutes: 240
   workspace:
     clean: all
@@ -93,46 +88,15 @@ jobs:
     value: ${{ parameters.cuda_version }}
   - name: ep
     value: ${{ parameters.ep }}
-  - name: ort_version
-    value: ${{ parameters.ort_version }}
   - name: os
     value: ${{ parameters.os }}
 
   - name: feed_name
     value: '7982ae20-ed19-4a35-a362-a96ac99897b7'
 
-  - name: ort_filename
-    ${{ if eq(parameters.ep, 'cpu') }}:
-      value: 'Microsoft.ML.OnnxRuntime'
-    ${{ elseif eq(parameters.ep, 'cuda') }}:
-      ${{if eq(parameters.os, 'win') }}:
-        value: 'Microsoft.ML.OnnxRuntime.Gpu.Windows'
-      ${{ else }}:
-        value: 'Microsoft.ML.OnnxRuntime.Gpu.Linux'
-    ${{ elseif eq(parameters.ep, 'directml')}}:
-      value: 'Microsoft.ML.OnnxRuntime.DirectML'
-    ${{ elseif eq(parameters.ep, 'rocm')}}:
-      value: 'Microsoft.ML.OnnxRuntime.ROCm'
-    ${{ else }}:
-      value: 'Microsoft.ML.OnnxRuntime'
-
-  - name: dml_dir
-    value: 'Microsoft.AI.DirectML.1.15.1'
-  - name: dml_zip
-    value: 'Microsoft.AI.DirectML.1.15.1.zip'
-  - name: dml_url
-    value: "https://www.nuget.org/api/v2/package/Microsoft.AI.DirectML/1.15.1"
-
-  - name: d3d12_dir
-    value: 'Microsoft.Direct3D.D3D12.1.614.0'
-  - name: d3d12_zip
-    value: 'Microsoft.Direct3D.D3D12.1.614.0.zip'
-  - name: d3d12_url
-    value: "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.614.0"
-
   steps:
   - script: |
-      MKDIR $(Agent.ToolsDirectory)\Python\3.12.3\arm64 
+      MKDIR $(Agent.ToolsDirectory)\Python\3.12.3\arm64
       XCOPY /s /y /h /e /c /q "C:\Python\Python312\*.*" $(Agent.ToolsDirectory)\Python\3.12.3\arm64\
       COPY NUL $(Agent.ToolsDirectory)\Python\3.12.3\arm64.complete
       DIR $(Agent.ToolsDirectory)\Python

.pipelines/stages/jobs/py-validation-job.yml

@@ -11,8 +11,6 @@ parameters:
   type: string
 - name: ep
   type: string
-- name: ort_version
-  type: string
 - name: cuda_version
   type: string
   default: ''
@@ -73,23 +71,11 @@ jobs:
     value: ${{ parameters.cuda_version }}
   - name: ep
     value: ${{ parameters.ep }}
-  - name: ort_version
-    value: ${{ parameters.ort_version }}
   - name: os
     value: ${{ parameters.os }}
 
   - name: py_dot_ver
-    ${{ if eq(parameters.ep, 'cpu') }}:
-      ${{ if eq(parameters.arch, 'arm64') }}:
-        value: '3.12'
-      ${{ else }}:
-        value: '3.9'
-    ${{ elseif eq(parameters.ep, 'cuda') }}:
-      value: '3.10'
-    ${{ elseif eq(parameters.ep, 'directml')}}:
-      value: '3.11'
-    ${{ else }}:
-      value: '3.9'
+    value: '3.12'
 
   - name: pip_package_name
     ${{ if eq(parameters.ep, 'cpu') }}:
@@ -231,8 +217,8 @@ jobs:
           python -m pip install -r test/python/cuda/ort/requirements.txt
         }
         elseif ("$(ep)" -eq "directml") {
-          python -m pip install -r test/python/requirements-torch-directml.txt
-          python -m pip install -r test/python/requirements-torch-directml.txt
+          python -m pip install -r test/python/directml/torch/requirements.txt
+          python -m pip install -r test/python/directml/ort/requirements.txt
         }
         else {
           python -m pip install -r test/python/cpu/torch/requirements.txt

.pipelines/stages/jobs/steps/capi-linux-step.yml

@@ -34,7 +34,6 @@ steps:
 
 - bash: |
     echo "arch=$(arch)"
-    echo "ort_filename=$(ort_filename)"
     echo "ort_version=$(ort_version)"
     echo "ep=$(ep)"
     echo "cuda_version=$(cuda_version)"

.pipelines/stages/jobs/steps/capi-macos-step.yml

@@ -22,7 +22,6 @@ steps:
 
 - bash: |
     echo "arch=$(arch)"
-    echo "ort_filename=$(ort_filename)"
     echo "ort_version=$(ort_version)"
     echo "ep=$(ep)"
     echo "cuda_version=$(cuda_version)"

.pipelines/stages/jobs/steps/capi-win-step.yml

@@ -26,38 +26,20 @@ steps:
 - task: onebranch.pipeline.tsaoptions@1
   displayName: 'OneBranch TSAOptions'
   inputs:
+    tsaConfigFilePath: '$(Build.Repository.LocalPath)\.config\tsaoptions.json'
     appendSourceBranchName: false
 
 - template: utils/set-nightly-build-option-variable.yml
 
 - script: |
     echo "arch=$(arch)"
-    echo "ort_filename=$(ort_filename)"
     echo "ort_version=$(ort_version)"
     echo "ep=$(ep)"
     echo "cuda_version=$(cuda_version)"
     echo "target=${{ parameters.target }}"
     echo "build_config=${{ parameters.build_config }}"
   displayName: 'Print Parameters'
 
-- ${{ if eq(parameters.ep, 'directml') }}:
-  - powershell: |
-      Invoke-WebRequest -Uri $(dml_url) -OutFile $(dml_zip)
-      Expand-Archive $(dml_zip) -DestinationPath $(dml_dir)
-      Remove-Item -Path $(dml_zip)
-      Get-ChildItem -Recurse $(dml_dir)
-      mv $(dml_dir)\bin\$(arch)-win\DirectML.dll ort\lib
-      mv $(dml_dir)\include\DirectML.h ort\include
-
-      Invoke-WebRequest -Uri $(d3d12_url) -OutFile $(d3d12_zip)
-      Expand-Archive $(d3d12_zip) -DestinationPath $(d3d12_dir)
-      Remove-Item -Path $(d3d12_zip)
-      Get-ChildItem -Recurse $(d3d12_dir)
-      mv $(d3d12_dir)\build\native\bin\$(arch)\D3D12Core.dll ort\lib
-    workingDirectory: '$(Build.Repository.LocalPath)'
-    displayName: 'Download DirectML & Direct3D DLLs'
-    continueOnError: true
-
 - powershell: |
     azcopy.exe cp --recursive "https://lotusscus.blob.core.windows.net/models/cuda_sdk/v$(cuda_version)" 'cuda_sdk'
   displayName: 'Download CUDA $(cuda_version)'