Merge pull request #1585 from jenkins-infra/slide-patch-1

Add install of .NET 3.5
jenkins-infra · Dec 20, 2024 · b8d7f11 · b8d7f11
2 parents 7f37b7f + bfa8aed
commit b8d7f11
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/provisioning/windows-provision.ps1 b/provisioning/windows-provision.ps1
@@ -263,6 +263,11 @@ $downloads = [ordered]@{
             # Installation of make for Windows
             & "choco.exe" install make --yes --no-progress --limit-output --fail-on-error-output;
             & "choco.exe" install vagrant --yes --no-progress --limit-output --fail-on-error-output --version "${env:VAGRANT_VERSION}";
+            # install .NET 3.5 for MSI build
+            & "choco.exe" install dotnet3.5 --yes --no-progress --limit-output --fail-on-error-output
+            if(Test-Path "C:\Windows\Logs\DISM\dism.log") {
+                Get-Content "C:\Windows\Logs\DISM\dism.log"
+            }
             # Append a ".1" as all ruby packages in chocolatey have this suffix. Not sure why (maybe a package build id)
             & "choco.exe" install ruby --yes --no-progress --limit-output --fail-on-error-output --version "${env:RUBY_VERSION}.1";
             & "choco.exe" install packer --yes --no-progress --limit-output --fail-on-error-output --version "${env:PACKER_VERSION}";

diff --git a/tests/goss-windows.yaml b/tests/goss-windows.yaml
@@ -61,6 +61,11 @@ command:
     exit-status: 0
     stdout:
       - 2.4.3
+  dotnet35:
+    exec: pwsh -command "Test-Path -Path 'HKLM:\\SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v3.5'"
+    exit-status: 0
+    stdout:
+      - 'True'
 file:
   C:\Program Files\Chromium\Application\:
     contains: []