Merge branch 'dev'

DanGough · Aug 10, 2022 · d4878bf · d4878bf
2 parents cf17dde + 28578ab
commit d4878bf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/Nevergreen/Apps/Get-AdobeAcrobat.ps1 b/Nevergreen/Apps/Get-AdobeAcrobat.ps1
@@ -9,9 +9,9 @@ foreach ($Platform in $Platforms) {
     $SearchCount = 5
 
     do {
-        $ReleaseURL = Get-Link -Uri $ReleaseURL -MatchProperty outerHTML -Pattern '>Next' -PrefixParent
+        $ReleaseURL = Get-Link -Uri $ReleaseURL -Headers @{"accept-language"="en-GB,en;q=0.9,en-US;q=0.8"} -MatchProperty outerHTML -Pattern '>Next' -PrefixParent
 
-        $URL = Get-Link -Uri $ReleaseURL -MatchProperty href -Pattern $Platform.Pattern
+        $URL = Get-Link -Uri $ReleaseURL -Headers @{"accept-language"="en-GB,en;q=0.9,en-US;q=0.8"} -MatchProperty href -Pattern $Platform.Pattern
         if ($URL) {
             $Version = ($URL | Get-Version -Pattern '(\d{8,12}).+msp') -replace '(\d{2})(\d{3})(\d+)','$1.$2.$3'
             New-NevergreenApp -Name 'Adobe Acrobat' -Version $Version -Uri $URL -Architecture $Platform.Architecture -Language $Platform.Language -Type 'Msp'

diff --git a/Nevergreen/Apps/Get-AdobeAcrobatReader.ps1 b/Nevergreen/Apps/Get-AdobeAcrobatReader.ps1
@@ -10,9 +10,9 @@ foreach ($Platform in $Platforms) {
     $SearchCount = 5
 
     do {
-        $ReleaseURL = Get-Link -Uri $ReleaseURL -MatchProperty outerHTML -Pattern '>Next' -PrefixParent
+        $ReleaseURL = Get-Link -Uri $ReleaseURL -Headers @{"accept-language"="en-GB,en;q=0.9,en-US;q=0.8"} -MatchProperty outerHTML -Pattern '>Next' -PrefixParent
 
-        $URL = Get-Link -Uri $ReleaseURL -MatchProperty href -Pattern $Platform.Pattern
+        $URL = Get-Link -Uri $ReleaseURL -Headers @{"accept-language"="en-GB,en;q=0.9,en-US;q=0.8"} -MatchProperty href -Pattern $Platform.Pattern
         if ($URL) {
             $Version = ($URL | Get-Version -Pattern '(\d{8,12}).+msp') -replace '(\d{2})(\d{3})(\d+)','$1.$2.$3'
             New-NevergreenApp -Name 'Adobe Acrobat Reader' -Version $Version -Uri $URL -Architecture $Platform.Architecture -Language $Platform.Language -Type 'Msp'

diff --git a/Nevergreen/Private/Get-Link.ps1 b/Nevergreen/Private/Get-Link.ps1
@@ -65,6 +65,7 @@ function Get-Link {
         [Parameter(
             Mandatory = $false)]
         [String] $UserAgent,
+        [System.Collections.Hashtable] $Headers,
         [Switch] $PrefixDomain,
         [Switch] $PrefixParent
     )
@@ -83,6 +84,10 @@ function Get-Link {
         $ParamHash.UserAgent = $UserAgent
     }
 
+    if ($Headers) {
+        $ParamHash.Headers = $Headers
+    }
+
     try {
         $Response = Invoke-WebRequest @ParamHash
 

diff --git a/Nevergreen/Private/Resolve-Uri.ps1 b/Nevergreen/Private/Resolve-Uri.ps1
@@ -42,7 +42,8 @@ function Resolve-Uri {
         [Parameter(
             Mandatory = $false,
             Position = 1)]
-        [String] $UserAgent
+        [String] $UserAgent,
+        [System.Collections.Hashtable] $Headers
     )
 
     begin {
@@ -67,6 +68,10 @@ function Resolve-Uri {
                     $ParamHash.UserAgent = $UserAgent
                 }
 
+                if ($Headers) {
+                    $ParamHash.Headers = $Headers
+                }
+
                 $Response = Invoke-WebRequest @ParamHash
 
                 if ($IsCoreCLR) {