diff --git a/packer/windowsserver2019.pkr.hcl b/packer/windowsserver2019.pkr.hcl index 33381b3..8f298d1 100644 --- a/packer/windowsserver2019.pkr.hcl +++ b/packer/windowsserver2019.pkr.hcl @@ -204,30 +204,30 @@ build { "scripts/Install-WinGet.ps1" ] } - // provisioner "powershell" { - // inline = [ - // "winget install mozilla.firefox", - // "winget install 7zip.7zip", - // "winget install microsoft.dotnetframework" - // ] - // // valid_exit_codes = [0, 3010] - // } provisioner "powershell" { inline = [ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12", - "Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" + "winget install mozilla.firefox", + "winget install 7zip.7zip", + "winget install microsoft.dotnetframework" ] + // valid_exit_codes = [0, 3010] } - provisioner "powershell" { - inline = [ - "choco config set --name=limit-output --value=LimitOutput", - "choco install -y dotnetfx", - "choco install -y 7zip.install", - "choco install -y sysinternals", - "choco install -y firefox" - ] - valid_exit_codes = [0, 3010] - } + // provisioner "powershell" { + // inline = [ + // "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12", + // "Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" + // ] + // } + // provisioner "powershell" { + // inline = [ + // "choco config set --name=limit-output --value=LimitOutput", + // "choco install -y dotnetfx", + // "choco install -y 7zip.install", + // "choco install -y sysinternals", + // "choco install -y firefox" + // ] + // valid_exit_codes = [0, 3010] + // } provisioner "windows-update" { } diff --git a/scripts/Install-WinGet.ps1 b/scripts/Install-WinGet.ps1 index c27c9a2..c51d4fd 100644 --- a/scripts/Install-WinGet.ps1 +++ b/scripts/Install-WinGet.ps1 @@ -54,10 +54,12 @@ $AppxDependencies.ShortName | ForEach-Object { Add-AppxPackage @AddAppxPackageSplat } # Install winget -$AddAppxPackageSplat = @{ - Path = "$env:temp\winget.msixbundle" +$AddAppxProvisionedPackageSplat = @{ + Online = $True + PackagePath = "$env:temp\winget.msixbundle" + LicensePath = "$env:temp\wingetlicense.xml" } -Add-AppxPackage @AddAppxPackageSplat +Add-AppxProvisionedPackage @AddAppxProvisionedPackageSplat # Create reparse point $SetExecutionAliasSplat = @{