Merge pull request #642 from microsoft/dev

Dev

Author: jaromirk

HandsOnLabs/01-CreatingFirstLab/readme.md

@@ -62,11 +62,12 @@ Note: Start-BitsTransfer is used because invoke-webrequest is slow for big files
 ```PowerShell
 #ISO
 $WindowsServerEvalURL="https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1742.240906-0331.ge_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso"
-$AzureLocal2505URL="http://aka.ms/hcireleaseimage/2505"
+#you should download latest image from Azure Portal, this is just an example
+$AzureLocal2509URL="http://aka.ms/hcireleaseimage/2509"
 
 #download
 Start-BitsTransfer -Source $WindowsServerEvalURL -Destination $env:userprofile\Downloads\
-Start-BitsTransfer -Source $AzureLocal2505URL -Destination $env:userprofile\Downloads\AzureLocal2505.iso
+Start-BitsTransfer -Source $AzureLocal2509URL -Destination $env:userprofile\Downloads\AzureLocal2509.iso
 
 ```
 

Scripts/3_Deploy.ps1

@@ -821,7 +821,7 @@ If (-not $isAdmin) {
                     $unattendfile=CreateUnattendFileNoDjoin -ComputerName $Name -AdminPassword $LabConfig.AdminPassword -RunSynchronous $RunSynchronous -TimeZone $TimeZone
                 }
             }elseif($VMConfig.Win2012Djoin -or $VMConfig.Unattend -eq "DjoinCred"){
-                WriteInfoHighlighted "`t Creating Unattend with win2012-ish domain join"
+                WriteInfoHighlighted "`t Creating Unattend with credentials domain join"
                 $unattendfile=CreateUnattendFileWin2012 -ComputerName $Name -AdminPassword $LabConfig.AdminPassword -DomainName $Labconfig.DomainName -RunSynchronous $RunSynchronous -TimeZone $TimeZone
 
             }elseif($VMConfig.Unattend -eq "DjoinBlob" -or -not ($VMConfig.Unattend)){
@@ -839,7 +839,9 @@ If (-not $isAdmin) {
             if ($unattendFile){
                 WriteInfo "`t Adding unattend to VHD"
                 Mount-WindowsImage -Path $mountdir -ImagePath $VHDPath -Index 1
-                Use-WindowsUnattend -Path $mountdir -UnattendPath $unattendFile
+                if ($VMConfig.Unattend -eq "DjoinBlob"){
+                    Use-WindowsUnattend -Path $mountdir -UnattendPath $unattendFile
+                }   
                 #&"$PSScriptRoot\Tools\dism\dism" /mount-image /imagefile:$vhdpath /index:1 /MountDir:$mountdir
                 #&"$PSScriptRoot\Tools\dism\dism" /image:$mountdir /Apply-Unattend:$unattendfile
                 New-item -type directory "$mountdir\Windows\Panther" -ErrorAction Ignore