sdk_v2: scrub vestigial WinML/non-WinML separation from comments, docs, backend

The flavor split is gone from sdk_v2 code, but stale references to it lingered
in comments and docs. Reword them to describe the unified reality — WinML is
always on on Windows, so the distinction is platform, not flavor:

- cpp/CMakeLists.txt, cpp/test/CMakeLists.txt, js/script/copy-native.mjs:
  "no WinML SKU" / "WinML build" / "non-WinML build" -> platform wording.
- cpp/cmake/FindOnnxRuntime.cmake: drop the now-vacuous "for both flavors".
- .pipelines/v2: steps-build-windows.yml (Standard-vs-WinML build split -> one
  Windows build), steps-test-python.yml ("Both variants" -> per-job wheel),
  and the plan docs ("per variant"; deferred "WinML variant" bullet).
- build_and_test_all.ps1: tighten the net9.0/net462 test comment.

Also simplify python/_build_backend: with deps_versions_winml.json gone there is
a single deps file, so drop the _STD suffix and the deps_file parameter threaded
through _read_versions/_patch_pyproject_text. Verified it still rewrites all four
ORT/GenAI pins from deps_versions.json.

sdk_v2-only; the V1 sdk/ + .pipelines/v1 generation keeps its flavor split.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: bmehta001

.pipelines/v2/sdk_v2-js-pipeline-plan.md

@@ -19,7 +19,6 @@ Out of scope (deferred):
 
 - **Linux ARM64.** Cross-cutting ARM64 work item will add this for C++,
   C#, Python, and JS together.
-- **WinML variant.** JS is scoped out by the base plan.
 - **npm publishing.** Pipeline produces the `.tgz` as an artifact only.
 
 ## Supported platforms

.pipelines/v2/sdk_v2-pipeline-plan.md

@@ -81,7 +81,7 @@ are gated separately via `.pipelines/v1/templates/stages-sdk-v1.yml`.
      at wheel-build time. If the backend is ever bypassed, `pip install`
      fails fast with "no matching version" (intentional loud failure).
 
-   Bumping ORT/GenAI is a one-file edit per variant.
+   Bumping ORT/GenAI is a one-file edit.
 9. **ORT/GenAI come from public PyPI.** No private feed plumbing required
    for the wheel install path:
    - `onnxruntime-core` (Windows/macOS)

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

@@ -115,17 +115,15 @@ steps:
       VCPKG_ROOT: $(Build.BinariesDirectory)\vcpkg
       FOUNDRY_TEST_DATA_DIR: $(Agent.BuildDirectory)\test-data-shared
 
-# Stage the redistributable native artifacts.
-#   - Standard build: vcpkg statically links ORT/GenAI/azure-*/spdlog/fmt/
-#     libcurl/libssl/zlib/brotli* into foundry_local.dll (see
-#     sdk_v2/cpp/triplets/x64-windows.cmake), so the only runtime payload is
-#     foundry_local.dll itself.
-#   - WinML build: foundry_local.dll picks up one extra runtime dependency,
-#     Microsoft.Windows.AI.MachineLearning.dll, which must travel with the wheel.
-#     The WinML DLL is delay-loaded (see /DELAYLOAD in CMakeLists.txt) so it is
-#     NOT needed at foundry_local.dll load time, but the cmake post-build copy
-#     stages it next to foundry_local.dll for runtime EP discovery. ORT/GenAI
-#     come from the onnxruntime-core / onnxruntime-genai-core pip deps.
+# Stage the redistributable native artifacts. vcpkg statically links
+# ORT/GenAI/azure-*/spdlog/fmt/libcurl/libssl/zlib/brotli* into foundry_local.dll
+# (see sdk_v2/cpp/triplets/x64-windows.cmake), so foundry_local.dll carries that
+# payload itself. It also picks up one extra runtime dependency,
+# Microsoft.Windows.AI.MachineLearning.dll, which must travel with the wheel.
+# The WinML DLL is delay-loaded (see /DELAYLOAD in CMakeLists.txt) so it is
+# NOT needed at foundry_local.dll load time, but the cmake post-build copy
+# stages it next to foundry_local.dll for runtime EP discovery. ORT/GenAI
+# come from the onnxruntime-core / onnxruntime-genai-core pip deps.
 - task: PowerShell@2
   displayName: 'Stage native artifacts'
   inputs:

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

@@ -53,8 +53,8 @@ steps:
     targetType: inline
     pwsh: true
     script: |
-        # Locate the wheel. Both variants land in their own per-job artifact
-        # so a single match is expected.
+        # Locate the wheel. Each job's wheel lands in its own artifact, so a
+        # single match is expected.
         $wheels = @(Get-ChildItem "${{ parameters.wheelDir }}" -Recurse -Filter '*.whl')
         if ($wheels.Count -eq 0) { throw "No .whl found under ${{ parameters.wheelDir }}" }
         if ($wheels.Count -gt 1) {

sdk_v2/build_and_test_all.ps1

@@ -137,10 +137,8 @@ try {
                 dotnet @buildArgs
                 if ($LASTEXITCODE -ne 0) { throw "dotnet build exit $LASTEXITCODE" }
 
-                # The test csproj multi-targets net8.0/net9.0 (and net462 on Windows)
-                # for build coverage; run the .NET (Core) test suite once on net9.0
-                # (back-compat covers net8.0 consumers) plus net462 on Windows to
-                # exercise the netstandard polyfills at runtime.
+                # Test on net9.0 (back-compat covers net8.0 consumers); on Windows
+                # also run net462 to exercise the netstandard2.0 polyfills.
                 $frameworks = @('net9.0')
                 if ($IsWindows) { $frameworks += 'net462' }
 

sdk_v2/cpp/CMakeLists.txt

@@ -111,10 +111,10 @@ else()
 endif()
 
 # WinML EP bootstrapper is only built when the WinML EP catalog package is
-# available — the source unconditionally references its headers/types. Other
-# Windows builds (no WinML SKU) skip it entirely; manager.cc gates the call
-# site on FOUNDRY_LOCAL_HAS_EP_CATALOG so DiscoverProviders is only invoked
-# when this translation unit is linked in.
+# available — the source unconditionally references its headers/types, which
+# exist only on Windows. manager.cc gates the call site on
+# FOUNDRY_LOCAL_HAS_EP_CATALOG so DiscoverProviders is only invoked when this
+# translation unit is linked in.
 if(WinMLEpCatalog_FOUND)
     list(APPEND FOUNDRY_LOCAL_PLATFORM_SOURCES
         src/ep_detection/winml_ep_bootstrapper.cc

sdk_v2/cpp/cmake/FindOnnxRuntime.cmake

@@ -220,7 +220,7 @@ else()
     set_target_properties(OnnxRuntime::OnnxRuntime PROPERTIES
         IMPORTED_IMPLIB "${_ORT_LIB_DIR}/onnxruntime.lib"
     )
-    # On Windows, the runtime DLL sits next to the import lib for both flavors.
+    # On Windows, the runtime DLL sits next to the import lib.
     if(NOT _ORT_DLL_DIR)
         set(_ORT_DLL_DIR "${_ORT_LIB_DIR}")
     endif()

sdk_v2/cpp/test/CMakeLists.txt

@@ -105,7 +105,7 @@ else()
 endif()
 
 include(GoogleTest)
-# DISCOVERY_TIMEOUT defaults to 5s, which is not enough for the WinML build:
+# DISCOVERY_TIMEOUT defaults to 5s, which is not enough for the Windows build:
 # foundry_local.dll links against Microsoft.Windows.AI.MachineLearning.dll
 # (delay-loaded) plus standalone ORT, and process startup + gtest enumeration
 # can exceed 5s on cold caches or slow CI agents. Bump to 60s for headroom.

sdk_v2/js/script/copy-native.mjs

@@ -78,8 +78,8 @@ let copied = 0;
 const available = new Set(readdirSync(sourceDir));
 for (const file of wanted) {
   if (!available.has(file)) {
-    // Skip optional deps that aren't present in this build flavor (e.g.
-    // WinML bits in a non-WinML build).
+    // Skip optional deps not produced on this platform (e.g. the Windows ML
+    // runtime only exists in Windows builds).
     continue;
   }
   const src = resolve(sourceDir, file);

sdk_v2/python/_build_backend/__init__.py

@@ -43,33 +43,32 @@
 
 
 _PYPROJECT = Path(__file__).resolve().parent.parent / "pyproject.toml"
-_SDK_V2_ROOT = _PYPROJECT.resolve().parent.parent
-_DEPS_JSON_STD = _SDK_V2_ROOT / "deps_versions.json"
+_DEPS_JSON = _PYPROJECT.parent.parent / "deps_versions.json"
 
-# Patterns for rewriting ORT/GenAI version pins in the dependencies list.
-# Each captures the package name + ``==`` and we substitute in the version
-# read from the appropriate deps_versions JSON.
+# Patterns for rewriting ORT/GenAI version pins in the dependencies list. Each
+# captures the package name + ``==`` and we substitute in the version read from
+# deps_versions.json.
 _ORT_PIN_PATTERN = re.compile(r'("onnxruntime(?:-core|-gpu)==)[^\s";]+')
 _GENAI_PIN_PATTERN = re.compile(r'("onnxruntime-genai(?:-core|-cuda)==)[^\s";]+')
 
 
-def _read_versions(deps_file: Path) -> tuple[str, str]:
-    if not deps_file.is_file():
-        raise RuntimeError(f"Required versions file not found: {deps_file}")
-    data = json.loads(deps_file.read_text(encoding="utf-8"))
+def _read_versions() -> tuple[str, str]:
+    if not _DEPS_JSON.is_file():
+        raise RuntimeError(f"Required versions file not found: {_DEPS_JSON}")
+    data = json.loads(_DEPS_JSON.read_text(encoding="utf-8"))
     try:
         ort = data["onnxruntime"]["version"]
         genai = data["onnxruntime-genai"]["version"]
     except (KeyError, TypeError) as exc:
         raise RuntimeError(
-            f"{deps_file} is missing required keys 'onnxruntime.version' / 'onnxruntime-genai.version'"
+            f"{_DEPS_JSON} is missing required keys 'onnxruntime.version' / 'onnxruntime-genai.version'"
         ) from exc
     return str(ort), str(genai)
 
 
-def _patch_pyproject_text(original: str, *, deps_file: Path) -> str:
-    """Return *original* with the ORT/GenAI version pins rewritten from *deps_file*."""
-    ort_ver, genai_ver = _read_versions(deps_file)
+def _patch_pyproject_text(original: str) -> str:
+    """Return *original* with the ORT/GenAI version pins rewritten from deps_versions.json."""
+    ort_ver, genai_ver = _read_versions()
     patched = _ORT_PIN_PATTERN.sub(lambda m: f"{m.group(1)}{ort_ver}", original)
     patched = _GENAI_PIN_PATTERN.sub(lambda m: f"{m.group(1)}{genai_ver}", patched)
     return patched
@@ -83,10 +82,10 @@ def _rewrite_version_pins() -> Generator[None, None, None]:
     versions; rewriting here keeps the wheel's declared pins in lockstep.
     """
     original = _PYPROJECT.read_text(encoding="utf-8")
-    patched = _patch_pyproject_text(original, deps_file=_DEPS_JSON_STD)
+    patched = _patch_pyproject_text(original)
 
     if patched == original:
-        # Nothing to rewrite (e.g. JSON already matches and no name override).
+        # Pins already match deps_versions.json — nothing to rewrite.
         yield
         return