From 5730b552ba9fc10c2a32fa6c882d5c8e12b4fd2d Mon Sep 17 00:00:00 2001
From: Yunchi Wang <54880216+wyunchi-ms@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:02:35 +0800
Subject: [PATCH 1/2] Fix the CFS issue in oob pipeline

---
 .../VersionController/Models/ModuleHelper.cs  | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/tools/VersionController/Models/ModuleHelper.cs b/tools/VersionController/Models/ModuleHelper.cs
index 63afca8d1045..3309d4c850f4 100644
--- a/tools/VersionController/Models/ModuleHelper.cs
+++ b/tools/VersionController/Models/ModuleHelper.cs
@@ -14,11 +14,27 @@ internal class ModuleHelper
         /// <returns></returns>
         internal static string GetLatestVersionFromPSGallery(string moduleName, ReleaseType releaseType = ReleaseType.STS)
         {
-
             string version = null;
-            string findModuleScript = releaseType == ReleaseType.STS ? $"Find-Module {moduleName} -Repository PSGallery -AllVersions" : "Find-Module Az -Repository PSGallery -AllVersions";
-            string filterRequiredReleaseTypeScript = releaseType == ReleaseType.STS ? "" : "| Where-Object {([System.Version]($_.Version)).Major%2 -eq 0}";
-            string sortModuleScript = "| Sort-Object {[System.Version]$_.Version} -Descending";
+            string findModuleScript;
+                
+            if (!string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable("DEFAULT_PS_REPOSITORY_URL")))
+            {
+                string repository = System.Environment.GetEnvironmentVariable("DEFAULT_PS_REPOSITORY_NAME");
+                findModuleScript = @"
+$AccessTokenSecureString = $env:SYSTEM_ACCESS_TOKEN | ConvertTo-SecureString -AsPlainText -Force;
+$credentialsObject = [pscredential]::new('ONEBRANCH_TOKEN', $AccessTokenSecureString);
+";
+                findModuleScript += releaseType == ReleaseType.STS 
+                    ? $"Find-PSResource -Name {moduleName} -Repository {repository} -Version * -Credential $credentialsObject" 
+                    : $"Find-PSResource -Name Az -Repository {repository} -Version * -Credential $credentialsObject";
+            }
+            else
+            {
+                string repository = "PSGallery";
+                findModuleScript = releaseType == ReleaseType.STS ? $"Find-PSResource -Name {moduleName} -Repository {repository} -Version *" : $"Find-PSResource -Name Az -Repository {repository} -Version *";
+            }
+            string filterRequiredReleaseTypeScript = releaseType == ReleaseType.STS ? "" : "| Where-Object {$_.Version.Major % 2 -eq 0}";
+            string sortModuleScript = "| Sort-Object {$_.Version} -Descending";
             string getLastModuleVersionScript = releaseType == ReleaseType.STS ? 
                 $"({findModuleScript}{filterRequiredReleaseTypeScript}{sortModuleScript})[0].Version" :
                 $"(({findModuleScript}{filterRequiredReleaseTypeScript}{sortModuleScript})[0].Dependencies | Where-Object {{$_.Name -eq '{moduleName}'}})[1]";

From 2f0c1b02c6f184244cd8c55f327605734a64bc5e Mon Sep 17 00:00:00 2001
From: azure-powershell-bot
 <65331932+azure-powershell-bot@users.noreply.github.com>
Date: Mon, 4 Aug 2025 06:10:07 +0000
Subject: [PATCH 2/2] Bump up version for DesktopVirtualization

---
 NuGet.Config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NuGet.Config b/NuGet.Config
index 14f021ca5764..49d84addb1c8 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -34,6 +34,8 @@
 
 
 
+
+