Align WinML support after main rebase

Lower remaining WinML build targets to the GA minimum, keep the C# bootstrap logic single-sourced, and auto-enable C++ bootstrap when the WinML bootstrap DLL is present.

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

Author: bmehta001

.pipelines/templates/build-core-steps.yml

@@ -58,7 +58,7 @@ steps:
     inputs:
       command: restore
       projects: '$(nsRoot)/src/FoundryLocalCore/Core/Core.csproj'
-      restoreArguments: '-r ${{ parameters.flavor }} /p:Platform=${{ parameters.platform }} /p:IncludeWebService=true /p:Configuration=Release /p:NetTargetFramework=net9.0-windows10.0.26100.0 /p:UseWinML=true'
+      restoreArguments: '-r ${{ parameters.flavor }} /p:Platform=${{ parameters.platform }} /p:IncludeWebService=true /p:Configuration=Release /p:NetTargetFramework=net9.0-windows10.0.18362.0 /p:UseWinML=true'
       feedsToUse: config
       nugetConfigPath: '$(nsRoot)/nuget.config'
 
@@ -67,14 +67,14 @@ steps:
     inputs:
       command: build
       projects: '$(nsRoot)/src/FoundryLocalCore/Core/Core.csproj'
-      arguments: '--no-restore -r ${{ parameters.flavor }} -f net9.0-windows10.0.26100.0 /p:Platform=${{ parameters.platform }} /p:IncludeWebService=true /p:Configuration=Release /p:NetTargetFramework=net9.0-windows10.0.26100.0 /p:UseWinML=true'
+      arguments: '--no-restore -r ${{ parameters.flavor }} -f net9.0-windows10.0.18362.0 /p:Platform=${{ parameters.platform }} /p:IncludeWebService=true /p:Configuration=Release /p:NetTargetFramework=net9.0-windows10.0.18362.0 /p:UseWinML=true'
 
   - task: DotNetCoreCLI@2
     displayName: 'Publish FLC AOT ${{ parameters.flavor }} (WinML)'
     inputs:
       command: publish
       projects: '$(nsRoot)/src/FoundryLocalCore/Core/Core.csproj'
-      arguments: '--no-restore --no-build -r ${{ parameters.flavor }} -f net9.0-windows10.0.26100.0 /p:Platform=${{ parameters.platform }} /p:Configuration=Release /p:PublishAot=true /p:NetTargetFramework=net9.0-windows10.0.26100.0 /p:UseWinML=true'
+      arguments: '--no-restore --no-build -r ${{ parameters.flavor }} -f net9.0-windows10.0.18362.0 /p:Platform=${{ parameters.platform }} /p:Configuration=Release /p:PublishAot=true /p:NetTargetFramework=net9.0-windows10.0.18362.0 /p:UseWinML=true'
       publishWebProjects: false
       zipAfterPublish: false
 
@@ -84,7 +84,7 @@ steps:
       inputs:
         command: restore
         projects: '$(nsRoot)/test/FoundryLocalCore/Core/FoundryLocalCore.Tests.csproj'
-        restoreArguments: '-r ${{ parameters.flavor }} /p:Platform=${{ parameters.platform }} /p:IncludeWebService=true /p:Configuration=Release /p:NetTargetFramework=net9.0-windows10.0.26100.0 /p:UseWinML=true'
+        restoreArguments: '-r ${{ parameters.flavor }} /p:Platform=${{ parameters.platform }} /p:IncludeWebService=true /p:Configuration=Release /p:NetTargetFramework=net9.0-windows10.0.18362.0 /p:UseWinML=true'
         feedsToUse: config
         nugetConfigPath: '$(nsRoot)/nuget.config'
 
@@ -93,7 +93,7 @@ steps:
       inputs:
         command: build
         projects: '$(nsRoot)/test/FoundryLocalCore/Core/FoundryLocalCore.Tests.csproj'
-        arguments: '--no-restore -r ${{ parameters.flavor }} /p:Platform=${{ parameters.platform }} /p:IncludeWebService=true /p:Configuration=Release /p:NetTargetFramework=net9.0-windows10.0.26100.0 /p:UseWinML=true'
+        arguments: '--no-restore -r ${{ parameters.flavor }} /p:Platform=${{ parameters.platform }} /p:IncludeWebService=true /p:Configuration=Release /p:NetTargetFramework=net9.0-windows10.0.18362.0 /p:UseWinML=true'
 
     - task: DotNetCoreCLI@2
       displayName: 'Test FLC ${{ parameters.flavor }} (WinML)'

samples/cs/verify-winml/VerifyWinML.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0-windows10.0.26100</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.18362.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>

sdk/cpp/src/foundry_local_manager.cpp

@@ -5,8 +5,11 @@
 #include <string_view>
 #include <vector>
 #include <memory>
+#include <filesystem>
+#include <system_error>
 
 #include <gsl/span>
+#include <wil/win32_helpers.h>
 
 #include "foundry_local.h"
 #include "foundry_local_internal_core.h"
@@ -17,6 +20,16 @@
 
 namespace foundry_local {
 
+namespace {
+    bool HasWinMLBootstrapDll() {
+        auto exePath = wil::GetModuleFileNameW(nullptr);
+        std::error_code ec;
+        return std::filesystem::exists(
+            std::filesystem::path(exePath.get()).parent_path() / L"Microsoft.WindowsAppRuntime.Bootstrap.dll",
+            ec);
+    }
+} // namespace
+
 std::unique_ptr<Manager, Manager::Deleter> Manager::instance_;
 
 void Manager::Create(Configuration configuration, ILogger* logger) {
@@ -154,13 +167,20 @@ void Manager::Cleanup() noexcept {
         if (config_.web && config_.web->urls) {
             initReq.AddParam("WebServiceUrls", *config_.web->urls);
         }
+        bool hasBootstrapSetting = false;
         if (config_.additional_settings) {
             for (const auto& [key, value] : *config_.additional_settings) {
                 if (!key.empty()) {
+                    if (key == "Bootstrap") {
+                        hasBootstrapSetting = true;
+                    }
                     initReq.AddParam(key, value);
                 }
             }
         }
+        if (!hasBootstrapSetting && HasWinMLBootstrapDll()) {
+            initReq.AddParam("Bootstrap", "true");
+        }
 
         std::string initJson = initReq.ToJson();
         auto initResponse = core_->call(initReq.Command(), *logger_, &initJson);

sdk/cs/src/Detail/CoreInterop.cs

@@ -59,14 +59,6 @@ internal CoreInterop(Configuration config, ILogger logger)
         var request = new CoreInteropRequest { Params = config.AsDictionary() };
         PrepareWinMLBootstrap(request);
 
-#if IS_WINML
-        // WinML builds require bootstrapping the Windows App Runtime
-        if (!request.Params.ContainsKey("Bootstrap"))
-        {
-            request.Params["Bootstrap"] = "true";
-        }
-#endif
-
         var response = ExecuteCommand("initialize", request);
 
         if (response.Error != null)

sdk/python/requirements-winml.txt

@@ -1,7 +1,7 @@
 pydantic>=2.0.0
 requests>=2.32.4
 openai>=2.24.0
-# WinML native binary packages.
+# WinML native binary packages from the ORT-Nightly PyPI feed.
 foundry-local-core-winml==1.0.0
 onnxruntime-core==1.23.2.3
 onnxruntime-genai-core==0.13.2