fiftyone.geolocation 4.3.4 → 4.3.7

package/ci/build-and-test.yml

@@ -8,17 +8,17 @@ schedules:
     include:
     - develop
 
-# Include the shared variables
-variables:
-- template: shared-variables.yml
-- group: CIAutomation
-
 resources:
   repositories:
   - repository: ciTemplates # Id of the repository used to reference to in this script
     type: git
     name: common-ci # Name of the actual repository
 
+# Include the shared variables
+variables:
+- template: shared-variables.yml@ciTemplates
+- group: CIAutomation
+
 stages:
 - template: shared-build-and-test-platforms.yml
   parameters:

package/ci/common-ci/.github/labels.yml

@@ -22,6 +22,12 @@
 - name: "status: duplicate"
   description: This issue or pull request already exists
   color: cfd3d7
+- name: "status: awaiting external input"
+  description: This item is awaiting for external input
+  color: 6699ff
+- name: "status: will not fix"
+  description: This item will not be fixed
+  color: 6392fa
 - name: "status: released/4.3.0"
   description: This change was released in the specified version
   color: a8d131
@@ -66,3 +72,15 @@
 - name: "scheduled: 15th Dec 2021"
   description: This item has been scheduled for 15th Dec 2021 release
   color: 6ff076
+- name: "scheduled: 12th Jan 2022"
+  description: This item has been scheduled for 12th Jan 2022 release
+  color: 6ff076
+- name: "scheduled: 19th Jan 2022"
+  description: This item has been scheduled for 19th Jan 2022 release
+  color: 6ff076
+- name: "scheduled: 26th Jan 2022"
+  description: This item has been scheduled for 26th Jan 2022 release
+  color: 6ff076
+- name: "scheduled: 2nd Feb 2022"
+  description: This item has been scheduled for 2nd Feb 2022 release
+  color: 6ff076

package/ci/common-ci/.github/workflows/sync-labels.yml

@@ -26,6 +26,8 @@ jobs:
               51Degrees/device-detection-cxx
               51Degrees/device-detection-data
               51Degrees/device-detection-dotnet
+              51Degrees/device-detection-go
+              51Degrees/device-detection-examples-go
               51Degrees/device-detection-java
               51Degrees/device-detection-nginx
               51Degrees/device-detection-node

package/ci/common-ci/c/shared-variables.yml

@@ -0,0 +1,15 @@
+variables:
+# Target Microsoft Toolset versions. Can't use full extended name
+# as this is converted to environment variable and impact tools such as
+# CMake 
+- name: plfTsVer # Platform Toolset Version. 
+  value: 'v142'
+  # Visual Studio version. This should be consistent with platform toolset
+  # Used by Gyp where platform toolset version is not available to be set
+  # 2017 - v141
+  # 2019 - v142
+  # 2022 - v143
+- name: msvsVer
+  value: '2019'
+- name: winSDKVer # Windows SDK Version.
+  value: '10.0.19041.0'

package/ci/common-ci/create-tag.yml

@@ -25,12 +25,15 @@ stages:
       submodules: recursive
       persistCredentials: true
     
-    - task: gittools.gitversion.gitversion-task.GitVersion@5
-      displayName: 'Determine Version Number'
-      # Give this task a name so we can use the variables it sets later.
-      name: GitVersion
+    - task: gitversion/setup@0
+      displayName: Install GitVersion
       inputs:
-        preferBundledVersion: false
+        versionSpec: '5.x'
+    
+    - task: gitversion/execute@0
+      displayName: Determine Version
+      inputs:
+        useConfigFile: true
         configFilePath: '$(Build.SourcesDirectory)/GitVersion.yml'
     
     # Add a tag to the git repository with the version number.

package/ci/common-ci/java/shared-security-vulnerability-check.yml

@@ -0,0 +1,54 @@
+parameters:
+- name: imageName # Name of build image
+- name: dependencies # Stages that this stage depends on
+  type: object
+  default: []
+
+stages:
+- stage: 'SecurityCheck'
+  displayName: 'Security Vulnerability Check'
+  dependsOn: ${{ parameters.dependencies }}
+  
+  variables: 
+  - group: CIAutomation
+  
+  jobs:
+  - job: 'SecurityCheck'
+    displayName: 'Security Vulnerability Check'
+  
+    pool:
+      vmImage: ${{ parameters.imageName }}
+
+    steps:
+    - checkout: self
+      submodules: recursive
+      lfs: true
+      persistCredentials: true
+
+    - task: MavenAuthenticate@0
+      inputs:
+        artifactsFeeds: '$(InternalFeedName)'
+
+    # Perform a security vulnerability check on the dependencies
+    # using dependency-check-maven plugin
+    - bash: |
+        mvn dependency-check:aggregate -Pdependency-check -Dfetchrepository.id=$REPO_ID -Dfetchrepository.url=$REPO_URL
+      env:
+        REPO_ID: $(fetchrepository.id)
+        REPO_URL: $(fetchrepository.url)
+      displayName: 'Maven dependency check'
+
+    # Copy report to staging directory to be published
+    - task: CopyFiles@2
+      displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
+      inputs:
+        SourceFolder: '$(build.sourcesdirectory)'
+        Contents: 'target/dependency-check-report.html'
+        TargetFolder: '$(build.artifactstagingdirectory)'
+
+    # Publish dependency check report
+    - task: PublishBuildArtifacts@1
+      displayName: 'Publish Artifact: dependency-check-report'
+      inputs:
+        PathtoPublish: '$(build.artifactstagingdirectory)'
+        ArtifactName: dependency-check-report

package/ci/common-ci/release-config.json

@@ -1,18 +1,31 @@
 {
 	"repositories": {
 		"common-ci": {
-			"version": "4.3.25",
+			"version": "4.3.60",
 			"isLeaf": true
 		},
+		"device-detection-data": {
+			"version": "4.3.5",
+			"isLeaf": false
+		},
 		"device-detection-cxx": {
-			"version": "4.3.9",
+			"version": "4.3.16",
 			"isLeaf": false,
 			"dependencies": [
-				"common-ci"
+				"common-ci",
+				"device-detection-data"
 			]
 		},
+		"device-detection-go": {
+			"version": "4.3.5",
+			"isLeaf": false,
+			"dependencies": [
+				"common-ci",
+				"device-detection-cxx"
+			]
+		},		
 		"device-detection-varnish": {
-			"version": "4.3.2",
+			"version": "4.3.3",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
@@ -20,92 +33,79 @@
 			]
 		},
 		"device-detection-nginx": {
-			"version": "4.3.4",
+			"version": "4.3.5",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
 				"device-detection-cxx"
 			]
 		},
-		"device-detection-java": {
-			"version": "4.3.10",
-			"packageName": "pipeline.device-detection",
-			"versionVariableName": "devicedetection.version",
+		"pipeline-java": {
+			"version": "4.3.14",
+			"packageName": "pipeline",
+			"versionVariableName": "pipeline.version",
 			"isLeaf": false,
 			"dependencies": [
-				"common-ci",
-				"device-detection-cxx"
+				"common-ci"
 			]
 		},
 		"location-java": {
-		    "version": "4.3.6",
+		    "version": "4.3.12",
 			"packageName": "pipeline.geo-location",
 			"versionVariableName": "geolocation.version",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
+				"pipeline-java",
 				"device-detection-java"
 			]
 		},
-		"location-onpremise-java": {
-		    "version": "4.3.2",
-			"packageName": "geo-location.digitalelement",
-			"versionVariableName": "geolocation.digitalelement.version",
+		"device-detection-java": {
+			"version": "4.3.17",
+			"packageName": "pipeline.device-detection",
+			"versionVariableName": "devicedetection.version",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"location-java"
+				"device-detection-cxx",
+				"pipeline-java"
 			]
 		},
 		"pipeline-dotnet": {
-			"version": "4.3.8",
+			"version": "4.3.17",
 			"packageName": "FiftyOne.Pipeline",
 			"isLeaf": false,
 			"dependencies": [
-				"common-ci"
+				"common-ci",
+				"common-dotnet",
+				"caching-dotnet"
 			]
 		},
 		"location-dotnet": {
-		    "version": "4.3.8",
+		    "version": "4.3.12",
 			"packageName": "FiftyOne.Geolocation",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
+				"common-dotnet",
 				"pipeline-dotnet",
 				"device-detection-dotnet"
 			]
 		},
 		"device-detection-dotnet": {
-			"version": "4.3.10",
+			"version": "4.3.17",
 			"packageName": "FiftyOne.DeviceDetection",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
 				"device-detection-cxx",
+				"caching-dotnet",
+				"common-dotnet",
 				"pipeline-dotnet"
 			]
 		},
-		"entitlement-dotnet": {
-			"version": "4.1.16",
-			"isLeaf": false,
-			"dependencies": [
-				"common-ci",
-				"pipeline-dotnet"
-			]
-		},
-		"internal-engines-dotnet": {
-			"version": "4.3.5",
-			"packageName": "FiftyOne.GeoLocation.OnPremise",
-			"isLeaf": false,			
-			"dependencies": [
-				"common-ci",
-				"pipeline-dotnet",
-				"device-detection-dotnet",
-				"location-dotnet"
-			]
-		},
 		"pipeline-node": {
-			"version": "4.3.6",
+			"version": "4.3.8",
 			"packageName": "fiftyone.pipeline",
 			"isLeaf": false,
 			"dependencies": [
@@ -113,7 +113,7 @@
 			]
 		},
 		"location-node": {
-		    "version": "4.3.4",
+		    "version": "4.3.7",
 			"packageName": "fiftyone.geolocation",
 			"isLeaf": false,
 			"dependencies": [
@@ -123,7 +123,7 @@
 			]
 		},
 		"device-detection-node": {
-			"version": "4.3.6",
+			"version": "4.3.12",
 			"packageName": "fiftyone.devicedetection",
 			"isLeaf": false,
 			"dependencies": [
@@ -133,17 +133,18 @@
 			]
 		},
 		"device-detection-python": {
-			"version": "4.3.2",
+			"version": "4.3.5",
 			"packageName": "fiftyone_devicedetection",
 			"versionVariableName": "deviceDetectionVersion",
 			"isLeaf": false,
 			"dependencies": [
 				"common-ci",
-				"device-detection-cxx"
+				"device-detection-cxx",
+				"pipeline-python"
 			]
 		},
 		"pipeline-php-core": {
-			"version": "4.3.5",
+			"version": "4.3.6",
 			"packageName": "fiftyone.pipeline.core",
 			"isLeaf": false,
 			"dependencies": [
@@ -151,7 +152,7 @@
 			]
 		},
 		"pipeline-php-engines": {
-			"version": "4.3.4",
+			"version": "4.3.5",
 			"packageName": "fiftyone.pipeline.engines",
 			"isLeaf": false,
 			"dependencies": [
@@ -160,7 +161,7 @@
 			]
 		},
 		"pipeline-php-cloudrequestengine": {
-			"version": "4.3.5",
+			"version": "4.3.6",
 			"packageName": "fiftyone.pipeline.cloudrequestengine",
 			"isLeaf": false,
 			"dependencies": [
@@ -170,7 +171,7 @@
 			]
 		},
 		"location-php": {
-			"version": "4.3.4",
+			"version": "4.3.5",
 			"packageName": "fiftyone.geolocation",
 			"isLeaf": false,
 			"dependencies": [
@@ -182,7 +183,7 @@
 			]
 		},
 		"device-detection-php-onpremise": {
-			"version": "4.3.4",
+			"version": "4.3.10",
 			"packageName": "fiftyone.devicedetection",
 			"isLeaf": false,
 			"dependencies": [
@@ -193,7 +194,7 @@
 			]
 		},
 		"device-detection-php": {
-			"version": "4.3.4",
+			"version": "4.3.7",
 			"packageName": "fiftyone.devicedetection",
 			"isLeaf": false,
 			"dependencies": [
@@ -204,7 +205,7 @@
 			]
 		},
 		"pipeline-wordpress": {
-			"version": "1.0.2",
+			"version": "1.0.14",
 			"packageName": "fiftyonedegrees.wordpress",
 			"isLeaf": false,
 			"dependencies": [

package/ci/common-ci/scripts/modules/51DDownloadDataFileModule/51DDownloadDataFileModule.psm1

@@ -22,26 +22,50 @@ function Get-DataFile {
         [string]$fullFilePath
     )
     
+    Add-Type -AssemblyName System.Net.Http
+
     $webClient = New-Object System.Net.Http.HttpClient;
     $webClient.Timeout = New-TimeSpan -Seconds 240
     $url ="https://distributor.51degrees.com/api/v2/download?LicenseKeys=$($licenseKey)&Type=$($dataType)&Download=True&Product=$($product)"
     $start_time = Get-Date
+    $complete = $false
+    $tryCount = 0
 
-    # Get download stream
-    $stream = $webClient.GetStreamAsync($url)
-    $stream.ConfigureAwait($false) > $null
-    if ($null -ne $stream.Exception){ throw $stream.Exception }
-
-    # Save stream to path
-    try
-    {
-        $fileStream = [System.IO.File]::Create($fullFilePath)
-        $stream.Result.CopyTo($fileStream)
-    }
-    finally
+    DO
     {
-        if ($null -ne $fileStream){ $fileStream.Dispose() }
-        if (($null -ne $stream) -and ($stream.IsCompleted -eq $true)){ $stream.Dispose() }
+        $tryCount++;
+        Write-Host "Attempt: $tryCount"
+        
+        try
+        {
+            # Get download stream
+            $stream = $webClient.GetStreamAsync($url)
+            $stream.ConfigureAwait($false) > $null
+            if ($null -ne $stream.Exception){ throw $stream.Exception }
+
+            # Save stream to path
+            try
+            {
+                $fileStream = [System.IO.File]::Create($fullFilePath)
+                $stream.Result.CopyTo($fileStream)            
+                $complete = $true
+            }
+            finally
+            {
+                if ($null -ne $fileStream){ $fileStream.Dispose() }
+                if (($null -ne $stream) -and ($stream.IsCompleted -eq $true)){ $stream.Dispose() }
+            }
+        }
+        catch
+        {
+            Write-Host "# ERROR downloading data file:"
+            Write-Host $_
+        }        
+    } While (($complete -eq $false) -and ($tryCount -le 10))
+    
+    if($complete -eq $false)
+    {        
+		throw "# ERROR: Data file download failed after $tryCount attempts."
     }
 
     Write-Output "Time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)"

package/ci/common-ci/scripts/modules/51DGitModule/51DGitModule.psm1

@@ -18,80 +18,139 @@ $script:releaseConfig = $null
 $script:repositories = $null
 
 class GitHandler {
+	static [boolean]Clean () {
+		$output = $(git clean -f -d)
+		$exitCode = $LASTEXITCODE
+		[boolean]$rtnCode = $exitCode -eq 0
+		if (!$rtnCode) {
+			Write-Host $output
+			Write-Host "# WARNING: Could not clean current dir properly. Exit code $exitCode."
+		}
+		return $rtnCode
+	}
+
+	static [boolean]UpdateSubmodules() {
+		$output = $(git submodule update --init --recursive)
+		$exitCode = $LASTEXITCODE
+		[boolean]$rtnCode = $exitCode -eq 0
+		if (!$rtnCode) {
+			Write-Host $output
+			Write-Host "# WARNING: Could not update submodules recursively. Exit code $exitCode."
+		}
+		return $rtnCode
+	}
+	
 	static [boolean]Checkout ([string]$branchName) {
 		Write-Host "# Checkout $branchName"
-		git checkout "$branchName"
-		return $?
+		$output = $(git checkout "$branchName")
+		$exitCode = $LASTEXITCODE
+		[boolean]$rtnCode = $exitCode -eq 0
+		if (!$rtnCode) {
+			Write-Host $output
+			Write-Host "# ERROR: Failed to checkout '$branchName' recursively. Exit code $exitCode."
+			return $rtnCode
+		}
+
+		$rtnCode = [GitHandler]::UpdateSubmodules()
+		if (!$rtnCode) {
+			return $rtnCode
+		}
+
+		return [GitHandler]::Clean()
 	}
 	
 	static [boolean]CheckoutTrack ([string]$branchName) {
 		Write-Host "# Checkout track $branchName"
-		git checkout --track "$branchName"
-		return $?
+		$output = $(git checkout --track "$branchName")
+		$exitCode = $LASTEXITCODE
+		[boolean]$rtnCode = $exitCode -eq 0
+		if (!$rtnCode) {
+			Write-Host $output
+			Write-Host "# ERROR: Failed to checkout '$branchName' recursively. Exit code $exitCode."
+			return $rtnCode
+		}
+
+		$rtnCode = [GitHandler]::UpdateSubmodules()
+		if (!$rtnCode) {
+			return $rtnCode
+		}
+
+		return [GitHandler]::Clean()
 	}
 	
 	static [boolean]CheckoutNew ([string]$branchName) {
 		Write-Host "# Checkout New $branchName"
-		git checkout -b "$branchName"
-		return $?
+		$output = $(git checkout -b "$branchName")
+		return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
+		
 	}
 	
 	static [boolean]Pull () {
 		Write-Host "# Git pull"
-		git pull
-		return $?
+		$output = $(git pull)
+		return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
 	}
 	
 	static [boolean]FetchAllTags () {
 		Write-Host "# Fetch all tags"
 		# git -c http.extraheader="AUTHORIZATION: bearer $env:SYSTEM_ACCESSTOKEN" fetch --all --tags
-		git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" fetch --all --tags
-		return $?
+		$output = $(git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" fetch --all --tags)
+		return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
 	}
 	
 	static [boolean]Push ([string]$branchName) {
 		if ([string]::IsNullOrEmpty($branchName)) {
 			Write-Host "# Git Push $branchName to origin"
-			git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" push
+			$output = $(git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" push)
 		} else {
 			Write-Host "# Git Push"
-			git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" push origin "$branchName"
+			$output = $(git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" push origin "$branchName")
 		}
-		return $?
+		return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
 	}
 	
 	static [boolean]Commit ([string]$message) {
 		Write-Host "# Git commit"
-		git commit -m "$message"
-		return $?
+		$output = $(git commit -m "$message")
+		return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
 	}
 	
 	static [boolean]Config ([string]$email, [string]$name) {
 		Write-Host "# Git config email '$email' and name '$name'"
-		git config user.email "$email"
-		[boolean]$returnCode = $?
-		git config user.name "$name"
-		return $returnCode -and $?
+		$output = $(git config user.email "$email")
+		$rtnCode = [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
+
+		$output = $(git config user.name "$name")
+		return $rtnCode -and [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
 	}
 	
 	static [boolean]Add ([string]$path) {
 		Write-Host "# Git stage '$path'"
-		git add "$path"
-		return $?
+		$output = $(git add "$path")
+		return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
 	}
 	
 	static [boolean]CheckoutWithAuthorization ([string]$branchName) {
 		Write-Host "# Checkout with authorization $branchName"
 		# git -c http.extraheader="AUTHORIZATION: bearer $env:SYSTEM_ACCESSTOKEN" checkout "$branchName"
-		git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" checkout "$branchName"
-		return $?
+		$output = $(git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" checkout "$branchName")
+		return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
 	}
 	
 	static [boolean]Clone ([string]$url) {
 		Write-Host "# Clone $url"
 		# git -c http.extraheader="AUTHORIZATION: Bearer $env:SYSTEM_ACCESSTOKEN" clone "$url"
-		git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" clone "$url"
-		return $?
+		$output = $(git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" clone "$url")
+		return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
+	}
+	
+	static hidden [boolean]ProcessExitCode ([int]$exitCode, [string]$commandOutput) {
+		[boolean]$rtnCode = $exitCode -eq 0
+		if (!$rtnCode) {
+			Write-Host $commandOutput
+			Write-Host "WARNING: Failed with exit code $exitCode"
+		}
+		return $rtnCode
 	}
 }
 
@@ -577,11 +636,15 @@ function Update-SubmoduleReferences {
 	Write-Host "================"
 	foreach ($submodule in $(git config --file .gitmodules --name-only --get-regexp path)) {
 		Write-Host ""
-		Write-Host "# Process submodule path $submodulePath."
+		Write-Host "# Process submodule path $submodule."
 		$submodulePath = Find-SubmodulePath -GitSubmodulePath $submodule
 		if ($submodulePath -ne $null) {
 			Write-Host "# Path $submodulePath extracted."
 			Push-Location $submodulePath
+			if (!$?) {
+				Write-Host "# ERROR: Failed to navigate to submodule $submodulePath"
+				return $false
+			}
 			
 			# Get repo name
 			$subRepoName = Get-RepositoryName
@@ -592,7 +655,9 @@ function Update-SubmoduleReferences {
 			Write-Host "# Checking tag $targetTag"
 			
 			$tagUpdated = $false
-			if ($targetTag -ne $null) {
+			$targetSpecified = $null -ne $targetTag
+
+			if ($targetSpecified) {
 				# Get all tag
 				Write-Host "# Fetch all tags"
 				if (![GitHandler]::FetchAllTags()) {
@@ -628,18 +693,20 @@ function Update-SubmoduleReferences {
 			}
 			
 			Pop-Location
-			
-			# Exit if not all tags have been found.
-			if (!$tagUpdated) {
-				Write-Host "# ERROR: Failed to update Submodule $subRepoName to tag $targetTag."
-				return $false
-			}
-			
-			# Stage the submodule update
-			Write-Host "# Stage the submodule $submodulePath"
-			if (![GitHandler]::Add($submodulePath)) {
-				Write-Host "# ERROR: Failed to stage the submodule $subRepoName."
-				return $false
+						
+			if($targetSpecified) {
+				# Exit if not all tags have been found.
+				if (!$tagUpdated) {
+					Write-Host "# ERROR: Failed to update Submodule $subRepoName to tag $targetTag."
+					return $false
+				}
+
+				# Stage the submodule update
+				Write-Host "# Stage the submodule $submodulePath"
+				if (![GitHandler]::Add($submodulePath)) {
+					Write-Host "# ERROR: Failed to stage the submodule $subRepoName."
+					return $false
+				}
 			}
 		} else {
 			Write-Host "# ERROR: Failed to extract module path from $submodulePath"

package/ci/common-ci/shared-variables.yml

@@ -1,3 +1,7 @@
 variables:
+- name: windowsImage
+  value: 'windows-2019'
 - name: linuxImage
-  value: 'ubuntu-18.04'
+  value: 'ubuntu-18.04'
+- name: macImage
+  value: 'macOS-11'

package/ci/create-packages.yml

@@ -6,20 +6,20 @@ trigger:
 # Don't trigger for a pull request
 pr: none
 
+resources:
+  repositories:
+    - repository: ciTemplates # Id of the repository used to reference to in this script
+      type: git
+      name: common-ci # Name of the actual repository
+
 # Include shared variables
 variables:
-- template: shared-variables.yml
+- template: shared-variables.yml@ciTemplates
 - group: CIAutomation
 # Access token for the git repository. Used by the git tag task.
 - name: system_accesstoken
   value: $(System.AccessToken)
 
-resources:
-  repositories:
-    - repository: ciTemplates # Id of the repository used to reference to in this script
-      type: git
-      name: common-ci # Name of the actual repository
-
 stages:
 
 - stage: Publish

package/ci/deploy-external.yml

@@ -19,7 +19,7 @@ resources:
 
 # Include shared variables
 variables:
-- template: shared-variables.yml
+- template: shared-variables.yml@ciTemplates
 - name: targetBranch
   value: 'refs/heads/master'
 - group: CIAutomation

package/ci/deploy-internal.yml

@@ -19,7 +19,7 @@ resources:
 
 # Include shared variables
 variables:
-- template: shared-variables.yml
+- template: shared-variables.yml@ciTemplates
 - name: targetBranch
   value: 'refs/heads/master'
 - group: CIAutomation

package/ci/shared-variables.yml

@@ -1,7 +1 @@
-variables:
-- name: windowsImage
-  value: 'vs2017-win2016'
-- name: linuxImage
-  value: 'ubuntu-18.04'
-- name: macImage
-  value: 'macOS-10.14'
+# Shared variables between yaml files

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fiftyone.geolocation",
-  "version": "4.3.4",
+  "version": "4.3.7",
   "description": "Geo-location services for the 51Degrees Pipeline API",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -17,10 +17,10 @@
     "Joseph Dix <joseph@51degrees.com> (https://51degrees.com)"
   ],
   "dependencies": {
-    "fiftyone.pipeline.cloudrequestengine": "^4.3.6",
-    "fiftyone.pipeline.core": "^4.3.6",
-    "fiftyone.pipeline.engines": "^4.3.6",
-    "fiftyone.pipeline.engines.fiftyone": "^4.3.6"
+    "fiftyone.pipeline.cloudrequestengine": "^4.3.8",
+    "fiftyone.pipeline.core": "^4.3.8",
+    "fiftyone.pipeline.engines": "^4.3.8",
+    "fiftyone.pipeline.engines.fiftyone": "^4.3.8"
   },
   "devDependencies": {
     "@types/node": "^15.12.2",