Fix OS ports (#186)

tools/UpdateBuildMachineGitInstalls.ps1

@@ -0,0 +1,17 @@
+[CmdLetBinding()]
+Param(
+    )
+
+Import-Module -Name $PSScriptRoot\BuildMachineUtils.psm1 -DisableNameChecking
+
+$adalPath = Get-AdalPath
+
+Write-Verbose "ADALPath: $adalPath"
+Add-Type -Path "$adalPath\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll"
+
+$result = Queue-BuildOnMachine -MachineName "PKGESWINUI24" -BuildId "17093" # Install GVFS
+Write-Host "PKGESWINUI24: $($result._links.web.href)"
+$result = Queue-BuildOnMachine -MachineName "PKGESWINUI25" -BuildId "17093" # Install GVFS
+Write-Host "PKGESWINUI25: $($result._links.web.href)"
+$result = Queue-BuildOnMachine -MachineName "PKGESWINUI44" -BuildId "17093" # Install GVFS
+Write-Host "PKGESWINUI44: $($result._links.web.href)"

tools/WindowsPorting/PerformDEPControlsPort.cmd

@@ -521,7 +521,8 @@ echo.
 echo Pulling latest from %1...
 echo.
 
-call git pull --force
+call git fetch
+call git merge FETCH_HEAD
 call :CheckErrorLevel "Pull" || goto Cleanup
 goto:eof