From aa656d771ed30ed68e8e509af6d5e3aa140334fc Mon Sep 17 00:00:00 2001
From: Justin Chung <124807742+jshigetomi@users.noreply.github.com>
Date: Mon, 28 Apr 2025 17:35:12 -0500
Subject: [PATCH] Fix Merge errors

---
 .pipelines/templates/release-MakeBlobPublic.yml | 1 -
 .pipelines/templates/release-githubNuget.yml    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.pipelines/templates/release-MakeBlobPublic.yml b/.pipelines/templates/release-MakeBlobPublic.yml
index c6aeebb57be..cdda4b92ca1 100644
--- a/.pipelines/templates/release-MakeBlobPublic.yml
+++ b/.pipelines/templates/release-MakeBlobPublic.yml
@@ -160,7 +160,6 @@ jobs:
           $destinationContext = New-AzStorageContext -StorageAccountName $destinationStorageAccountName
           Write-Verbose -Verbose "Destination context: $($destinationContext.BlobEndPoint)"
 
-          $prefix = 'globaltool'
           $blobs = Get-AzStorageBlob -Context $sourceContext -Container $sourceContainerName -Prefix $prefix
 
           Write-Verbose -Verbose "Blobs found in $sourceContainerName"
diff --git a/.pipelines/templates/release-githubNuget.yml b/.pipelines/templates/release-githubNuget.yml
index 4c4bcd7e86e..a8a874619a4 100644
--- a/.pipelines/templates/release-githubNuget.yml
+++ b/.pipelines/templates/release-githubNuget.yml
@@ -191,11 +191,11 @@ jobs:
         Write-Verbose -Verbose "The .nupkgs below will be pushed:"
         Get-ChildItem "$(Pipeline.Workspace)/release" -recurse
     displayName: Download and capture nupkgs
-    condition: and(ne('${{ parameters.skipPublish }}', 'false'), succeeded())
+    condition: and(ne('${{ parameters.skipPublish }}', 'true'), succeeded())
 
   - task: NuGetCommand@2
     displayName: 'NuGet push'
-    condition: and(ne('${{ parameters.skipPublish }}', 'false'), succeeded())
+    condition: and(ne('${{ parameters.skipPublish }}', 'true'), succeeded())
     inputs:
       command: push
       packagesToPush: '$(Pipeline.Workspace)/release/*.nupkg'