fiftyone.geolocation 4.3.1 → 4.3.6

package/ci/common-ci/scripts/modules/51DReleaseTestEnvModule/ReleaseVerifier.Tests.ps1

@@ -494,121 +494,366 @@ InModuleScope ReleaseVerifier {
 	}
 	
 	Describe 'Test-DotnetPackageDependencies' {
-		It 'all package dependencies are up to date with syntax `<PackageReference `/`>' {
-			$depRepo = "dependent-dotnet"
-			$repoName = "test-dotnet"
-			$repoConfigStr = @"
-			{
-				"version": "4.3.0",
-				"packageName": "test.dotnet",
-				"dependencies": [
-					"$depRepo"
-				]
-			}
-"@
-			$repoConfig = $repoConfigStr | ConvertFrom-Json
-			$reposStr = @"
-			{
-				"$repoName": $repoConfigStr,
-				"$depRepo": {
+		BeforeAll {
+			function Test-DotnetPackageDependenciesOnelineBase {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[string]$ConfigDepPackageName,
+					[string]$ActualDepPackageName,
+					[boolean]$ExpectedResult
+				)
+				$depRepo = "dependent-dotnet"
+				$repoName = "test-dotnet"
+				$repoConfigStr = @"
+				{
 					"version": "4.3.0",
-					"packageName": "dep.dotnet"
+					"packageName": "test.dotnet",
+					"dependencies": [
+						"$depRepo"
+					]
 				}
-			}
 "@
-			$repos = $reposStr | ConvertFrom-Json
-			
-			Mock Test-Path { return $true } `
-				-ModuleName ReleaseVerifier
-			Mock Get-ChildItem { return @($('{ "FullName": "file1" }' | ConvertFrom-Json)) } `
-				-ModuleName ReleaseVerifier
-			Mock Get-Content { return '<PackageReference Include="dep.dotnet" Version="4.3.0" />' } `
-				-ModuleName ReleaseVerifier
+				$repoConfig = $repoConfigStr | ConvertFrom-Json
+				$reposStr = @"
+				{
+					"$repoName": $repoConfigStr,
+					"$depRepo": {
+						"version": "$ExpectedVersion",
+						"packageName": "$ConfigDepPackageName"
+					}
+				}
+"@
+				$repos = $reposStr | ConvertFrom-Json
+				
+				Mock Test-Path { return $true } `
+					-ModuleName ReleaseVerifier
+				Mock Get-ChildItem { return @($('{ "FullName": "file1.csproj" }' | ConvertFrom-Json)) } `
+					-ModuleName ReleaseVerifier
+				Mock Get-Content { return "<PackageReference Include=`"$ActualDepPackageName)`" Version=`"$ActualVersion`" />" } `
+					-ModuleName ReleaseVerifier
+				
+				$result = Test-DotnetPackageDependencies `
+					-RepositoryName $repoName `
+					-RepositoryConfig $repoConfig `
+					-Repositories $repos
+				
+				$result | Should -BeExactly $ExpectedResult
+			}
 			
-			$result = Test-DotnetPackageDependencies `
-				-RepositoryName $repoName `
-				-RepositoryConfig $repoConfig `
-				-Repositories $repos
+			function Test-DotnetPackageDependenciesOneline {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[boolean]$ExpectedResult
+				)
+				Test-DotnetPackageDependenciesOnelineBase `
+					-ExpectedVersion $ExpectedVersion `
+					-ActualVersion $ActualVersion `
+					-ConfigDepPackageName "dep.dotnet" `
+					-ActualDepPackageName "dep.dotnet" `
+					-ExpectedResult $ExpectedResult
+			}
 			
-			$result | Should -BeExactly $true
-		}
-		
-		It 'all package dependencies are up to date  with syntax `<PackageReference`>`<`/PackageReference`>' {
-			$depRepo = "dependent-dotnet"
-			$repoName = "test-dotnet"
-			$repoConfigStr = @"
-			{
-				"version": "4.3.0",
-				"packageName": "test.dotnet",
-				"dependencies": [
-					"$depRepo"
-				]
+			function Test-DotnetPackageDependenciesOnelineRegex {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[boolean]$ExpectedResult
+				)
+				Test-DotnetPackageDependenciesOnelineBase `
+					-ExpectedVersion $ExpectedVersion `
+					-ActualVersion $ActualVersion `
+					-ConfigDepPackageName "dep.(dotnet|SomethingElse)" `
+					-ActualDepPackageName "dep.dotnet" `
+					-ExpectedResult $ExpectedResult
 			}
-"@
-			$repoConfig = $repoConfigStr | ConvertFrom-Json
-			$reposStr = @"
-			{
-				"$repoName": $repoConfigStr,
-				"$depRepo": {
+			
+			function Test-DotnetPackageDependenciesMultilinesBase {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[string]$ConfigDepPackageName,
+					[string]$ActualDepPackageName,
+					[boolean]$ExpectedResult
+				)
+				$depRepo = "dependent-dotnet"
+				$repoName = "test-dotnet"
+				$repoConfigStr = @"
+				{
 					"version": "4.3.0",
-					"packageName": "dep.dotnet"
+					"packageName": "test.dotnet",
+					"dependencies": [
+						"$depRepo"
+					]
 				}
-			}
 "@
-			$repos = $reposStr | ConvertFrom-Json
-			
-			Mock Test-Path { return $true } `
-				-ModuleName ReleaseVerifier
-			Mock Get-ChildItem { return @($('{ "FullName": "file1" }' | ConvertFrom-Json)) } `
-				-ModuleName ReleaseVerifier
-			Mock Get-Content { return "<PackageReference Include=`"dep.dotnet`">`r`n<Version>4.030</Version>`r`n</PackageReference>" } `
-				-ModuleName ReleaseVerifier
+				$repoConfig = $repoConfigStr | ConvertFrom-Json
+				$reposStr = @"
+				{
+					"$repoName": $repoConfigStr,
+					"$depRepo": {
+						"version": "$ExpectedVersion",
+						"packageName": "$ConfigDepPackageName"
+					}
+				}
+"@
+				$repos = $reposStr | ConvertFrom-Json
+				
+				Mock Test-Path { return $true } `
+					-ModuleName ReleaseVerifier
+				Mock Get-ChildItem { return @($('{ "FullName": "file1.csproj" }' | ConvertFrom-Json)) } `
+					-ModuleName ReleaseVerifier
+				Mock Get-Content { return "<PackageReference Include=`"$ActualDepPackageName`">`r`n<Version>$ActualVersion</Version>`r`n</PackageReference>" } `
+					-ModuleName ReleaseVerifier
+				
+				$result = Test-DotnetPackageDependencies `
+					-RepositoryName $repoName `
+					-RepositoryConfig $repoConfig `
+					-Repositories $repos
+				
+				$result | Should -BeExactly $ExpectedResult
+			}
 			
-			$result = Test-DotnetPackageDependencies `
-				-RepositoryName $repoName `
-				-RepositoryConfig $repoConfig `
-				-Repositories $repos
+			function Test-DotnetPackageDependenciesMultilines {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[boolean]$ExpectedResult
+				)
+				Test-DotnetPackageDependenciesMultilinesBase `
+					-ExpectedVersion $ExpectedVersion `
+					-ActualVersion $ActualVersion `
+					-ConfigDepPackageName "dep.dotnet" `
+					-ActualDepPackageName "dep.dotnet" `
+					-ExpectedResult $ExpectedResult
+			}
 			
-			$result | Should -BeExactly $true
-		}
-		
-		It 'a package dependency is not up to date' {
-			$depRepo = "dependent-dotnet"
-			$repoName = "test-dotnet"
-			$repoConfigStr = @"
-			{
-				"version": "4.3.0",
-				"packageName": "test.dotnet",
-				"dependencies": [
-					"$depRepo"
-				]
+			function Test-DotnetPackageDependenciesMultilinesRegex {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[boolean]$ExpectedResult
+				)
+				Test-DotnetPackageDependenciesMultilinesBase `
+					-ExpectedVersion $ExpectedVersion `
+					-ActualVersion $ActualVersion `
+					-ConfigDepPackageName "dep.(dotnet|SomethingElse)" `
+					-ActualDepPackageName "dep.dotnet" `
+					-ExpectedResult $ExpectedResult
 			}
-"@
-			$repoConfig = $repoConfigStr | ConvertFrom-Json
-			$reposStr = @"
-			{
-				"$repoName": $repoConfigStr,
-				"$depRepo": {
+			
+			function Test-DotnetPackageDependenciesNetFrameworkProjectBase {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[string]$ConfigDepPackageName,
+					[string]$ActualDepPackageName,
+					[boolean]$ExpectedResult
+				)
+				$depRepo = "dependent-dotnet"
+				$repoName = "test-dotnet"
+				$repoConfigStr = @"
+				{
 					"version": "4.3.0",
-					"packageName": "dep.dotnet"
+					"packageName": "test.dotnet",
+					"dependencies": [
+						"$depRepo"
+					]
 				}
-			}
 "@
-			$repos = $reposStr | ConvertFrom-Json
+				$repoConfig = $repoConfigStr | ConvertFrom-Json
+				$reposStr = @"
+				{
+					"$repoName": $repoConfigStr,
+					"$depRepo": {
+						"version": "$ExpectedVersion",
+						"packageName": "$ConfigDepPackageName"
+					}
+				}
+"@
+				$repos = $reposStr | ConvertFrom-Json
+				
+				Mock Test-Path { return $true } `
+					-ModuleName ReleaseVerifier
+				Mock Get-ChildItem { return @($('{ "FullName": "file1.csproj" }' | ConvertFrom-Json)) } `
+					-ModuleName ReleaseVerifier
+				Mock Get-Content { return "<HintPath>..\..\..\..\..\packages\$($ActualDepPackageName).test.$($ActualVersion)\lib\netstandard2.0\dep.dotnet.test.dll</HintPath>" } `
+					-ModuleName ReleaseVerifier
+				
+				$result = Test-DotnetPackageDependencies `
+					-RepositoryName $repoName `
+					-RepositoryConfig $repoConfig `
+					-Repositories $repos
+				
+				$result | Should -BeExactly $ExpectedResult
+			}
 			
-			Mock Test-Path { return $true } `
-				-ModuleName ReleaseVerifier
-			Mock Get-ChildItem { return @($('{ "FullName": "file1" }' | ConvertFrom-Json)) } `
-				-ModuleName ReleaseVerifier
-			Mock Get-Content { return '<PackageReference Include="dep.dotnet" Version="4.2.9" />' } `
-				-ModuleName ReleaseVerifier
+			function Test-DotnetPackageDependenciesNetFrameworkProject {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[boolean]$ExpectedResult
+				)
+				Test-DotnetPackageDependenciesNetFrameworkProjectBase `
+					-ExpectedVersion $ExpectedVersion `
+					-ActualVersion $ActualVersion `
+					-ConfigDepPackageName "dep.dotnet" `
+					-ActualDepPackageName "dep.dotnet" `
+					-ExpectedResult $ExpectedResult
+			}
 			
-			$result = Test-DotnetPackageDependencies `
-				-RepositoryName $repoName `
-				-RepositoryConfig $repoConfig `
-				-Repositories $repos
+			function Test-DotnetPackageDependenciesNetFrameworkProjectRegex {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[boolean]$ExpectedResult
+				)
+				Test-DotnetPackageDependenciesNetFrameworkProjectBase `
+					-ExpectedVersion $ExpectedVersion `
+					-ActualVersion $ActualVersion `
+					-ConfigDepPackageName "dep.(dotnet|SomethingElse)" `
+					-ActualDepPackageName "dep.dotnet" `
+					-ExpectedResult $ExpectedResult
+			}
 			
-			$result | Should -BeExactly $false
+			function Test-DotnetPackageDependenciesPackagesConfigBase {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[string]$ConfigDepPackageName,
+					[string]$ActualDepPackageName,
+					[boolean]$ExpectedResult
+				)
+				$depRepo = "dependent-dotnet"
+				$repoName = "test-dotnet"
+				$repoConfigStr = @"
+				{
+					"version": "4.3.0",
+					"packageName": "test.dotnet",
+					"dependencies": [
+						"$depRepo"
+					]
+				}
+"@
+				$repoConfig = $repoConfigStr | ConvertFrom-Json
+				$reposStr = @"
+				{
+					"$repoName": $repoConfigStr,
+					"$depRepo": {
+						"version": "$ExpectedVersion",
+						"packageName": "$ConfigDepPackageName"
+					}
+				}
+"@
+				$repos = $reposStr | ConvertFrom-Json
+				
+				Mock Test-Path { return $true } `
+					-ModuleName ReleaseVerifier
+				Mock Get-ChildItem { return @($('{ "FullName": "packages.config" }' | ConvertFrom-Json)) } `
+					-ModuleName ReleaseVerifier
+				Mock Get-Content { return "<package id=`"$($ActualDepPackageName).test`" version=`"$ActualVersion`" targetFramework=`"net472`" />" } `
+					-ModuleName ReleaseVerifier
+				
+				$result = Test-DotnetPackageDependencies `
+					-RepositoryName $repoName `
+					-RepositoryConfig $repoConfig `
+					-Repositories $repos
+				
+				$result | Should -BeExactly $ExpectedResult
+			}
+			
+			function Test-DotnetPackageDependenciesPackagesConfig {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[boolean]$ExpectedResult
+				)
+				Test-DotnetPackageDependenciesPackagesConfigBase `
+					-ExpectedVersion $ExpectedVersion `
+					-ActualVersion $ActualVersion `
+					-ConfigDepPackageName "dep.dotnet" `
+					-ActualDepPackageName "dep.dotnet" `
+					-ExpectedResult $ExpectedResult
+			}
+			
+			function Test-DotnetPackageDependenciesPackagesConfigRegex {
+				param (
+					[string]$ExpectedVersion,
+					[string]$ActualVersion,
+					[boolean]$ExpectedResult
+				)
+				Test-DotnetPackageDependenciesPackagesConfigBase `
+					-ExpectedVersion $ExpectedVersion `
+					-ActualVersion $ActualVersion `
+					-ConfigDepPackageName "dep.(dotnet|SomethingElse)" `
+					-ActualDepPackageName "dep.dotnet" `
+					-ExpectedResult $ExpectedResult
+			}
+		}
+
+		It 'all package dependencies are up to date with syntax `<PackageReference `/`>' {
+			Test-DotnetPackageDependenciesOneline -ExpectedVersion "4.3.0" -ActualVersion "4.3.0" -ExpectedResult $true
+		}
+		
+		It 'all package dependencies are up to date with syntax `<PackageReference `/`> with regex' {
+			Test-DotnetPackageDependenciesOnelineRegex -ExpectedVersion "4.3.0" -ActualVersion "4.3.0" -ExpectedResult $true
+		}
+		
+		It 'a package dependency is not up to date with syntax `<PackageReference `/`>' {
+			Test-DotnetPackageDependenciesOneline -ExpectedVersion "4.3.0" -ActualVersion "4.2.9" -ExpectedResult $false
+		}
+		
+		It 'a package dependency is not up to date with syntax `<PackageReference `/`> with regex' {
+			Test-DotnetPackageDependenciesOnelineRegex -ExpectedVersion "4.3.0" -ActualVersion "4.2.9" -ExpectedResult $false
+		}
+		
+		It 'all package dependencies are up to date  with syntax `<PackageReference`>`<`/PackageReference`>' {
+			Test-DotnetPackageDependenciesMultilines -ExpectedVersion "4.3.0" -ActualVersion "4.3.0" -ExpectedResult $true
+		}
+		
+		It 'all package dependencies are up to date  with syntax `<PackageReference`>`<`/PackageReference`> with regex' {
+			Test-DotnetPackageDependenciesMultilinesRegex -ExpectedVersion "4.3.0" -ActualVersion "4.3.0" -ExpectedResult $true
+		}
+		
+		It 'a package dependency is not up to date  with syntax `<PackageReference`>`<`/PackageReference`>' {
+			Test-DotnetPackageDependenciesMultilines -ExpectedVersion "4.3.0" -ActualVersion "4.2.9" -ExpectedResult $false
+		}
+		
+		It 'a package dependency is not up to date  with syntax `<PackageReference`>`<`/PackageReference`> with regex' {
+			Test-DotnetPackageDependenciesMultilinesRegex -ExpectedVersion "4.3.0" -ActualVersion "4.2.9" -ExpectedResult $false
+		}
+		
+		It 'all package dependencies are up to date  with dotnet framework .csproj syntax' {
+			Test-DotnetPackageDependenciesNetFrameworkProject -ExpectedVersion "4.3.0" -ActualVersion "4.3.0" -ExpectedResult $true
+		}
+		
+		It 'all package dependencies are up to date  with dotnet framework .csproj syntax with regex' {
+			Test-DotnetPackageDependenciesNetFrameworkProjectRegex -ExpectedVersion "4.3.0" -ActualVersion "4.3.0" -ExpectedResult $true
+		}
+		
+		It 'a package dependency is not up to date  with dotnet framework .csproj syntax' {
+			Test-DotnetPackageDependenciesNetFrameworkProject -ExpectedVersion "4.3.0" -ActualVersion "4.2.9" -ExpectedResult $false
+		}
+		
+		It 'a package dependency is not up to date  with dotnet framework .csproj syntax with regex' {
+			Test-DotnetPackageDependenciesNetFrameworkProjectRegex -ExpectedVersion "4.3.0" -ActualVersion "4.2.9" -ExpectedResult $false
+		}
+		
+		It 'all package dependencies are up to date with packages.config file' {
+			Test-DotnetPackageDependenciesPackagesConfig -ExpectedVersion "4.3.0" -ActualVersion "4.3.0" -ExpectedResult $true
+		}
+		
+		It 'all package dependencies are up to date with packages.config file with regex' {
+			Test-DotnetPackageDependenciesPackagesConfigRegex -ExpectedVersion "4.3.0" -ActualVersion "4.3.0" -ExpectedResult $true
+		}
+		
+		It 'a package dependency is not up to date with packages.config file' {
+			Test-DotnetPackageDependenciesPackagesConfig -ExpectedVersion "4.3.0" -ActualVersion "4.2.9" -ExpectedResult $false
+		}
+		
+		It 'a package dependency is not up to date with packages.config file with regex' {
+			Test-DotnetPackageDependenciesPackagesConfigRegex -ExpectedVersion "4.3.0" -ActualVersion "4.2.9" -ExpectedResult $false
 		}
 	}
 	

package/ci/common-ci/scripts/modules/51DReleaseTestEnvModule/ReleaseVerifier.psm1

@@ -116,7 +116,8 @@ function Test-DotnetPackageDependencies {
 			foreach ($dependency in $dependencies) {
 				$packageName = $Repositories."$dependency".packageName
 				if ([string]::IsNullOrEmpty($packageName)) { continue }
-				# This pattern has a match group name 'name'. That will be used to preserv the actual matched package name.
+				
+				# This pattern has a match group name 'name'. That will be used to preserve the actual matched package name.
 				$matchPattern = "\<PackageReference \s*Include=\`"(?<name>$packageName.*)\`" \s*Version=\`"(?<version>\d+\.\d+\.\d+)\`"\s*/\>"
 				if ($projFileContent -match "$matchPattern") {
 					Write-Host "# Version variable matches dependency $packageName."
@@ -127,7 +128,7 @@ function Test-DotnetPackageDependencies {
 					}
 				}
 				
-				# This pattern has a match group name 'name'. That will be used to preserv the actual matched package name.
+				# This pattern has a match group name 'name'. That will be used to preserve the actual matched package name.
 				$matchPattern = "(?<prefix>\<PackageReference \s*Include=\`"$packageName.*\`"\s*\>.*\r\n.*\<Version\>)(?<version>\d+\.\d+\.\d+)(?<suffix>\</Version\>.*\r\n.*\</PackageReference\>)"
 				if ($projFileContent -match "$matchPattern") {
 					Write-Host "# Version variable matches dependency $packageName."
@@ -137,6 +138,39 @@ function Test-DotnetPackageDependencies {
 						return $false
 					}
 				}
+				
+				# This pattern has a match group name 'name'. That will be used to preserve the actual matched package name.
+				$matchPattern = "(?<prefix>\<HintPath\>\s*.*$packageName.*)(?<version>\d+\.\d+\.\d+)(?<suffix>\\lib.*\<\/HintPath\>)"
+				if ($projFileContent -match "$matchPattern") {
+					Write-Host "# Version variable matches dependency $packageName."
+					$dependencyVersion = $Repositories."$dependency".version
+					if ($Matches['version'] -ne $dependencyVersion) {
+						Write-Host "# FAIL: Version '$($Matches['version'])' of $dependency does not match $dependencyVersion"
+						return $false
+					}
+				}
+			}
+		}
+		
+		# Test each packages.config file.
+		foreach ($project in $(Get-ChildItem -Filter packages.config -Recurse)) {
+			Write-Host "# Working on project $project"
+			$projFileContent = $(Get-Content $project.FullName -Raw)
+			# Test each packages.config file with dependency versions.
+			foreach ($dependency in $dependencies) {
+				$packageName = $Repositories."$dependency".packageName
+				if ([string]::IsNullOrEmpty($packageName)) { continue }
+				# This pattern has a match group name 'name'. That will be used to preserve the actual matched package name.
+				$matchPattern = "\<PackageReference \s*Include=\`"(?<name>$packageName.*)\`" \s*Version=\`"(?<version>\d+\.\d+\.\d+)\`"\s*/\>"
+				$matchPattern = "(?<prefix>\<package \s*id=\`"$packageName.*\`" \s*version=\`")(?<version>\d+\.\d+\.\d+)(?<suffix>\`"\s*targetFramework=\`".*\`"\s*/\>)"
+				if ($projFileContent -match "$matchPattern") {
+					Write-Host "# Version variable matches dependency $packageName."
+					$dependencyVersion = $Repositories."$dependency".version
+					if ($Matches['version'] -ne $dependencyVersion) {
+						Write-Host "# FAIL: Version '$($Matches['version'])' of $dependency does not match $dependencyVersion"
+						return $false
+					}
+				}
 			}
 		}
 	} else {

package/ci/common-ci/scripts/modules/51DReleaseTestEnvModule/SharedVariables.psm1

@@ -135,5 +135,5 @@ function Get-ReviewerId {
 }
 
 # When using this script locally uncomment and update the below environment accordingly.
-$env:SYSTEM_TEAMFOUNDATIONCOLLECTIONURI = "https://51degrees.visualstudio.com/DefaultCollection/"
-$env:SYSTEM_TEAMPROJECTID = "APIs%20Release%20Test%20Environment"
+# $env:SYSTEM_TEAMFOUNDATIONCOLLECTIONURI = "https://51degrees.visualstudio.com/DefaultCollection/"
+# $env:SYSTEM_TEAMPROJECTID = "APIs%20Release%20Test%20Environment"