chocolatey-visualstudio.extension: use channelUri from detected VS in…

…stance, if present GitHub-Issue: GH-7 GH-8 GH-10 GH-26
jberezanski · May 15, 2018 · 1eb4c2c · 1eb4c2c
1 parent 32bee83
commit 1eb4c2c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/chocolatey-visualstudio.extension/extensions/Get-VSBootstrapperUrlFromChannelManifest.ps1 b/chocolatey-visualstudio.extension/extensions/Get-VSBootstrapperUrlFromChannelManifest.ps1
@@ -26,6 +26,15 @@ function Get-VSBootstrapperUrlFromChannelManifest
         else
         {
             Write-Debug "Package parameters do not contain 'channelUri' or it is empty"
+            if ($ProductReference -ne $null -and -not [string]::IsNullOrEmpty($ProductReference.ChannelUri))
+            {
+                $manifestUri = $ProductReference.ChannelUri
+                Write-Debug "Using manifest URI from the provided ProductReference: '$manifestUri'"
+            }
+            else
+            {
+                Write-Debug "ProductReference has not been provided or does not contain the channel manifest URI"
+            }
         }
     }
 

diff --git a/chocolatey-visualstudio.extension/extensions/Get-VSProductReference.ps1 b/chocolatey-visualstudio.extension/extensions/Get-VSProductReference.ps1
@@ -17,6 +17,7 @@
 
     $props = @{
         ChannelId = $channelId
+        ChannelUri = $null
         ProductId = $productId
     }
 

diff --git a/chocolatey-visualstudio.extension/extensions/Get-WillowInstalledProducts.ps1 b/chocolatey-visualstudio.extension/extensions/Get-WillowInstalledProducts.ps1
@@ -19,6 +19,7 @@
         installationPath = 'installationPath'
         installationVersion = 'installationVersion'
         channelId = 'channelId'
+        channelUri = 'channelUri'
         productId = 'product"\s*:\s*{\s*"id'
         enginePath = 'enginePath'
     }

diff --git a/chocolatey-visualstudio.extension/extensions/New-VSProductReference.ps1 b/chocolatey-visualstudio.extension/extensions/New-VSProductReference.ps1
@@ -4,11 +4,13 @@ function New-VSProductReference
     Param
     (
         [Parameter(Mandatory = $true)] [string] $ChannelId,
-        [Parameter(Mandatory = $true)] [string] $ProductId
+        [Parameter(Mandatory = $true)] [string] $ProductId,
+        [string] $ChannelUri
     )
 
     $props = @{
         ChannelId = $ChannelId
+        ChannelUri = $ChannelUri
         ProductId = $ProductId
     }
 

diff --git a/chocolatey-visualstudio.extension/extensions/Start-VisualStudioModifyOperation.ps1 b/chocolatey-visualstudio.extension/extensions/Start-VisualStudioModifyOperation.ps1
@@ -194,7 +194,7 @@
 
             $argumentSet = $baseArgumentSet.Clone()
             $argumentSet['installPath'] = $productInfo.installationPath
-            $argumentSet['__internal_productReference'] = New-VSProductReference -ChannelId $productInfo.channelId -ProductId $productInfo.productid
+            $argumentSet['__internal_productReference'] = New-VSProductReference -ChannelId $productInfo.channelId -ProductId $productInfo.productid -ChannelUri $productInfo.channelUri
             $argumentSets += $argumentSet
         }
     }