add Microsoft.Internal.AntiSSRF.dll (#3742)

Co-authored-by: freddydk <freddydk@users.noreply.github.com>
microsoft · Oct 30, 2024 · 6368e20 · 6368e20
1 parent 93ac2eb
commit 6368e20
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/AppHandling/PsTestFunctions.ps1 b/AppHandling/PsTestFunctions.ps1
@@ -6,9 +6,14 @@
     [string] $clientContextScriptPath = $null
 )
 
+$antiSSRFdll = Join-Path ([System.IO.Path]::GetDirectoryName($clientDllPath)) 'Microsoft.Internal.AntiSSRF.dll'
+
 # Load DLL's
-Add-type -Path $clientDllPath
 Add-type -Path $newtonSoftDllPath
+if (Test-Path $antiSSRFdll) {
+    Add-Type -Path $antiSSRFdll
+}
+Add-type -Path $clientDllPath
 
 if (!($clientContextScriptPath)) {
     $clientContextScriptPath = Join-Path $PSScriptRoot "ClientContext.ps1"

diff --git a/AppHandling/Run-ConnectionTestToNavContainer.ps1 b/AppHandling/Run-ConnectionTestToNavContainer.ps1
@@ -151,6 +151,10 @@ try {
             $clientDllPath = "C:\Test Assemblies\Microsoft.Dynamics.Framework.UI.Client.dll"
             if (!(Test-Path $myClientDllPath)) {
                 Copy-Item -Path $clientDllPath -Destination $myClientDllPath
+                $antiSSRFdll = Join-Path ([System.IO.Path]::GetDirectoryName($clientDllPath)) 'Microsoft.Internal.AntiSSRF.dll'
+                if (Test-Path $antiSSRFdll) {
+                    Copy-Item -Path $antiSSRFdll -Destination ([System.IO.Path]::GetDirectoryName($myClientDllPath))
+                }
             }
         } -argumentList $newtonSoftDllPath, $clientDllPath
 

diff --git a/AppHandling/Run-TestsInNavContainer.ps1 b/AppHandling/Run-TestsInNavContainer.ps1
@@ -328,6 +328,10 @@ try {
                             $clientDllPath = "C:\Test Assemblies\Microsoft.Dynamics.Framework.UI.Client.dll"
                             if (!(Test-Path $myClientDllPath)) {
                                 Copy-Item -Path $clientDllPath -Destination $myClientDllPath
+                                $antiSSRFdll = Join-Path ([System.IO.Path]::GetDirectoryName($clientDllPath)) 'Microsoft.Internal.AntiSSRF.dll'
+                                if (Test-Path $antiSSRFdll) {
+                                    Copy-Item -Path $antiSSRFdll -Destination ([System.IO.Path]::GetDirectoryName($myClientDllPath))
+                                }
                             }
                         } -argumentList $newtonSoftDllPath, $clientDllPath
                     }

diff --git a/HelperFunctions.ps1 b/HelperFunctions.ps1
@@ -912,6 +912,10 @@ Function CreatePsTestToolFolder {
         if (!(Test-Path $myClientDllPath)) {
             $clientDllPath = "C:\Test Assemblies\Microsoft.Dynamics.Framework.UI.Client.dll"
             Copy-Item -Path $clientDllPath -Destination $myClientDllPath
+            $antiSSRFdll = Join-Path ([System.IO.Path]::GetDirectoryName($clientDllPath)) 'Microsoft.Internal.AntiSSRF.dll'
+            if (Test-Path $antiSSRFdll) {
+                Copy-Item -Path $antiSSRFdll -Destination ([System.IO.Path]::GetDirectoryName($myClientDllPath))
+            }
         }
     } -argumentList (Get-BcContainerPath -containerName $containerName -Path $newtonSoftDllPath), (Get-BcContainerPath -containerName $containerName -Path $clientDllPath)
 }