Bug fixes

DSC/ProvisionAdminPc2Dsc.ps1

@@ -58,11 +58,6 @@ Configuration SetupAdminPc2
 
     [PSCredential]$Creds = New-Object System.Management.Automation.PSCredential ("${NetBiosName}\$($AdminCred.UserName)", $AdminCred.Password)
     
-    #region ScheduledTask-AATP
-    $SamiraASmbScriptLocation = [string]'C:\ScheduledTasks\SamiraASmbSimulation.ps1'
-    [PSCredential]$SamiraADomainCred = New-Object System.Management.Automation.PSCredential ("${NetBiosName}\$($SamiraACred.UserName)", $SamiraACred.Password)
-    #endregion
-
     #TODO: Not used yet as installing SQLExpress is one thing we need to do manually until we figure this out...
     #[PSCredential]$AipDomainAccount = New-Object System.Management.Automation.PSCredential ("${NetBiosName}\$($AipServiceCred.UserName)", $AipServiceCred.Password)
     #end region

DSC/ProvisionClient01.ps1

@@ -429,7 +429,7 @@ Configuration SetupAipScannerCore
         xRemoteFile GetMcasData
         {
             DestinationPath = 'C:\LabData\McasData.zip'
-            Uri = "https://github.com/microsoft/DefendTheFlag/raw/v1.5/Downloads/MCAS/Demo%20files.zip"
+            Uri = "https://github.com/microsoft/DefendTheFlag/raw/$Branch/Downloads/MCAS/Demo%20files.zip"
             DependsOn = @('[Computer]JoinDomain','[Registry]SchUseStrongCrypto','[Registry]SchUseStrongCrypto64')
         }
 

DSC/ProvisionDcDsc.ps1

@@ -248,7 +248,7 @@ Configuration CreateADForest
 		xRemoteFile DownloadBginfo
 		{
 			DestinationPath = 'C:\BgInfo\BgInfoConfig.bgi'
-			Uri = 'https://github.com/microsoft/DefendTheFlag/blob/master/Downloads/BgInfo/contosodc.bgi?raw=true'
+			Uri = "https://github.com/microsoft/DefendTheFlag/blob/$Branch/Downloads/BgInfo/contosodc.bgi?raw=true"
 			DependsOn = '[xWaitForADDomain]DscForestWait'
 		}
 

DSC/ProvisionVictimPcDsc.ps1

@@ -538,18 +538,21 @@ Configuration SetupVictimPc
             Uri = 'https://github.com/gentilkiwi/mimikatz/releases/download/2.2.0-20200104/mimikatz_trunk.zip'
             DependsOn = @('[xMpPreference]DefenderSettings', '[Registry]DisableSmartScreen', '[Registry]SchUseStrongCrypto64', '[Registry]SchUseStrongCrypto')
         }
+
         xRemoteFile GetPowerSploit
         {
             DestinationPath = 'C:\Tools\Backup\PowerSploit.zip'
             Uri = 'https://github.com/PowerShellMafia/PowerSploit/archive/master.zip'
             DependsOn = @('[xMpPreference]DefenderSettings', '[Registry]DisableSmartScreen', '[Registry]SchUseStrongCrypto64', '[Registry]SchUseStrongCrypto')
         }
+
         xRemoteFile GetKekeo
         {
             DestinationPath = 'C:\Tools\Backup\kekeo.zip'
             Uri = 'https://github.com/gentilkiwi/kekeo/releases/download/2.2.0-20190407/kekeo.zip'
             DependsOn = @('[xMpPreference]DefenderSettings', '[Registry]DisableSmartScreen', '[Registry]SchUseStrongCrypto64', '[Registry]SchUseStrongCrypto')
         }
+        
         xRemoteFile GetNetSess
         {
             DestinationPath = 'C:\Tools\Backup\NetSess.zip'