From d929386a18b7b275c6fe751b514cd2773eb4e7c2 Mon Sep 17 00:00:00 2001
From: AlexanderGitin <102294679+AlexanderGitin@users.noreply.github.com>
Date: Wed, 1 Jun 2022 11:17:05 +0300
Subject: [PATCH] [Windows] Add Microsoft Reporting Services Projects support
 (#5485)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Windows] Add Microsoft Reporting Services Projects support

* Hardcode MSReport URL for VS2022

* Сhanged MSReport URL for VS2022
---
 images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 6 ++++++
 images/win/toolsets/toolset-2022.json              | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
index 6de28c6d..7d845621 100644
--- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1
+++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
@@ -239,6 +239,12 @@ function Get-VsixExtenstionFromMarketplace {
     $request -match 'Microsoft\.VisualStudio\.Services\.Payload\.FileName":"(?<filename>[^"]*)' | Out-Null
     $fileName = $Matches.filename
     $downloadUri = $assetUri + "/" + $fileName
+    # ProBITools.MicrosoftReportProjectsforVisualStudio2022 has different URL https://github.com/actions/virtual-environments/issues/5340
+    if ($ExtensionMarketPlaceName -eq "ProBITools.MicrosoftReportProjectsforVisualStudio2022")
+    {
+        $fileName = "Microsoft.DataTools.ReportingServices.vsix"
+        $downloadUri = "https://download.microsoft.com/download/b/b/5/bb57be7e-ae72-4fc0-b528-d0ec224997bd/Microsoft.DataTools.ReportingServices.vsix"
+    }
 
     return [PSCustomObject] @{
         "ExtensionName" = $extensionName
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index 6d384e7f..8a7e0bcf 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -266,7 +266,8 @@
         ],
         "vsix": [
             "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects",
-            "WixToolset.WixToolsetVisualStudio2022Extension"
+            "WixToolset.WixToolsetVisualStudio2022Extension",
+            "ProBITools.MicrosoftReportProjectsforVisualStudio2022"
         ]
     },
     "docker": {