@@ -214,7 +214,8 @@ RUN `

   Download-File $location C:\gitsetup.zip; `

   `

   Write-Host INFO: Downloading go...; `

-  Download-File $('https://golang.org/dl/go'+$Env:GO_VERSION.TrimEnd('.0')"+'.windows-amd64.zip') C:\go.zip; `

+  $dlGoVersion=$Env:GO_VERSION -replace '\.0$',''; `

+  Download-File "https://golang.org/dl/go${dlGoVersion}.windows-amd64.zip" C:\go.zip; `

   `

   Write-Host INFO: Downloading compiler 1 of 3...; `

   Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `

@@ -134,7 +134,7 @@ Function Check-InContainer() {

 # outside of a container where it may be out of date with master.

 Function Verify-GoVersion() {

     Try {

-        $goVersionDockerfile=(Select-String -Path ".\Dockerfile" -Pattern "^ARG[\s]+GO_VERSION=(.*)$").Matches.groups[1].Value.TrimEnd(".0")

+        $goVersionDockerfile=(Select-String -Path ".\Dockerfile" -Pattern "^ARG[\s]+GO_VERSION=(.*)$").Matches.groups[1].Value -replace '\.0$',''

         $goVersionInstalled=(go version).ToString().Split(" ")[2].SubString(2)

     }

     Catch [Exception] {