Fix windows 7 build and add new build for Windows 10 2004.

resources/custom_scripts/RunAfterWindowsUpdates.ps1

@@ -27,9 +27,17 @@ $file = "$env:temp\ConfigureRemotingForAnsible.ps1"
 
 (New-Object -TypeName System.Net.WebClient).DownloadFile($url, $file)
 powershell.exe -ExecutionPolicy ByPass -File $file
-
 $null > C:\UnattendResources\CustomResources\ANS.done
 Write-Host "Done Config winrm for ansible"
 }
+
+if (!(Test-Path C:\UnattendResources\CustomResources\WinSE.done))
+{
+Write-Host "Installing MSE"
+$env:SEE_MASK_NOZONECHECKS = 1
+Start-Process -FilePath "C:\UnattendResources\CustomResources\MSEInstall.exe" -Argumentlist "/s /runwgacheck /o" -Wait
+$null > C:\UnattendResources\CustomResources\WinSE.done
+Write-Host "Done Installing MSE"
+}
 Write-Host "END RunAfterUpdates"
 Start-Sleep -s 15

resources/custom_scripts/RunBeforeWindowsUpdates.ps1

@@ -17,15 +17,6 @@ $null > C:\UnattendResources\CustomResources\DOTNET.done
 #Write-Host "Done Installing .Net 4.5.2"
 }
 
-#if (!(Test-Path C:\UnattendResources\CustomResources\VC.done))
-#{
-#Write-Host "Installing vc_redist.x64.exe"
-#$env:SEE_MASK_NOZONECHECKS = 1
-#Start-Process -FilePath "C:\UnattendResources\CustomResources\vc_redist.x64.exe" -Argumentlist "/q /norestart" -Wait
-#$null > C:\UnattendResources\CustomResources\VC.done
-#Write-Host "Done Installing vc_redist.x64.exe"
-#}
-
 if (!(Test-Path C:\UnattendResources\CustomResources\KB2533623.done))
 {
 Write-Host "Installing KB2533623"
@@ -34,6 +25,40 @@ $null > C:\UnattendResources\CustomResources\KB2533623.done
 #Write-Host "Done Installing KB2533623"
 }
 
+#if (!(Test-Path C:\UnattendResources\CustomResources\KB4474419.done))
+#{
+#Write-Host "Installing KB4474419"
+#Start-Process wusa.exe "C:\UnattendResources\CustomResources\windows6.1-kb4474419-v3-x64.msu /quiet /norestart" -Wait
+#$null > C:\UnattendResources\CustomResources\KB4474419.done
+##Write-Host "Done Installing KB4474419"
+#}
+
+#if (!(Test-Path C:\UnattendResources\CustomResources\KB4490628.done))
+#{
+#Write-Host "Installing KB4490628"
+#Start-Process wusa.exe "C:\UnattendResources\CustomResources\windows6.1-kb4490628-x64.msu /quiet /norestart" -Wait
+#$null > C:\UnattendResources\CustomResources\KB4490628.done
+#Write-Host "Done Installing KB4490628"
+#}
+
+#if (!(Test-Path C:\UnattendResources\CustomResources\WinDef.done))
+#{
+#Write-Host "Installing mpas-fe.exe"
+#$env:SEE_MASK_NOZONECHECKS = 1
+#Start-Process -FilePath "C:\UnattendResources\CustomResources\mpas-fe.exe" -Argumentlist "/q /norestart" -Wait
+#$null > C:\UnattendResources\CustomResources\WinDef.done
+#Write-Host "Done Installing mpas-fe.exe"
+#}
+
+#if (!(Test-Path C:\UnattendResources\CustomResources\WinSE.done))
+#{
+#Write-Host "Installing MSE"
+#$env:SEE_MASK_NOZONECHECKS = 1
+#Start-Process -FilePath "C:\UnattendResources\CustomResources\MSEInstall.exe" -Argumentlist "/s /runwgacheck /o" -Wait
+#$null > C:\UnattendResources\CustomResources\WinSE.done
+#Write-Host "Done Installing MSE"
+#}
+
 if (!(Test-Path C:\UnattendResources\CustomResources\WMFPS.done))
 {
 Write-Host "Installing WMF and Powershell 5.1"
@@ -41,5 +66,16 @@ Start-Process wusa.exe "C:\UnattendResources\CustomResources\Win7AndW2K8R2-KB319
 $null > C:\UnattendResources\CustomResources\WMFPS.done
 #Write-Host "Done Installing WMF and Powershell 5.1"
 }
+
+#Write-Host " "
+#Write-Host "Resetting Defender Sigs"
+#Start-Process -FilePath "C:\Program Files\Windows Defender\MPCMDRUN.exe" -Argumentlist "-RemoveDefinitions -All" -Wait
+#Write-Host "Done Resetting Defender Sigs"
+
+#Write-Host "Updating Defender Sigs"
+#Start-Process -FilePath "C:\Program Files\Windows Defender\MPCMDRUN.exe" -Argumentlist "-SignatureUpdate" -Wait
+#Write-Host "Done Update Defender Sigs"
+
+Write-Host " "
 Write-Host "END RunBeforeUpdates"
 Start-Sleep -s 10

windows-10/windows10-2004.ps1

+$version = "windows10-2004"
+$wim = "Windows 10 Pro"
+write-host $version Image Generator
+
+If (-NOT ([Security.Principal.WindowsPrincipal]`
+   [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator"))
+{
+    Write-Warning "This script requires administrative privileges to run.  Please elevate and try again."
+    Break
+}
+
+Import-Module ..\windows-openstack-imaging-tools\WinImageBuilder.psm1
+Import-Module ..\windows-openstack-imaging-tools\Config.psm1
+Import-Module ..\windows-openstack-imaging-tools\UnattendResources\ini.psm1
+
+copy ..\resources\configs\base-server.ini "$version.ini"
+
+Set-IniFileValue -Path "$version.ini" -Section "DEFAULT" -Key "wim_file_path" -Value "..\resources\wim\$version.wim"
+Set-IniFileValue -Path "$version.ini" -Section "DEFAULT" -Key "image_name" -Value "$wim"
+Set-IniFileValue -Path "$version.ini" -Section "DEFAULT" -Key "image_path" -Value "..\artifacts\$version.qcow2"
+
+New-WindowsOnlineImage -ConfigFilePath "$version.ini"
+
+Remove-Module WinImageBuilder
+Remove-Module Config
+Remove-Module ini
+
+..\windows-openstack-imaging-tools\bin\qemu-img convert -f qcow2 -O raw "..\artifacts\$version.qcow2" "..\artifacts\$version.raw"

windows-10/windows10.ps1

+$version = "windows10"
+$wim = "Windows 10 Pro"
+write-host $version Image Generator
+
+If (-NOT ([Security.Principal.WindowsPrincipal]`
+   [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator"))
+{
+    Write-Warning "This script requires administrative privileges to run.  Please elevate and try again."
+    Break
+}
+
+Import-Module ..\windows-openstack-imaging-tools\WinImageBuilder.psm1
+Import-Module ..\windows-openstack-imaging-tools\Config.psm1
+Import-Module ..\windows-openstack-imaging-tools\UnattendResources\ini.psm1
+
+copy ..\resources\configs\base-server.ini "$version.ini"
+
+Set-IniFileValue -Path "$version.ini" -Section "DEFAULT" -Key "wim_file_path" -Value "..\resources\wim\$version.wim"
+Set-IniFileValue -Path "$version.ini" -Section "DEFAULT" -Key "image_name" -Value "$wim"
+Set-IniFileValue -Path "$version.ini" -Section "DEFAULT" -Key "image_path" -Value "..\artifacts\$version.qcow2"
+
+New-WindowsOnlineImage -ConfigFilePath "$version.ini"
+
+Remove-Module WinImageBuilder
+Remove-Module Config
+Remove-Module ini
+
+..\windows-openstack-imaging-tools\bin\qemu-img convert -f qcow2 -O raw "..\artifacts\$version.qcow2" "..\artifacts\$version.raw"