From 64189dc92613ce2d69146ab7b2d8fb572ba21c7f Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Tue, 26 Nov 2024 15:46:26 -0800
Subject: [PATCH 1/3] Add root directory parameter

---
 builds/azure-pipelines/build-pr.yml           |  5 ++-
 .../template-steps-build-test.yml             | 37 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/builds/azure-pipelines/build-pr.yml b/builds/azure-pipelines/build-pr.yml
index 53ea4f7a..5c9a0c62 100644
--- a/builds/azure-pipelines/build-pr.yml
+++ b/builds/azure-pipelines/build-pr.yml
@@ -33,6 +33,7 @@ stages:
         nugetVersion: '$(nugetVersion)'
         binariesVersion: '$(binariesVersion)'
         oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
+        rootDirectory: '$(Build.SourcesDirectory)'
   - job: Linux
     timeoutInMinutes: 90
     pool:
@@ -48,6 +49,7 @@ stages:
         nugetVersion: '$(nugetVersion)'
         binariesVersion: '$(binariesVersion)'
         oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
+        rootDirectory: '$(Build.SourcesDirectory)'
   - job: Windows
     timeoutInMinutes: 90
     pool:
@@ -62,4 +64,5 @@ stages:
         testServer: '(LocalDb)\MSSQLLocalDB'
         nugetVersion: '$(nugetVersion)'
         binariesVersion: '$(binariesVersion)'
-        oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
\ No newline at end of file
+        oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
+        rootDirectory: '$(Build.SourcesDirectory)'
\ No newline at end of file
diff --git a/builds/azure-pipelines/template-steps-build-test.yml b/builds/azure-pipelines/template-steps-build-test.yml
index 13250c0a..f27fab15 100644
--- a/builds/azure-pipelines/template-steps-build-test.yml
+++ b/builds/azure-pipelines/template-steps-build-test.yml
@@ -5,6 +5,7 @@ parameters:
   binariesVersion: ''
   testServer: ''
   oopWorkerSupportedExtensionVersion: ''
+  rootDirectory: ''
 
 steps:
 - task: UseDotNet@2
@@ -22,21 +23,21 @@ steps:
 - task: npmAuthenticate@0
   displayName: 'npm Authenticate for project'
   inputs:
-    workingFile: $(Build.SourcesDirectory)/.npmrc
+    workingFile: $(rootDirectory)/.npmrc
 
 - task: Npm@1
   displayName: 'Install Azure Functions Core Tools'
   inputs:
     command: 'custom'
-    customCommand: 'install azure-functions-core-tools --global --globalconfig $(Build.SourcesDirectory)/.npmrc --loglevel verbose'
-    workingDir: '$(Build.SourcesDirectory)'
+    customCommand: 'install azure-functions-core-tools --global --globalconfig $(rootDirectory)/.npmrc --loglevel verbose'
+    workingDir: '$(rootDirectory)'
 
 - task: Npm@1
   displayName: 'Install Azurite Local Storage Emulator'
   inputs:
     command: 'custom'
-    customCommand: 'install azurite --global --globalconfig $(Build.SourcesDirectory)/.npmrc --loglevel verbose'
-    workingDir: '$(Build.SourcesDirectory)'
+    customCommand: 'install azurite --global --globalconfig $(rootDirectory)/.npmrc --loglevel verbose'
+    workingDir: '$(rootDirectory)'
 
 # This step is necessary because npm installs to a non-traditional location on Windows hosted agents
 # For non-Windows agents we still want to ensure that we always get the correct location where the tools are installed
@@ -46,7 +47,7 @@ steps:
 
 - bash: echo "##vso[task.setvariable variable=azureFunctionsExtensionBundlePath]$(func GetExtensionBundlePath)"
   displayName: 'Set Azure Functions extension bundle path'
-  workingDirectory: $(Build.SourcesDirectory)/samples/samples-js
+  workingDirectory: $(rootDirectory)/samples/samples-js
 
 - task: DockerInstaller@0
   displayName: Docker Installer
@@ -73,17 +74,17 @@ steps:
   displayName: Set logging level
   condition: and(succeeded(), ne(variables['AFSQLEXT_TEST_LOGLEVEL'], ''))
 
-  
+
 - script: |
-    npm install --userconfig $(Build.SourcesDirectory)/.npmrc --loglevel verbose
+    npm install --userconfig $(rootDirectory)/.npmrc --loglevel verbose
     npm run lint
-  workingDirectory: $(Build.SourcesDirectory)/samples/samples-js
+  workingDirectory: $(rootDirectory)/samples/samples-js
   displayName: Lint samples-js
 
 - script: |
-    npm install --userconfig $(Build.SourcesDirectory)/.npmrc --loglevel verbose
+    npm install --userconfig $(rootDirectory)/.npmrc --loglevel verbose
     npm run lint
-  workingDirectory: $(Build.SourcesDirectory)/test/Integration/test-js
+  workingDirectory: $(rootDirectory)/test/Integration/test-js
   displayName: Lint test-js
 
 - task: UsePythonVersion@0
@@ -96,12 +97,12 @@ steps:
     pip3 install "pylint<3.0"
     pip3 install pylintfileheader
     pylint --recursive=yes .
-  workingDirectory: $(Build.SourcesDirectory)/samples/samples-python
+  workingDirectory: $(rootDirectory)/samples/samples-python
   displayName: Lint samples-python
 
 - script: |
     pip3 install -r requirements.txt
-  workingDirectory: $(Build.SourcesDirectory)/samples/samples-python
+  workingDirectory: $(rootDirectory)/samples/samples-python
   displayName: Install samples-python dependencies
 
 - task: Maven@4
@@ -130,7 +131,7 @@ steps:
   inputs:
     command: custom
     custom: nuget
-    arguments: add source -n afsqlext.local $(Build.SourcesDirectory)/local-packages
+    arguments: add source -n afsqlext.local $(rootDirectory)/local-packages
     workingDirectory: $(Agent.WorkFolder)
 
 - task: DotNetCoreCLI@2
@@ -144,15 +145,15 @@ steps:
 - task: CopyFiles@2
   displayName: 'Copy local Sql package to local-packages folder'
   inputs:
-    sourceFolder: $(Build.SourcesDirectory)/src/bin/${{ parameters.configuration }}
+    sourceFolder: $(rootDirectory)/src/bin/${{ parameters.configuration }}
     contents: '*.nupkg'
-    targetFolder: $(Build.SourcesDirectory)/local-packages
+    targetFolder: $(rootDirectory)/local-packages
     overWrite: true
 
 - task: CopyFiles@2
   displayName: 'Copy Sql extension dll to Azure Functions extension bundle'
   inputs:
-    sourceFolder: $(Build.SourcesDirectory)/src/bin/${{ parameters.configuration }}/netstandard2.0
+    sourceFolder: $(rootDirectory)/src/bin/${{ parameters.configuration }}/netstandard2.0
     contents: Microsoft.Azure.WebJobs.Extensions.Sql.dll
     targetFolder: $(azureFunctionsExtensionBundlePath)/bin
     overWrite: true
@@ -182,7 +183,7 @@ steps:
     projects: '${{ parameters.solution }}'
     # Skip any non .NET In-Proc integration tests. Otherwise, the following error will be thrown:
     # System.InvalidOperationException : No data found for Microsoft.Azure.WebJobs.Extensions.Sql.Tests.Integration.SqlOutputBindingIntegrationTests.NoPropertiesThrows
-    arguments: --configuration ${{ parameters.configuration }} --filter "FullyQualifiedName!~NoPropertiesThrows & FullyQualifiedName!~AddProductWithSlashInColumnName" --collect "Code Coverage" -s $(Build.SourcesDirectory)/test/coverage.runsettings --no-build
+    arguments: --configuration ${{ parameters.configuration }} --filter "FullyQualifiedName!~NoPropertiesThrows & FullyQualifiedName!~AddProductWithSlashInColumnName" --collect "Code Coverage" -s $(rootDirectory)/test/coverage.runsettings --no-build
   condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Windows_NT'))
 
 - task: DotNetCoreCLI@2

From 98be7232b672cbc4c9c288974e67b8a7d8a43303 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Tue, 26 Nov 2024 16:01:48 -0800
Subject: [PATCH 2/3] use subdirectory

---
 builds/azure-pipelines/build-pr.yml           |  2 --
 .../template-steps-build-test.yml             | 36 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/builds/azure-pipelines/build-pr.yml b/builds/azure-pipelines/build-pr.yml
index 5c9a0c62..7166cf01 100644
--- a/builds/azure-pipelines/build-pr.yml
+++ b/builds/azure-pipelines/build-pr.yml
@@ -33,7 +33,6 @@ stages:
         nugetVersion: '$(nugetVersion)'
         binariesVersion: '$(binariesVersion)'
         oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
-        rootDirectory: '$(Build.SourcesDirectory)'
   - job: Linux
     timeoutInMinutes: 90
     pool:
@@ -49,7 +48,6 @@ stages:
         nugetVersion: '$(nugetVersion)'
         binariesVersion: '$(binariesVersion)'
         oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
-        rootDirectory: '$(Build.SourcesDirectory)'
   - job: Windows
     timeoutInMinutes: 90
     pool:
diff --git a/builds/azure-pipelines/template-steps-build-test.yml b/builds/azure-pipelines/template-steps-build-test.yml
index f27fab15..79d1a83d 100644
--- a/builds/azure-pipelines/template-steps-build-test.yml
+++ b/builds/azure-pipelines/template-steps-build-test.yml
@@ -5,7 +5,7 @@ parameters:
   binariesVersion: ''
   testServer: ''
   oopWorkerSupportedExtensionVersion: ''
-  rootDirectory: ''
+  sourcesSubdirectory: ''
 
 steps:
 - task: UseDotNet@2
@@ -23,21 +23,21 @@ steps:
 - task: npmAuthenticate@0
   displayName: 'npm Authenticate for project'
   inputs:
-    workingFile: $(rootDirectory)/.npmrc
+    workingFile: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc
 
 - task: Npm@1
   displayName: 'Install Azure Functions Core Tools'
   inputs:
     command: 'custom'
-    customCommand: 'install azure-functions-core-tools --global --globalconfig $(rootDirectory)/.npmrc --loglevel verbose'
-    workingDir: '$(rootDirectory)'
+    customCommand: 'install azure-functions-core-tools --global --globalconfig $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc --loglevel verbose'
+    workingDir: '$(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}'
 
 - task: Npm@1
   displayName: 'Install Azurite Local Storage Emulator'
   inputs:
     command: 'custom'
-    customCommand: 'install azurite --global --globalconfig $(rootDirectory)/.npmrc --loglevel verbose'
-    workingDir: '$(rootDirectory)'
+    customCommand: 'install azurite --global --globalconfig $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc --loglevel verbose'
+    workingDir: '$(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}'
 
 # This step is necessary because npm installs to a non-traditional location on Windows hosted agents
 # For non-Windows agents we still want to ensure that we always get the correct location where the tools are installed
@@ -47,7 +47,7 @@ steps:
 
 - bash: echo "##vso[task.setvariable variable=azureFunctionsExtensionBundlePath]$(func GetExtensionBundlePath)"
   displayName: 'Set Azure Functions extension bundle path'
-  workingDirectory: $(rootDirectory)/samples/samples-js
+  workingDirectory: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/samples/samples-js
 
 - task: DockerInstaller@0
   displayName: Docker Installer
@@ -76,15 +76,15 @@ steps:
 
 
 - script: |
-    npm install --userconfig $(rootDirectory)/.npmrc --loglevel verbose
+    npm install --userconfig $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc --loglevel verbose
     npm run lint
-  workingDirectory: $(rootDirectory)/samples/samples-js
+  workingDirectory: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/samples/samples-js
   displayName: Lint samples-js
 
 - script: |
-    npm install --userconfig $(rootDirectory)/.npmrc --loglevel verbose
+    npm install --userconfig $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc --loglevel verbose
     npm run lint
-  workingDirectory: $(rootDirectory)/test/Integration/test-js
+  workingDirectory: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/test/Integration/test-js
   displayName: Lint test-js
 
 - task: UsePythonVersion@0
@@ -97,12 +97,12 @@ steps:
     pip3 install "pylint<3.0"
     pip3 install pylintfileheader
     pylint --recursive=yes .
-  workingDirectory: $(rootDirectory)/samples/samples-python
+  workingDirectory: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/samples/samples-python
   displayName: Lint samples-python
 
 - script: |
     pip3 install -r requirements.txt
-  workingDirectory: $(rootDirectory)/samples/samples-python
+  workingDirectory: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/samples/samples-python
   displayName: Install samples-python dependencies
 
 - task: Maven@4
@@ -131,7 +131,7 @@ steps:
   inputs:
     command: custom
     custom: nuget
-    arguments: add source -n afsqlext.local $(rootDirectory)/local-packages
+    arguments: add source -n afsqlext.local $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/local-packages
     workingDirectory: $(Agent.WorkFolder)
 
 - task: DotNetCoreCLI@2
@@ -145,15 +145,15 @@ steps:
 - task: CopyFiles@2
   displayName: 'Copy local Sql package to local-packages folder'
   inputs:
-    sourceFolder: $(rootDirectory)/src/bin/${{ parameters.configuration }}
+    sourceFolder: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/src/bin/${{ parameters.configuration }}
     contents: '*.nupkg'
-    targetFolder: $(rootDirectory)/local-packages
+    targetFolder: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/local-packages
     overWrite: true
 
 - task: CopyFiles@2
   displayName: 'Copy Sql extension dll to Azure Functions extension bundle'
   inputs:
-    sourceFolder: $(rootDirectory)/src/bin/${{ parameters.configuration }}/netstandard2.0
+    sourceFolder: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/src/bin/${{ parameters.configuration }}/netstandard2.0
     contents: Microsoft.Azure.WebJobs.Extensions.Sql.dll
     targetFolder: $(azureFunctionsExtensionBundlePath)/bin
     overWrite: true
@@ -183,7 +183,7 @@ steps:
     projects: '${{ parameters.solution }}'
     # Skip any non .NET In-Proc integration tests. Otherwise, the following error will be thrown:
     # System.InvalidOperationException : No data found for Microsoft.Azure.WebJobs.Extensions.Sql.Tests.Integration.SqlOutputBindingIntegrationTests.NoPropertiesThrows
-    arguments: --configuration ${{ parameters.configuration }} --filter "FullyQualifiedName!~NoPropertiesThrows & FullyQualifiedName!~AddProductWithSlashInColumnName" --collect "Code Coverage" -s $(rootDirectory)/test/coverage.runsettings --no-build
+    arguments: --configuration ${{ parameters.configuration }} --filter "FullyQualifiedName!~NoPropertiesThrows & FullyQualifiedName!~AddProductWithSlashInColumnName" --collect "Code Coverage" -s $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/test/coverage.runsettings --no-build
   condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Windows_NT'))
 
 - task: DotNetCoreCLI@2

From c72d32fab1f5d4a84a1d70a64a942b5c9aa7b8c2 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Tue, 26 Nov 2024 16:23:52 -0800
Subject: [PATCH 3/3] Fully qualify pom.xml

---
 builds/azure-pipelines/build-pr.yml                  | 3 +--
 builds/azure-pipelines/template-steps-build-test.yml | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/builds/azure-pipelines/build-pr.yml b/builds/azure-pipelines/build-pr.yml
index 7166cf01..53ea4f7a 100644
--- a/builds/azure-pipelines/build-pr.yml
+++ b/builds/azure-pipelines/build-pr.yml
@@ -62,5 +62,4 @@ stages:
         testServer: '(LocalDb)\MSSQLLocalDB'
         nugetVersion: '$(nugetVersion)'
         binariesVersion: '$(binariesVersion)'
-        oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
-        rootDirectory: '$(Build.SourcesDirectory)'
\ No newline at end of file
+        oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
\ No newline at end of file
diff --git a/builds/azure-pipelines/template-steps-build-test.yml b/builds/azure-pipelines/template-steps-build-test.yml
index 79d1a83d..8585b686 100644
--- a/builds/azure-pipelines/template-steps-build-test.yml
+++ b/builds/azure-pipelines/template-steps-build-test.yml
@@ -108,7 +108,7 @@ steps:
 - task: Maven@4
   displayName: Build Java Samples
   inputs:
-    mavenPomFile: samples/samples-java/pom.xml
+    mavenPomFile: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/samples/samples-java/pom.xml
     # batch-mode and Slf4jMavenTransferListener definition are used to make the build logging verbose
     # update-snapshot forces a check for updated library dependencies
     options: --batch-mode --define=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --update-snapshots
@@ -117,7 +117,7 @@ steps:
 - task: Maven@4
   displayName: Build Java Tests
   inputs:
-    mavenPomFile: test/Integration/test-java/pom.xml
+    mavenPomFile: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/test/Integration/test-java/pom.xml
     # batch-mode and Slf4jMavenTransferListener definition are used to make the build logging verbose
     # update-snapshot forces a check for updated library dependencies
     options: --batch-mode --define=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --update-snapshots