diff --git a/.pipelines/foundry-local-packaging.yml b/.pipelines/foundry-local-packaging.yml index 2cb9ee2a..c871cdf1 100644 --- a/.pipelines/foundry-local-packaging.yml +++ b/.pipelines/foundry-local-packaging.yml @@ -17,7 +17,7 @@ parameters: - name: version displayName: 'Package version' type: string - default: '0.9.0' + default: '1.0.0' - name: prereleaseId displayName: 'Pre-release identifier (e.g. rc1, beta).' type: string diff --git a/.pipelines/templates/build-core-steps.yml b/.pipelines/templates/build-core-steps.yml index 9f024c42..3803ccf0 100644 --- a/.pipelines/templates/build-core-steps.yml +++ b/.pipelines/templates/build-core-steps.yml @@ -48,7 +48,6 @@ steps: - diff --git a/.pipelines/templates/package-core-steps.yml b/.pipelines/templates/package-core-steps.yml index e5755a21..15b8fb54 100644 --- a/.pipelines/templates/package-core-steps.yml +++ b/.pipelines/templates/package-core-steps.yml @@ -109,9 +109,9 @@ steps: $nuspec = "$nsRoot/src/FoundryLocalCore/Core/WinMLNuget.nuspec" $id = "Microsoft.AI.Foundry.Local.Core.WinML" $ortVer = $pg.OnnxRuntimeFoundryVersionForWinML - $genaiVer = $pg.OnnxRuntimeGenAIWinML + $genaiVer = $pg.OnnxRuntimeGenAIFoundryVersion $winAppSdkVer = $pg.WinAppSdkVersion - $props = "id=$id;version=$(flcVersion);commitId=$(Build.SourceVersion);OnnxRuntimeFoundryVersion=$ortVer;OnnxRuntimeGenAIWinML=$genaiVer;WinAppSdkVersion=$winAppSdkVer" + $props = "id=$id;version=$(flcVersion);commitId=$(Build.SourceVersion);OnnxRuntimeFoundryVersionForWinML=$ortVer;OnnxRuntimeGenAIFoundryVersion=$genaiVer;WinAppSdkVersion=$winAppSdkVer" } else { $nuspec = "$nsRoot/src/FoundryLocalCore/Core/NativeNuget.nuspec" $id = "Microsoft.AI.Foundry.Local.Core" diff --git a/.pipelines/templates/test-cs-steps.yml b/.pipelines/templates/test-cs-steps.yml index f7dc1aff..92c9b6ee 100644 --- a/.pipelines/templates/test-cs-steps.yml +++ b/.pipelines/templates/test-cs-steps.yml @@ -68,6 +68,7 @@ steps: + diff --git a/sdk/cs/src/Microsoft.AI.Foundry.Local.csproj b/sdk/cs/src/Microsoft.AI.Foundry.Local.csproj index e8a7b755..26d74ff6 100644 --- a/sdk/cs/src/Microsoft.AI.Foundry.Local.csproj +++ b/sdk/cs/src/Microsoft.AI.Foundry.Local.csproj @@ -29,7 +29,7 @@ true false diff --git a/sdk/js/script/install-standard.cjs b/sdk/js/script/install-standard.cjs index bd0558b5..8b30135a 100644 --- a/sdk/js/script/install-standard.cjs +++ b/sdk/js/script/install-standard.cjs @@ -8,12 +8,10 @@ const os = require('os'); const { NUGET_FEED, ORT_NIGHTLY_FEED, runInstall } = require('./install-utils.cjs'); -const useNightly = process.env.npm_config_nightly === 'true'; - const ARTIFACTS = [ - { name: 'Microsoft.AI.Foundry.Local.Core', version: '0.9.0-dev-202603310538-f6efa8d3', feed: ORT_NIGHTLY_FEED, nightly: useNightly }, - { name: os.platform() === 'linux' ? 'Microsoft.ML.OnnxRuntime.Gpu.Linux' : 'Microsoft.ML.OnnxRuntime.Foundry', version: '1.24.3', feed: NUGET_FEED, nightly: false }, - { name: 'Microsoft.ML.OnnxRuntimeGenAI.Foundry', version: '0.13.0-dev-20260319-1131106-439ca0d5', feed: ORT_NIGHTLY_FEED, nightly: useNightly }, + { name: 'Microsoft.AI.Foundry.Local.Core', version: '0.9.0-dev-202603310538-f6efa8d3', feed: ORT_NIGHTLY_FEED }, + { name: os.platform() === 'linux' ? 'Microsoft.ML.OnnxRuntime.Gpu.Linux' : 'Microsoft.ML.OnnxRuntime.Foundry', version: '1.24.4', feed: NUGET_FEED }, + { name: 'Microsoft.ML.OnnxRuntimeGenAI.Foundry', version: '0.13.0', feed: NUGET_FEED }, ]; (async () => { diff --git a/sdk/js/script/install-utils.cjs b/sdk/js/script/install-utils.cjs index f9a5186c..cc61f0db 100644 --- a/sdk/js/script/install-utils.cjs +++ b/sdk/js/script/install-utils.cjs @@ -104,24 +104,9 @@ async function getBaseAddress(feedUrl) { return baseAddress.endsWith('/') ? baseAddress : baseAddress + '/'; } -async function resolveLatestVersion(feedUrl, packageName) { - const baseAddress = await getBaseAddress(feedUrl); - const versionsUrl = `${baseAddress}${packageName.toLowerCase()}/index.json`; - const versionData = await downloadJson(versionsUrl); - const versions = versionData.versions || []; - if (versions.length === 0) throw new Error(`No versions found for ${packageName}`); - versions.sort((a, b) => b.localeCompare(a)); - console.log(`[foundry-local] Latest version of ${packageName}: ${versions[0]}`); - return versions[0]; -} - async function installPackage(artifact, tempDir) { const pkgName = artifact.name; - let pkgVer = artifact.version; - if (artifact.nightly) { - console.log(` Resolving latest version for ${pkgName}...`); - pkgVer = await resolveLatestVersion(artifact.feed, pkgName); - } + const pkgVer = artifact.version; const baseAddress = await getBaseAddress(artifact.feed); const nameLower = pkgName.toLowerCase(); @@ -167,13 +152,8 @@ async function runInstall(artifacts) { } if (fs.existsSync(BIN_DIR) && REQUIRED_FILES.every(f => fs.existsSync(path.join(BIN_DIR, f)))) { - if (process.env.npm_config_nightly === 'true') { - console.log(`[foundry-local] Nightly requested. Forcing reinstall...`); - fs.rmSync(BIN_DIR, { recursive: true, force: true }); - } else { - console.log(`[foundry-local] Native libraries already installed.`); - return; - } + console.log(`[foundry-local] Native libraries already installed.`); + return; } console.log(`[foundry-local] Installing native libraries for ${RID}...`); diff --git a/sdk/js/script/install-winml.cjs b/sdk/js/script/install-winml.cjs index dd0cb0d0..e6fda732 100644 --- a/sdk/js/script/install-winml.cjs +++ b/sdk/js/script/install-winml.cjs @@ -7,12 +7,10 @@ const { NUGET_FEED, ORT_NIGHTLY_FEED, runInstall } = require('./install-utils.cjs'); -const useNightly = process.env.npm_config_nightly === 'true'; - const ARTIFACTS = [ - { name: 'Microsoft.AI.Foundry.Local.Core.WinML', version: '0.9.0-dev-202603310538-f6efa8d3', feed: ORT_NIGHTLY_FEED, nightly: useNightly }, - { name: 'Microsoft.ML.OnnxRuntime.Foundry', version: '1.23.2.3', feed: NUGET_FEED, nightly: false }, - { name: 'Microsoft.ML.OnnxRuntimeGenAI.WinML', version: '0.13.0-dev-20260319-1131106-439ca0d5', feed: ORT_NIGHTLY_FEED, nightly: useNightly }, + { name: 'Microsoft.AI.Foundry.Local.Core.WinML', version: '0.9.0-dev-202603310538-f6efa8d3', feed: ORT_NIGHTLY_FEED }, + { name: 'Microsoft.ML.OnnxRuntime.Foundry', version: '1.23.2.3', feed: NUGET_FEED }, + { name: 'Microsoft.ML.OnnxRuntimeGenAI.Foundry', version: '0.13.0', feed: NUGET_FEED }, ]; (async () => { diff --git a/sdk/python/requirements-winml.txt b/sdk/python/requirements-winml.txt index e554890c..bcf02668 100644 --- a/sdk/python/requirements-winml.txt +++ b/sdk/python/requirements-winml.txt @@ -4,4 +4,4 @@ openai>=2.24.0 # WinML native binary packages from the ORT-Nightly PyPI feed. foundry-local-core-winml==0.9.0.dev20260331004032 onnxruntime-core==1.23.2.3 -onnxruntime-genai-core==0.12.1 \ No newline at end of file +onnxruntime-genai-core==0.13.0 \ No newline at end of file diff --git a/sdk/python/requirements.txt b/sdk/python/requirements.txt index 801f577d..26da243f 100644 --- a/sdk/python/requirements.txt +++ b/sdk/python/requirements.txt @@ -3,5 +3,5 @@ requests>=2.32.4 openai>=2.24.0 # Standard native binary packages from the ORT-Nightly PyPI feed. foundry-local-core==0.9.0.dev20260327060216 -onnxruntime-core==1.24.3 -onnxruntime-genai-core==0.12.1 \ No newline at end of file +onnxruntime-core==1.24.4 +onnxruntime-genai-core==0.13.0 \ No newline at end of file diff --git a/sdk/rust/build.rs b/sdk/rust/build.rs index 996eaf2a..73d84d32 100644 --- a/sdk/rust/build.rs +++ b/sdk/rust/build.rs @@ -8,8 +8,8 @@ const ORT_NIGHTLY_FEED: &str = "https://pkgs.dev.azure.com/aiinfra/PublicPackages/_packaging/ORT-Nightly/nuget/v3/index.json"; const CORE_VERSION: &str = "0.9.0.8-rc3"; -const ORT_VERSION: &str = "1.24.3"; -const GENAI_VERSION: &str = "0.13.0-dev-20260319-1131106-439ca0d5"; +const ORT_VERSION: &str = "1.24.4"; +const GENAI_VERSION: &str = "0.13.0"; const WINML_ORT_VERSION: &str = "1.23.2.3"; @@ -62,9 +62,9 @@ fn get_packages(rid: &str) -> Vec { feed_url: NUGET_FEED, }); packages.push(NuGetPackage { - name: "Microsoft.ML.OnnxRuntimeGenAI.WinML", + name: "Microsoft.ML.OnnxRuntimeGenAI.Foundry", version: GENAI_VERSION.to_string(), - feed_url: ORT_NIGHTLY_FEED, + feed_url: NUGET_FEED, }); } else { packages.push(NuGetPackage { @@ -90,7 +90,7 @@ fn get_packages(rid: &str) -> Vec { packages.push(NuGetPackage { name: "Microsoft.ML.OnnxRuntimeGenAI.Foundry", version: GENAI_VERSION.to_string(), - feed_url: ORT_NIGHTLY_FEED, + feed_url: NUGET_FEED, }); }