From 9fa54b6100b1a04147c04f3186ab0dea52cbc208 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 27 Aug 2026 10:33:20 -0700
Subject: [PATCH 1/2] Fix install dotnet for non-early-access release (#27892)

---
 .pipelines/templates/release-validate-fxdpackages.yml | 7 ++++++-
 .pipelines/templates/release-validate-globaltools.yml | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.pipelines/templates/release-validate-fxdpackages.yml b/.pipelines/templates/release-validate-fxdpackages.yml
index 3e8169df19c..964fe9fce5f 100644
--- a/.pipelines/templates/release-validate-fxdpackages.yml
+++ b/.pipelines/templates/release-validate-fxdpackages.yml
@@ -62,6 +62,10 @@ jobs:
     - checkout: self
       clean: true
 
+    - template: /.pipelines/templates/SetVersionVariables.yml@self
+      parameters:
+        ReleaseTagVar: $(ReleaseTagVar)
+
     - template: release-SetReleaseTagandContainerName.yml@self
 
     - download: PSPackagesOfficial
@@ -80,7 +84,8 @@ jobs:
     - template: /.pipelines/templates/install-dotnet.yml@self
       parameters:
         architecture: ${{ parameters.dotnetArch }}
-        ob_restore_phase: false
+        ${{ if eq(parameters.IsEarlyAccess, true) }}:
+          ob_restore_phase: false
 
     - pwsh: |
         $artifactName = '$(artifactName)'
diff --git a/.pipelines/templates/release-validate-globaltools.yml b/.pipelines/templates/release-validate-globaltools.yml
index 1c784f5e76c..ef54bd215ea 100644
--- a/.pipelines/templates/release-validate-globaltools.yml
+++ b/.pipelines/templates/release-validate-globaltools.yml
@@ -49,6 +49,10 @@ jobs:
     - checkout: self
       clean: true
 
+    - template: /.pipelines/templates/SetVersionVariables.yml@self
+      parameters:
+        ReleaseTagVar: $(ReleaseTagVar)
+
     - template: release-SetReleaseTagandContainerName.yml@self
 
     - download: PSPackagesOfficial
@@ -66,7 +70,8 @@ jobs:
     - template: /.pipelines/templates/install-dotnet.yml@self
       parameters:
         architecture: ${{ parameters.dotnetArch }}
-        ob_restore_phase: false
+        ${{ if eq(parameters.IsEarlyAccess, true) }}:
+          ob_restore_phase: false
 
     - pwsh: |
         $repoRoot = "$(Build.SourcesDirectory)/PowerShell"

From ea61eef28ed44abef4f31af842c76dbbe6b0de57 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 27 Aug 2026 15:06:40 -0700
Subject: [PATCH 2/2] Add the needed variable groups to the MSIX VPack pipeline
 to enforce using the production ADO feed (#27896)

---
 .pipelines/MSIXBundle-vPack-Official.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.pipelines/MSIXBundle-vPack-Official.yml b/.pipelines/MSIXBundle-vPack-Official.yml
index 2461d3cd310..996991c22a0 100644
--- a/.pipelines/MSIXBundle-vPack-Official.yml
+++ b/.pipelines/MSIXBundle-vPack-Official.yml
@@ -51,6 +51,8 @@ variables:
   - group: certificate_logical_to_actual # used within signing task
   - group: MSIXSigningProfile
   - group: msixTools
+  - group: mscodehub-feed-read-general
+  - group: mscodehub-feed-read-akv
 
 resources:
   repositories: