Merge pull request #130 from bbtsoftware/feature/RevertInstallWithExt…

…ension Use Install-ChocolateyPackage
bbtsoftware · Jun 3, 2024 · 841b523 · 841b523
2 parents 7f50cff + fb5d0ce
commit 841b523
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/automatic/ssis-vs2022/ssis-vs2022.nuspec b/automatic/ssis-vs2022/ssis-vs2022.nuspec
@@ -28,7 +28,6 @@ This package has the following additional requirements:
     <tags>microsoft integration integration-services sql ssis ssis-vs2022 ssdt sql-server data-tools</tags>
     <dependencies>
       <dependency id="DotNet4.6-TargetPack" />
-      <dependency id="chocolatey-visualstudio.extension" version="1.11.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/automatic/ssis-vs2022/tools/ChocolateyInstall.ps1 b/automatic/ssis-vs2022/tools/ChocolateyInstall.ps1
@@ -1,7 +1,14 @@
 $ErrorActionPreference = 'Stop';
 
-Install-VisualStudioVsixExtension `
-    -PackageName 'ssis-vs2022'
-    -VsixUrl 'https://marketplace.visualstudio.com/_apis/public/gallery/publishers/SSIS/vsextensions/MicrosoftDataToolsIntegrationServices/1.4/vspackage'
-    -Checksum 'bc6ccc273d7695d2fe2b42c4c0c16b3a59a3f6212807604a7f93ae5733527a49'
-    -ChecksumType 'sha256'
+$packageArgs = @{
+    packageName   = $env:ChocolateyPackageName
+    softwareName  = 'Microsoft.DataTools.IntegrationServices*'
+    fileType      = 'exe'
+    silentArgs    = "/quiet /log `"$env:TEMP\$env:ChocolateyPackageName.$env:ChocolateyPackageVersion.log`""
+    validExitCodes= @(0)
+    url           = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/SSIS/vsextensions/MicrosoftDataToolsIntegrationServices/1.4/vspackage"
+    checksum      = "bc6ccc273d7695d2fe2b42c4c0c16b3a59a3f6212807604a7f93ae5733527a49"
+    checksumType  = "sha256"
+  }
+
+Install-ChocolateyPackage @packageArgs
diff --git a/automatic/ssis-vs2022/update.ps1 b/automatic/ssis-vs2022/update.ps1
@@ -10,9 +10,9 @@ function global:au_BeforeUpdate {
 function global:au_SearchReplace {
   @{
     'tools\ChocolateyInstall.ps1' = @{
-        "(\s*\-VsixUrl\s)'([^']+)'" = "`$1'$($Latest.URL32)'"
-        "(\s*\-Checksum\s)'([^']+)'" = "`$1'$($Latest.Checksum)'"
-        "(\s*\-ChecksumType\s)'([^']+)'" = "`$1'$($Latest.ChecksumType)'"
+        "(\s*url\s*=\s*)`"([^*]+)`""          = "`$1`"$($Latest.URL32)`""
+        "(\s*checksum\s*=\s*)`"([^*]+)`""     = "`$1`"$($Latest.Checksum)`""
+        "(\s*checksumType\s*=\s*)`"([^*]+)`"" = "`$1`"$($Latest.ChecksumType)`""
       }
   }
 }