[DRAFT] Add SDK v2 telemetry and hardening

.pipelines/v2/templates/steps-build-js.yml

@@ -156,6 +156,14 @@ steps:
         throw "WinML runtime DLL not found in native artifact: $winmlDll"
       }
 
+      $directMlDll = Join-Path "${{ parameters.nativeArtifactDir }}" 'DirectML.dll'
+      if (Test-Path $directMlDll) {
+        Copy-Item $directMlDll -Destination $dst -Force
+        Write-Host "  staged DirectML.dll"
+      } else {
+        throw "DirectML.dll not found in native artifact: $directMlDll"
+      }
+
       Get-ChildItem $dst | ForEach-Object { Write-Host "    $($_.Name)  $($_.Length) bytes" }
     displayName: 'Stage prebuild directory'
 

.pipelines/v2/templates/steps-build-linux.yml

@@ -75,24 +75,42 @@ steps:
   displayName: 'Dump vcpkg error logs'
   condition: failed()
 
-# Stage the redistributable native artifact. Vcpkg uses static linkage on
-# Linux (see sdk_v2/cpp/triplets/x64-linux.cmake), so libfoundry_local.so
-# carries its transitive deps (azure-*, spdlog, fmt, libcurl, libssl/libcrypto,
-# zlib, brotli*) inside itself — the only file we need to forward downstream
-# is libfoundry_local.so. ORT/GenAI .so files are also present in bin/ but are
-# supplied to consumers separately (pip on the Python side, NuGet on the C#
-# side); test/example binaries are not part of the redistributable surface.
+# Stage the redistributable native artifacts for standalone C++ consumers.
 - bash: |
     set -euo pipefail
     src='$(Build.SourcesDirectory)/sdk_v2/cpp/build/Linux/${{ parameters.buildConfig }}/bin'
     dst='$(Build.ArtifactStagingDirectory)/native'
     mkdir -p "$dst"
 
-    primary="$src/libfoundry_local.so"
-    if [ ! -f "$primary" ]; then
-      echo "ERROR: libfoundry_local.so not found at $primary" >&2
-      exit 1
-    fi
-    cp -P "$primary" "$dst/"
-    echo "  staged libfoundry_local.so"
+    required=(
+      "$src/libfoundry_local.so"
+      "$src/libonnxruntime-genai.so"
+      "$src/libonnxruntime.so"
+    )
+    for f in "${required[@]}"; do
+      if [ ! -e "$f" ]; then
+        echo "ERROR: required native artifact not found: $f" >&2
+        exit 1
+      fi
+      cp -P "$f" "$dst/"
+      echo "  staged $(basename "$f")"
+    done
+    for f in "$src"/libonnxruntime.so.*; do
+      if [ -e "$f" ]; then
+        cp -P "$f" "$dst/"
+        echo "  staged $(basename "$f")"
+      fi
+    done
+    for f in "$src"/libonnxruntime-genai*.so; do
+      if [ -e "$f" ] && [ "$(basename "$f")" != "libonnxruntime-genai.so" ]; then
+        cp -P "$f" "$dst/"
+        echo "  staged $(basename "$f")"
+      fi
+    done
+    for f in "$src"/libonnxruntime_providers_*.so; do
+      if [ -e "$f" ]; then
+        cp -P "$f" "$dst/"
+        echo "  staged $(basename "$f")"
+      fi
+    done
   displayName: 'Stage native artifacts'

.pipelines/v2/templates/steps-build-macos.yml

@@ -81,23 +81,36 @@ steps:
   displayName: 'Dump vcpkg error logs'
   condition: failed()
 
-# Stage the redistributable native artifact. macOS has no triplet overlay so
-# vcpkg uses its default arm64-osx triplet, which is static — libfoundry_local.dylib
-# carries its transitive deps (azure-*, spdlog, fmt, libcurl, libssl/libcrypto,
-# zlib, brotli*) inside itself. ORT/GenAI .dylib files are supplied to consumers
-# separately (pip on the Python side, NuGet on the C# side); test/example binaries
-# are not part of the redistributable surface.
+# Stage the redistributable native artifacts for standalone C++ consumers.
 - bash: |
     set -euo pipefail
     src='$(Build.SourcesDirectory)/sdk_v2/cpp/build/macOS/${{ parameters.buildConfig }}/bin'
     dst='$(Build.ArtifactStagingDirectory)/native'
     mkdir -p "$dst"
 
-    primary="$src/libfoundry_local.dylib"
-    if [ ! -f "$primary" ]; then
-      echo "ERROR: libfoundry_local.dylib not found at $primary" >&2
-      exit 1
-    fi
-    cp -P "$primary" "$dst/"
-    echo "  staged libfoundry_local.dylib"
+    required=(
+      "$src/libfoundry_local.dylib"
+      "$src/libonnxruntime-genai.dylib"
+      "$src/libonnxruntime.dylib"
+    )
+    for f in "${required[@]}"; do
+      if [ ! -e "$f" ]; then
+        echo "ERROR: required native artifact not found: $f" >&2
+        exit 1
+      fi
+      cp -P "$f" "$dst/"
+      echo "  staged $(basename "$f")"
+    done
+    for f in "$src"/libonnxruntime.*.dylib; do
+      if [ -e "$f" ]; then
+        cp -P "$f" "$dst/"
+        echo "  staged $(basename "$f")"
+      fi
+    done
+    for f in "$src"/libonnxruntime_providers_*.dylib; do
+      if [ -e "$f" ]; then
+        cp -P "$f" "$dst/"
+        echo "  staged $(basename "$f")"
+      fi
+    done
   displayName: 'Stage native artifacts'

.pipelines/v2/templates/steps-build-python.yml

@@ -106,10 +106,32 @@ steps:
         # deps (onnxruntime-{core,gpu} / onnxruntime-genai-{core,cuda}). Test
         # and example binaries are also filtered out upstream. We just copy
         # the curated artifact contents straight in.
-        $files = Get-ChildItem -Path "${{ parameters.nativeArtifactDir }}" -Recurse -File
+        $rid = '${{ parameters.rid }}'
+        if ($rid -like 'win-*') {
+            $allowed = @('foundry_local.dll', 'foundry_local.lib', 'Microsoft.Windows.AI.MachineLearning.dll', 'DirectML.dll')
+        } elseif ($rid -like 'linux-*') {
+            $allowed = @('libfoundry_local.so')
+        } elseif ($rid -like 'osx-*') {
+            $allowed = @('libfoundry_local.dylib')
+        } else {
+            throw "Unsupported Python wheel RID: $rid"
+        }
+        $files = foreach ($name in $allowed) {
+            Get-ChildItem -Path "${{ parameters.nativeArtifactDir }}" -Filter $name -File -ErrorAction SilentlyContinue
+        }
         if ($files.Count -eq 0) {
             throw "No native artifacts found under ${{ parameters.nativeArtifactDir }}"
         }
+        if ($rid -like 'win-*') {
+            $found = @{}
+            foreach ($f in $files) {
+                $found[$f.Name] = $true
+            }
+            $missing = @($allowed | Where-Object { -not $found.ContainsKey($_) })
+            if ($missing.Count -gt 0) {
+                throw "Missing required Windows native artifact(s): $($missing -join ', ') under ${{ parameters.nativeArtifactDir }}"
+            }
+        }
         foreach ($f in $files) {
             Copy-Item $f.FullName -Destination $dest -Force
         }

.pipelines/v2/templates/steps-build-windows.yml

@@ -138,7 +138,13 @@ steps:
         (Join-Path $binDir  'foundry_local.dll'),
         (Join-Path $binDir  'foundry_local.pdb'),
         (Join-Path $linkDir 'foundry_local.lib'),
-        (Join-Path $binDir  'Microsoft.Windows.AI.MachineLearning.dll')
+        (Join-Path $binDir  'Microsoft.Windows.AI.MachineLearning.dll'),
+        (Join-Path $binDir  'DirectML.dll'),
+        (Join-Path $binDir  'onnxruntime.dll'),
+        (Join-Path $binDir  'onnxruntime-genai.dll')
+      )
+      $optionalPatterns = @(
+        'onnxruntime_providers_*.dll'
       )
 
       foreach ($s in $sources) {
@@ -149,6 +155,12 @@ steps:
         Copy-Item -Path $s -Destination $dst -Force
         Write-Host "  staged $(Split-Path -Leaf $s)"
       }
+      foreach ($pattern in $optionalPatterns) {
+        Get-ChildItem -Path $binDir -Filter $pattern -File -ErrorAction SilentlyContinue | ForEach-Object {
+          Copy-Item -Path $_.FullName -Destination $dst -Force
+          Write-Host "  staged $($_.Name)"
+        }
+      }
 
 - ${{ if eq(parameters.stageHeaders, true) }}:
   - task: CopyFiles@2

.pipelines/v2/templates/steps-pack-cpp-sdk.yml

@@ -57,9 +57,8 @@ steps:
 
         Copy-Item -Path (Join-Path $includeSrc '*') -Destination $includeDst -Recurse -Force
 
-        # The SDK tgz should include only public wrapper headers.
+        # The SDK tgz should include public wrapper headers and their header-only dependencies.
         $pathsToPrune = @(
-          (Join-Path $includeDst 'gsl'),
           (Join-Path $includeDst '_manifest')
         )
         foreach ($pathToPrune in $pathsToPrune) {
@@ -68,13 +67,17 @@ steps:
           }
         }
 
-        foreach ($f in $Files) {
-          $src = Join-Path $nativeSrc $f
-          if (-not (Test-Path $src)) {
-            throw "Required native file not found: $src"
+        foreach ($entry in $Files) {
+          $optional = $entry.StartsWith('?')
+          $pattern = if ($optional) { $entry.Substring(1) } else { $entry }
+          $matches = @(Get-ChildItem -Path $nativeSrc -Filter $pattern -File -ErrorAction SilentlyContinue)
+          if ($matches.Count -eq 0 -and -not $optional) {
+            throw "Required native file not found: $(Join-Path $nativeSrc $pattern)"
+          }
+          foreach ($match in $matches) {
+            $dst = Join-Path $libDst $match.Name
+            Copy-Item -Path $match.FullName -Destination $dst -Force
           }
-          $dst = Join-Path $libDst (Split-Path -Leaf $src)
-          Copy-Item -Path $src -Destination $dst -Force
         }
 
         $archive = Join-Path $outDir ("cpp-sdk-v2-{0}.tgz" -f $Rid)
@@ -96,21 +99,38 @@ steps:
       New-SdkArchive -Rid 'win-x64' -NativeArtifact 'cpp-native-win-x64' -Files @(
         'foundry_local.dll',
         'foundry_local.pdb',
-        'foundry_local.lib'
+        'foundry_local.lib',
+        'Microsoft.Windows.AI.MachineLearning.dll',
+        'DirectML.dll',
+        'onnxruntime.dll',
+        'onnxruntime-genai.dll',
+        '?onnxruntime_providers_*.dll'
       )
 
       New-SdkArchive -Rid 'win-arm64' -NativeArtifact 'cpp-native-win-arm64' -Files @(
         'foundry_local.dll',
         'foundry_local.pdb',
-        'foundry_local.lib'
+        'foundry_local.lib',
+        'Microsoft.Windows.AI.MachineLearning.dll',
+        'DirectML.dll',
+        'onnxruntime.dll',
+        'onnxruntime-genai.dll',
+        '?onnxruntime_providers_*.dll'
       )
 
       New-SdkArchive -Rid 'linux-x64' -NativeArtifact 'cpp-native-linux-x64' -Files @(
-        'libfoundry_local.so'
+        'libfoundry_local.so',
+        'libonnxruntime-genai.so',
+        '?libonnxruntime-genai*.so',
+        '?libonnxruntime_providers_*.so',
+        'libonnxruntime.so*'
       )
 
       New-SdkArchive -Rid 'osx-arm64' -NativeArtifact 'cpp-native-osx-arm64' -Files @(
-        'libfoundry_local.dylib'
+        'libfoundry_local.dylib',
+        'libonnxruntime-genai.dylib',
+        'libonnxruntime*.dylib',
+        '?libonnxruntime_providers_*.dylib'
       )
 
       Write-Host "Staged archives:"

.pipelines/v2/templates/steps-pack-js.yml

@@ -74,6 +74,7 @@ steps:
       $dst = '${{ parameters.outputDir }}'
       New-Item -ItemType Directory -Force -Path $dst | Out-Null
       Set-Location "$(Build.SourcesDirectory)/sdk_v2/js"
+      Copy-Item "$(Build.SourcesDirectory)/sdk_v2/deps_versions.json" -Destination "deps_versions.json" -Force
       npm pack --pack-destination $dst
       if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
       Get-ChildItem $dst | ForEach-Object { Write-Host "  $($_.Name)  $($_.Length) bytes" }