From 17c33cd93ff0ccf7c4d81563ba356c19002b8296 Mon Sep 17 00:00:00 2001
From: "Michael Mainer (from Dev Box)"
 <8527305+MIchaelMainer@users.noreply.github.com>
Date: Tue, 29 Jul 2025 14:30:42 -0700
Subject: [PATCH 1/2] ci: fix inputs for production

---
 azure-pipelines/publishSamples.yml | 31 +++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/azure-pipelines/publishSamples.yml b/azure-pipelines/publishSamples.yml
index 2ead5a5f..bc415154 100644
--- a/azure-pipelines/publishSamples.yml
+++ b/azure-pipelines/publishSamples.yml
@@ -1,15 +1,23 @@
-# Starter pipeline
-# Start with a minimal pipeline that you can customize to build and deploy your code.
-# Add steps that build, run tests, deploy, and more:
-# https://aka.ms/yaml
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Microsoft Graph Explorer API - Sample Queries and Permissions
+# This pipeline publishes sample queries and permissions files to Azure Blob Storage.
 
 name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+
 trigger:
   branches:
     include:
     - master
     - dev
+  paths:
+    include:
+    - 'samples-queries/**'
+    - 'permissions/**'
+
 pr: none
+
 resources:
   repositories:
   - repository: 1ESPipelineTemplates
@@ -25,6 +33,7 @@ extends:
       os: windows
     customBuildTags:
     - ES365AIMigrationTooling
+
     stages:
     - stage: CopyArtifactFiles
       jobs:
@@ -42,7 +51,7 @@ extends:
             Contents: |
               **\permissions\** 
               **\sample-queries\**
-            TargetFolder: '$(build.artifactstagingdirectory)'
+            TargetFolder: '$(Build.ArtifactStagingDirectory)'
 
     - stage: DeployStaging
       condition: and(contains(variables['build.sourceBranch'], 'refs/heads/dev'), succeeded())
@@ -64,7 +73,7 @@ extends:
               - task: AzureFileCopy@6
                 displayName: 'Upload Sample Query files'
                 inputs:
-                  SourcePath: '$(build.artifactstagingdirectory)/drop/sample-queries/*'
+                  SourcePath: '$(Build.ArtifactStagingDirectory)/sample-queries/*'
                   azureSubscription: 'DevX PPE Content Managed Identity Connection'
                   Destination: AzureBlob
                   storage: devxapistppeeastus
@@ -73,7 +82,7 @@ extends:
               - task: AzureFileCopy@6
                 displayName: 'Upload Permission Description Files '
                 inputs:
-                  SourcePath: '$(build.artifactstagingdirectory)/drop/permissions/*'
+                  SourcePath: '$(Build.ArtifactStagingDirectory)/permissions/*'
                   azureSubscription: 'DevX PPE Content Managed Identity Connection'
                   Destination: AzureBlob
                   storage: devxapistppeeastus
@@ -88,6 +97,10 @@ extends:
         templateContext:
           type: releaseJob
           isProduction: true
+          inputs:
+          - input: pipelineArtifact
+            artifactName: drop
+            targetPath: $(Build.ArtifactStagingDirectory)
         environment: graphexplorerapi-production
         strategy:
           runOnce:
@@ -96,7 +109,7 @@ extends:
               - task: AzureFileCopy@6
                 displayName: 'Upload Sample Query files'
                 inputs:
-                  SourcePath: '$(build.artifactstagingdirectory)/drop/sample-queries/*'
+                  SourcePath: '$(Build.ArtifactStagingDirectory)/sample-queries/*'
                   azureSubscription: 'DevX Prod Content Managed Identity Connection'
                   Destination: AzureBlob
                   storage: devxapistprodeastus
@@ -105,7 +118,7 @@ extends:
               - task: AzureFileCopy@6
                 displayName: 'Upload Permission Description Files '
                 inputs:
-                  SourcePath: '$(build.artifactstagingdirectory)/drop/permissions/*'
+                  SourcePath: '$(Build.ArtifactStagingDirectory)/permissions/*'
                   azureSubscription: 'DevX Prod Content Managed Identity Connection'
                   Destination: AzureBlob
                   storage: devxapistprodeastus

From c82a09c5683ee4523a6404b68448c480c196106c Mon Sep 17 00:00:00 2001
From: "Michael Mainer (from Dev Box)"
 <8527305+MIchaelMainer@users.noreply.github.com>
Date: Tue, 29 Jul 2025 14:50:10 -0700
Subject: [PATCH 2/2] ci: add clarity, fix variable names per convention

---
 azure-pipelines/publishSamples.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines/publishSamples.yml b/azure-pipelines/publishSamples.yml
index bc415154..90420e31 100644
--- a/azure-pipelines/publishSamples.yml
+++ b/azure-pipelines/publishSamples.yml
@@ -54,10 +54,12 @@ extends:
             TargetFolder: '$(Build.ArtifactStagingDirectory)'
 
     - stage: DeployStaging
-      condition: and(contains(variables['build.sourceBranch'], 'refs/heads/dev'), succeeded())
+      condition: and(contains(variables['Build.SourceBranchName'], 'dev'), succeeded())
       dependsOn: CopyArtifactFiles
       jobs:
-      - deployment: staging  
+      - deployment: staging
+        displayName: 'Deploy to Staging'
+        environment: graphexplorerapi-staging
         templateContext:
           type: releaseJob
           isProduction: false
@@ -65,7 +67,6 @@ extends:
           - input: pipelineArtifact
             artifactName: drop
             targetPath: $(Build.ArtifactStagingDirectory)
-        environment: graphexplorerapi-staging
         strategy:
           runOnce:
             deploy:
@@ -90,10 +91,12 @@ extends:
 
 
     - stage: DeployProduction
-      condition: and(contains(variables['build.sourceBranch'], 'refs/heads/master'), succeeded())
+      condition: and(contains(variables['Build.SourceBranchName'], 'master'), succeeded())
       dependsOn: CopyArtifactFiles
       jobs:
       - deployment: production
+        displayName: 'Deploy to Production'
+        environment: graphexplorerapi-production
         templateContext:
           type: releaseJob
           isProduction: true
@@ -101,7 +104,6 @@ extends:
           - input: pipelineArtifact
             artifactName: drop
             targetPath: $(Build.ArtifactStagingDirectory)
-        environment: graphexplorerapi-production
         strategy:
           runOnce:
             deploy: