Only install vs2022 on newer windows

Include msvs_2022 Include msvs_2022 restore vs2017 params Update checksum for new vs2022 layout include dll registration for vs2022 layout install Fix MSVS_2022 logs Fix tags Fix DLL Registration Ensure install check is run Run check Fix installation logic Fix vs2022 check Fix conditionals
adoptium · Sep 10, 2023 · 492d8a8 · 492d8a8
1 parent a845640
commit 492d8a8
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 16 deletions.
diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
@@ -73,6 +73,8 @@
       when: ansible_architecture == "64-bit"
     - role: MSVS_2019                   # OpenJ9
       tags: MSVS_2019
+    - role: MSVS_2022                   # OpenJ9
+      tags: MSVS_2022
     - NVidia_Cuda_Toolkit         # OpenJ9
     - NTP_TIME
     - Clang_64bit                 # OpenJ9

diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2017/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2017/tasks/main.yml
@@ -21,7 +21,7 @@
   tags: MSVS_2017
 
 - name: Install Visual Studio Community 2017
-  win_shell: 'C:\temp\vs_community.exe --wait --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --includeOptional --quiet --norestart'
+  win_shell: 'C:\temp\vs_community.exe --wait --add Microsoft.VisualStudio.Workload.NativeDesktop;includeRecommended;includeOptional --quiet --norestart'
   args:
     executable: cmd
   when: (not vs2017_installed.stat.exists)

diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022/tasks/main.yml
@@ -3,18 +3,23 @@
 # Visual Studio Community 2022 #
 ################################
 
+- name: Check the Windows version
+  win_shell: |
+    Get-WmiObject -Class Win32_OperatingSystem | Select-Object -ExpandProperty Version
+  register: windows_version
+
 - name: Test if VS 2022 is installed
   win_stat:
     path: 'C:\Program Files\Microsoft Visual Studio\2022\Community'
   register: vs2022_installed
-  tags: adoptopenjdk
+  when: windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)')
 
 - name: Transfer VS2022 Layout File
   win_copy:
     src: /Vendor_Files/windows/vs_layout_2022.zip
     dest: C:\TEMP\VS2022_Layout.zip
     remote_src: no
-  when: (not vs2022_installed.stat.exists)
+  when: (not vs2022_installed.stat.exists) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
   failed_when: false
   tags: adoptopenjdk
 
@@ -23,20 +28,23 @@
   win_stat:
     path: 'C:\TEMP\VS2022_Layout.zip'
   register: vs2022_layout_ready
+  when: windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)')
   tags: adoptopenjdk
 
 - name: Get SHA256 checksum of the file
   win_shell: |
     $filePath = "C:\TEMP\VS2022_Layout.zip"
-    $expectedChecksum = "7BEBEF0A67E01FA3DF718D019DE58C47FF24DF1A24CCE3DE5B1DD9E302C04F43"
-
+    $expectedChecksum = "29567E33B5361E4BAD36DFDFF83FEB3DDFDF0518122237E8273F0FA4E11E8B74"
     $actualChecksum = Get-FileHash -Path $filePath -Algorithm SHA256 | Select-Object -ExpandProperty Hash
 
     if ($actualChecksum -ne $expectedChecksum) {
         Write-Output "Checksum mismatch"
+        Write-Output "Actual Checksum: $actualChecksum"
+        Write-Output "Expect Checksum: $expectedChecksum"
         exit 1
     }
   register: checksum_result
+  when: (vs2022_layout_ready.stat.exists ) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
   changed_when: false
   tags: adoptopenjdk
 
@@ -53,36 +61,44 @@
   win_unzip:
     src: C:\TEMP\VS2022_Layout.zip
     dest: C:\TEMP
-  when: (vs2022_layout_ready.stat.exists) and (not vs2022_installed.stat.exists)
+  when: (vs2022_layout_ready.stat.exists) and (not vs2022_installed.stat.exists) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
   tags: adoptopenjdk
 
 - name: Run Visual Studio 2022 Installer From Layout
   win_shell: |
       Start-Process -Wait -FilePath 'C:\temp\VSLayout2022\vs_community.exe' -ArgumentList '--nocache --quiet --norestart --wait --noweb --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --includeOptional --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --add Microsoft.VisualStudio.Component.VC.ATL.ARM64 --add Microsoft.VisualStudio.Component.VC.MFC.ARM64'
   args:
     executable: powershell
-  when: (vs2022_layout_ready.stat.exists) and (not vs2022_installed.stat.exists)
+  when: (vs2022_layout_ready.stat.exists) and (not vs2022_installed.stat.exists) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
+  tags: adoptopenjdk
+
+- name: Register Visual Studio Community 2022 DIA SDK shared libraries
+  win_command: 'regsvr32 /s "{{ item }}"'
+  with_items:
+    - C:\Program Files\Microsoft Visual Studio\2022\Community\DIA SDK\bin\msdia140.dll
+    - C:\Program Files\Microsoft Visual Studio\2022\Community\DIA SDK\bin\amd64\msdia140.dll
+  when: (not vs2022_installed.stat.exists) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
   tags: adoptopenjdk
 
 - name: Remove VS2022 Zip File
   win_file:
     path: C:\TEMP\VS2022_Layout.zip
     state: absent
-  when: (not vs2022_installed.stat.exists)
+  when: (not vs2022_installed.stat.exists) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
   tags: adoptopenjdk
 
 - name: Remove VS2022 Unzipped Layout
   win_file:
     path: C:\temp\VSLayout2022
     state: absent
-  when: (not vs2022_installed.stat.exists)
+  when: (not vs2022_installed.stat.exists) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
   tags: adoptopenjdk
-#
-## Check If VS2019 Has Been Installed From Layout Even If Not AdoptOpenJDK
+
 - name: Test if VS 2022 is installed
   win_stat:
     path: 'C:\Program Files\Microsoft Visual Studio\2022\Community'
   register: vs2022_installed
+  when: windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)')
 
 # Download & Install VS2022 When No Layout & Not AdoptOpenJDK
 # This is the target that you're redirected to when you go to https://aka.ms/vs/17/release/vs_community.exe
@@ -93,34 +109,34 @@
     checksum_algorithm: sha256
     dest: 'C:\temp\vs_community22.exe'
     force: no
-  when: (not vs2022_installed.stat.exists)
+  when: (not vs2022_installed.stat.exists) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
 
 - name: Run Visual Studio 2022 Installer From Download
   win_shell: |
       Start-Process -Wait -FilePath 'C:\temp\vs_community22.exe' -ArgumentList '--wait --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --includeOptional --quiet --norestart'
   args:
     executable: powershell
-  when: (not vs2022_installed.stat.exists)
+  when: (not vs2022_installed.stat.exists) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
   register: vs2022_error
   failed_when: vs2022_error.rc != 0 and vs2022_error.rc != 3010
 
 - name: Install ARM64 components
   win_shell: Start-Process -FilePath 'C:\temp\vs_community22.exe' -Wait -NoNewWindow -ArgumentList
     'modify --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community" --quiet
     --add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --add Microsoft.VisualStudio.Component.VC.ATL.ARM64 --add Microsoft.VisualStudio.Component.VC.MFC.ARM64'
-  when: (not vs2022_installed.stat.exists)
+  when: (not vs2022_installed.stat.exists) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
 
 - name: Register Visual Studio Community 2022 DIA SDK shared libraries
   win_command: 'regsvr32 /s "{{ item }}"'
   with_items:
     - C:\Program Files\Microsoft Visual Studio\2022\Community\DIA SDK\bin\msdia140.dll
     - C:\Program Files\Microsoft Visual Studio\2022\Community\DIA SDK\bin\amd64\msdia140.dll
-  when: (not vs2022_installed.stat.exists)
+  when: (not vs2022_installed.stat.exists) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
 
 - name: Reboot machine after Visual Studio installation
   win_reboot:
     reboot_timeout: 1800
     shutdown_timeout: 1800
-  when: (not vs2022_installed.stat.exists)
+  when: (not vs2022_installed.stat.exists) and (windows_version.stdout_lines[0] | regex_search('^(10\.|11\.|2016|2019|2022)'))
   tags:
     - reboot