Merge remote-tracking branch 'origin/main' into bhamehta/per-ep-progress-v2

bmehta001 · bmehta001 · commit b8ce50935c73 · 2026-04-01T00:25:35.000-05:00
# Conflicts:
#	sdk/cs/src/ICatalog.cs
diff --git a/sdk/cs/src/ICatalog.cs b/sdk/cs/src/ICatalog.cs
@@ -58,7 +58,7 @@ public interface ICatalog
     /// This is used to check if a newer version of a model is available in the catalog for download.
     /// </summary>
     /// <param name="model">The model to check for the latest version.</param>
-    /// <param name="ct">Optional cancellation token.</param>
+    /// <param name="ct">Optional CancellationToken.</param>
     /// <returns>The latest version of the model. Will match the input if it is the latest version.</returns>
     Task<IModel> GetLatestVersionAsync(IModel model, CancellationToken? ct = null);
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public interface ICatalog`
`58`	`58`	`/// This is used to check if a newer version of a model is available in the catalog for download.`
`59`	`59`	`/// </summary>`
`60`	`60`	`/// <param name="model">The model to check for the latest version.</param>`
`61`		`- /// <param name="ct">Optional cancellation token.</param>`
	`61`	`+ /// <param name="ct">Optional CancellationToken.</param>`
`62`	`62`	`/// <returns>The latest version of the model. Will match the input if it is the latest version.</returns>`
`63`	`63`	`Task<IModel> GetLatestVersionAsync(IModel model, CancellationToken? ct = null);`
`64`	`64`	`}`