From 34ea1d0440d0c8801081276b279d1b232f009a1b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 27 Apr 2021 23:03:17 +0300 Subject: [PATCH] [Windows] Return VS2017 SSDT extensions to the readme (#3270) --- .../win/scripts/ImageHelpers/InstallHelpers.ps1 | 2 +- .../SoftwareReport.VisualStudio.psm1 | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index ac55d9cf..4f15d41e 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -309,7 +309,7 @@ function Get-VSExtensionVersion if (-not $packageVersion) { - Write-Host "Installed package $packageName for Visual Studio 2019 was not found" + Write-Host "Installed package $packageName for Visual Studio was not found" exit 1 } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index 576a8e13..3f94b84c 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -35,8 +35,21 @@ function Get-VisualStudioExtensions { } } - # Wix + # SSDT extensions for VS2017 $vs = (Get-VisualStudioVersion).Name.Split()[-1] + if ($vs -eq "2017") + { + $analysisPackageVersion = Get-VSExtensionVersion -packageName '04a86fc2-dbd5-4222-848e-911638e487fe' + $reportingPackageVersion = Get-VSExtensionVersion -packageName '717ad572-c4b7-435c-c166-c2969777f718' + $integrationPackageName = Get-VSExtensionVersion -packageName 'd1b09713-c12e-43cc-9ef4-6562298285ab' + $ssdtPackages = @( + @{Package = 'SSDT Microsoft Analysis Services Projects'; Version = $analysisPackageVersion} + @{Package = 'SSDT SQL Server Integration Services Projects'; Version = $reportingPackageVersion} + @{Package = 'SSDT Microsoft Reporting Services Projects'; Version = $integrationPackageName} + ) + } + + # Wix $wixPackageVersion = Get-WixVersion $wixExtensionVersion = (Get-VisualStudioPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version @@ -46,6 +59,7 @@ function Get-VisualStudioExtensions { $extensions = @( $vsixs + $ssdtPackages @{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion} @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} @{Package = 'WIX Toolset'; Version = $wixPackageVersion}