Merge branch 'release/experimental' into 'feature/1.8-ml'

Author: nieubank

Samples/WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop/CppConsoleDesktop.cpp

@@ -202,8 +202,7 @@ void ConfigureExecutionProviders(Ort::SessionOptions& session_options, Ort::Env&
         }
         else if (ep_name == "OpenVINOExecutionProvider")
         {
-            // Configure threading for OpenVINO EP, pick the first device found.
-            ep_options.Add("num_of_threads", "4");
+            // Configure OpenVINO EP - pick the first device found.
             session_options.AppendExecutionProvider_V2(env, {devices.front()}, ep_options);
             std::cout << "Successfully added " << ep_name << " EP (first device only)" << std::endl;
         }

UpdateVersions.ps1

@@ -3,16 +3,23 @@ Param(
     [string]$NuGetPackagesFolder = ""
 )
 
-# If the nuget packages folder is specified containing the latest versions,
-# go through them to get the versions of the component packages.
+# First, add the metapackage
 $nugetPackageToVersionTable = @{"Microsoft.WindowsAppSDK" = $WinAppSDKVersion}
+
+# Next, if the nuget packages folder is specified containing the latest versions,
+# go through them to get the versions of all dependency packages.
 if (!($NuGetPackagesFolder -eq ""))
 {
     Get-ChildItem $NuGetPackagesFolder | 
-    Where-Object { $_.Name -like "Microsoft.WindowsAppSDK*" } | 
+    Where-Object { $_.Name -like "Microsoft.WindowsAppSDK.*" -or 
+                   $_.Name -like "Microsoft.Windows.SDK.BuildTools.*" -or 
+                   $_.Name -like "Microsoft.Web.WebView2.*" } | 
     Where-Object { $_.Name -notlike "*.nupkg" } |
     ForEach-Object { 
-        if ($_.Name -match "^(Microsoft\.WindowsAppSDK\.[a-zA-Z]+)\.([0-9].*)$")
+        if ($_.Name -match "^(Microsoft\.WindowsAppSDK\.[a-zA-Z]+)\.([0-9].*)$" -or
+            $_.Name -match "^(Microsoft\.Windows\.SDK\.BuildTools\.MSIX)\.([0-9].*)$" -or
+            $_.Name -match "^(Microsoft\.Windows\.SDK\.BuildTools)\.([0-9].*)$" -or
+            $_.Name -match "^(Microsoft\.Web\.WebView2)\.([0-9].*)$")
         {
             $nugetPackageToVersionTable[$Matches[1]] = $Matches[2]
             Write-Host "Found $($Matches[1]) - $($Matches[2])"