Check type before add-type and add trace log

Author: adityapatwardhan

src/dsc/psresourceget.ps1

@@ -228,13 +228,17 @@ function SatisfiesVersion {
         [string]$versionRange
     )
 
-    try {
-        Add-Type -Path "$PSScriptRoot/dependencies/NuGet.Versioning.dll" -ErrorAction Stop | Out-Null
+    $typeName = 'NuGet.Versioning.VersionRange'
+
+    if ($typeName -as [type]) {
+        Write-Trace -message "NuGet.Versioning assembly is already loaded. Using existing assembly." -level trace
     }
-    catch [System.IO.FileLoadException] {
-        Write-Trace -message "NuGet.Versioning assembly is already loaded. Continuing with existing assembly." -level trace
+    else {
+        Write-Trace -message "Loading NuGet.Versioning assembly from $PSScriptRoot/dependencies/NuGet.Versioning.dll" -level trace
+        Add-Type -Path "$PSScriptRoot/dependencies/NuGet.Versioning.dll" -ErrorAction Stop | Out-Null
     }
 
+
     try {
         $versionRangeObj = [NuGet.Versioning.VersionRange]::Parse($versionRange)
         $resourceVersion = [NuGet.Versioning.NuGetVersion]::Parse($version)
@@ -269,14 +273,7 @@ function ConvertInputToPSResource(
 
 # catch any un-caught exception and write it to the error stream
 trap {
-
-    if ($_.Exception.GetType().FullName -eq 'System.IO.FileLoadException') {
-        Write-Trace -message "NuGet.Versioning assembly is already loaded. Continuing with existing assembly, as all the versions have the functionality available." -level trace
-    }
-    else {
-        Write-Trace -Level Error -message $_.Exception.Message
-    }
-
+    Write-Trace -Level Error -message $_.Exception.Message
     exit 1
 }
 

test/DscResource/PSResourceGetDSCResource.Tests.ps1

@@ -103,7 +103,7 @@ Describe 'Repository Resource Tests' -Tags 'CI' {
 
         $resourceInput = $repoParams | ConvertTo-Json -Depth 5
 
-        $getResult = & $script:dscExe resource get --resource Microsoft.PowerShell.PSResourceGet/Repository --input $resourceInput -o json | ConvertFrom-Json
+        $getResult = & $script:dscExe -l trace resource get --resource Microsoft.PowerShell.PSResourceGet/Repository --input $resourceInput -o json | ConvertFrom-Json
 
         $getResult.actualState.name | Should -BeExactly 'TestRepo'
         $getResult.actualState.uri | Should -BeExactly 'https://www.doesnotexist.com/'