From fa295e460b777fd065831cac7f3304867aef61c0 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 20 Oct 2020 16:04:35 +0300 Subject: [PATCH 1/3] add workaround with ip --- images/win/scripts/Installers/Install-VS.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index 4c1ce9528..51fd9e7c1 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -3,6 +3,9 @@ ## Desc: Install Visual Studio ################################################################################ +Copy-Item -Path "$env:windir\System32\drivers\etc\hosts" -Destination "$env:temp\hosts_backup" +"68.232.34.200 download.visualstudio.microsoft.com" > "$env:windir\System32\drivers\etc\hosts" + $toolset = Get-ToolsetContent $requiredComponents = $toolset.visualStudio.workloads | ForEach-Object { "--add $_" } $workLoads = @( @@ -47,4 +50,5 @@ if (Test-IsWin19) { Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList } -Invoke-PesterTests -TestFile "VisualStudio" \ No newline at end of file +Invoke-PesterTests -TestFile "VisualStudio" +Move-Item -Path "$env:temp\hosts_backup" -Destination "$env:windir\System32\drivers\etc\hosts" -Force From 188ab7840087af5ae95036ea8a856c5f9ab74062 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 20 Oct 2020 18:32:11 +0300 Subject: [PATCH 2/3] change to c directory --- images/win/scripts/Installers/Install-VS.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index 51fd9e7c1..7e4b2b763 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -3,7 +3,7 @@ ## Desc: Install Visual Studio ################################################################################ -Copy-Item -Path "$env:windir\System32\drivers\etc\hosts" -Destination "$env:temp\hosts_backup" +Copy-Item -Path "$env:windir\System32\drivers\etc\hosts" -Destination "C:\hosts_backup" -Verbose "68.232.34.200 download.visualstudio.microsoft.com" > "$env:windir\System32\drivers\etc\hosts" $toolset = Get-ToolsetContent @@ -51,4 +51,4 @@ if (Test-IsWin19) { } Invoke-PesterTests -TestFile "VisualStudio" -Move-Item -Path "$env:temp\hosts_backup" -Destination "$env:windir\System32\drivers\etc\hosts" -Force +Move-Item -Path "C:\hosts_backup" -Destination "$env:windir\System32\drivers\etc\hosts" -Force -Verbose From f527ec3588bd8cc1a8005e8d23cb5577db2b5457 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 23 Oct 2020 10:28:50 +0300 Subject: [PATCH 3/3] add comments --- images/win/scripts/Installers/Install-VS.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index 7e4b2b763..d3db5b4dc 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -3,6 +3,7 @@ ## Desc: Install Visual Studio ################################################################################ +# Temporary replace ip for download server to the one with the correct files and backup hosts file Copy-Item -Path "$env:windir\System32\drivers\etc\hosts" -Destination "C:\hosts_backup" -Verbose "68.232.34.200 download.visualstudio.microsoft.com" > "$env:windir\System32\drivers\etc\hosts" @@ -51,4 +52,5 @@ if (Test-IsWin19) { } Invoke-PesterTests -TestFile "VisualStudio" +# Restore hosts file after VS installation Move-Item -Path "C:\hosts_backup" -Destination "$env:windir\System32\drivers\etc\hosts" -Force -Verbose