From fe74081dc450b7b9608821df34021f345232d8cc Mon Sep 17 00:00:00 2001
From: Dany Contreras <78437433+danycontre@users.noreply.github.com>
Date: Fri, 3 Nov 2023 15:39:59 -0500
Subject: [PATCH] updates

---
 workload/bicep/deploy-baseline.bicep          |   4 ++--
 workload/scripts/DSCStorageScripts.zip        | Bin 82684 -> 82688 bytes
 .../DSCStorageScripts/Configuration.ps1       |   5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/workload/bicep/deploy-baseline.bicep b/workload/bicep/deploy-baseline.bicep
index c3e154508..8a7d8ad95 100644
--- a/workload/bicep/deploy-baseline.bicep
+++ b/workload/bicep/deploy-baseline.bicep
@@ -537,7 +537,7 @@ var varZtKvName = avdUseCustomNaming ? '${ztKvPrefixCustomName}-${varComputeStor
 var varZtKvPrivateEndpointName = 'pe-${varZtKvName}-vault'
 //
 var varFslogixSharePath = '\\\\${varFslogixStorageName}.file.${environment().suffixes.storage}\\${varFslogixFileShareName}'
-var varBaseScriptUri = 'https://raw.githubusercontent.com/Azure/avdaccelerator/main/workload/'
+var varBaseScriptUri = 'https://raw.githubusercontent.com/Azure/avdaccelerator/aad-fslogix/workload/'
 var varSessionHostConfigurationScriptUri = '${varBaseScriptUri}scripts/Set-SessionHostConfiguration.ps1'
 var varSessionHostConfigurationScript = './Set-SessionHostConfiguration.ps1'
 var varDiskEncryptionKeyExpirationInEpoch = dateTimeToEpoch(dateTimeAdd(time, 'P${string(diskEncryptionKeyExpirationInDays)}D'))
@@ -753,7 +753,7 @@ var varMarketPlaceGalleryWindows = {
         version: 'latest'
     }
 }
-var varStorageAzureFilesDscAgentPackageLocation = 'https://github.com/Azure/avdaccelerator/raw/main/workload/scripts/DSCStorageScripts.zip'
+var varStorageAzureFilesDscAgentPackageLocation = 'https://github.com/Azure/avdaccelerator/raw/aad-fslogix/workload/scripts/DSCStorageScripts.zip'
 var varStorageToDomainScriptUri = '${varBaseScriptUri}scripts/Manual-DSC-Storage-Scripts.ps1'
 var varStorageToDomainScript = './Manual-DSC-Storage-Scripts.ps1'
 var varOuStgPath = !empty(storageOuPath) ? '"${storageOuPath}"' : '"${varDefaultStorageOuPath}"'
diff --git a/workload/scripts/DSCStorageScripts.zip b/workload/scripts/DSCStorageScripts.zip
index 11cc622ac72b8a693430158538db9520d8d4843e..b69ddf0d4d3cca3cef000a146cbe00ec950ebc9a 100644
GIT binary patch
delta 1684
zcmV;F25b5Jg$00y1%R{xMKBHGd}CKGOjuk>1^@u>mr^hRCw~VhJ?u4Ih8lJfcxY`S
za$5{tF(?vktCK~Sq>_4B|NHJlNv32<cGhSw<3kdWr~B@X$GeZp&u8rxfiZA?o6hFW
z#L<s9hGguFh{vO4u!@DN0v?fN5Hhmlg7|#n1`+wpgD8krL@F-a6(g?a@i<cLR;qP;
z<&178^TlK~-G3`ytOH4;CxWda4?!4`J4Qqt5zz0NikVL&lM->)Tq+VrKFg6^e*-@~
z!F(2}zzyY~-8%aPfw!)3H|<s*p)}~nIZiRfME|WD`7Ri{BbTJBM9j`Vr84i`Fn}dC
z<!Ty-;Y?g@wrbbU*QFBR=_k^4w68<$>J${e%=~Q<=zsR6DVVh@Sc7hilMQPSU=&08
zZD#S@RqKWzCP|j5ox{X^;IX;j_W>khLukXlV!=iskNvCYJ`g<G0D41MPJE}2A{?`c
z-w?<s48VgE)Gy&6KUsg*VO}g?cjoZu1zR_4Fxh7B8dRR1_<1b0Ts8$V#LD?jGSR#v
zY3aKD;(tc~^x_$jk}YS>flqT+$_Fm|cIzBHYqv&){-tZtuh3ksp_3(*uibjoI@7*^
ze;U2xREtlsx-LeA&G@fCjh@mV<UxOF4$IPOngg@;o#x<<^`PdE>-$l2xD~yrIlzNH
zRR>k*RZqn_(zEJtzt6=||7s4XqL(!XXzy#y;eXZjxMxQ_-tSQCT>sKP&&Xu6<w6m)
zW@N+t7_M$=?JB&|DX5Y%S-?I>1d}`#9vkR4^?P(Iz1wtw(6@;K3@w?<F_Qt@yc`8q
z7aD99^{!-|Ha0U5JO{~pCe(sc(;JI3gbw9A1QQqRt0MH8g9WKiT6hHDpm53_=<Mz@
z^M4d^c2cp;00IqLg5_y2jG;IuMh)i9D8DC?ekoBb_~#J2Ll4s6HerDcD@D5!f{USt
zTIPZ+nP3rY$0g}O`fYpWes`UuR$@1T^^a296Y#+nW<Fh9+%PqUUGp#x5x3t3tN3OE
zxry(j?hQyE=@CuTm?}GO_-e((U@L#>6o2w;%6&#c?zth}()HZqK6T&VN+C&fh=eJG
z<CfiVI02w-vYaxAmY<!LqFhlIf`eRVxZQ@kSrqO%Md>lSi&t7I8z>!y9fRO~GpmL6
z*`SK)K`+~TMixw}R9eJvo|b`-ia<O`up|LYG8GG)$4>DQk6T0>X1-F?c$2Rg<A1V@
zi$iNBuOEAGLgP^NFe7^ChbdKhbWT=ZOoCWKW?s~%f;kk_Ig3&pAE4zi3a^t6eq1_?
z@!rO9?H4A}eW$HDAkiH=@(-kQ;K=X#PkLZR;u)cb%Bx|^(ziEuS(v9qUX#leXK6-8
zvi1C#TDe26#=1yz7M{!H6Lim-vwuZnhF0*-Otfm5T3KWEmVJ?$lsfm@oTHk*WNYbD
z7W<TJlp>$amUaj`wtbIq#jFVCFf!PQJ&#Gbgr2=CeYb=f@FN#wy0~`8mWfTEKVwR!
z@GEDQ>}f7rGWOfyl;<jMU3IRoO}v#WESPg=0(GDKO`vT;_n~hBne|YZoPWiN>Q-~i
zJqju_y>?l(7W@IIiEcDkUp<!OF0`76J@h*chn->Az6kdqC$VEfgpQp1iwv{#GV^7x
z+EQ%lOP*1o_v0B#-t!hc!%A<>yg#wtK?gax<dHxY^KVd51iQnr=5Y`MXf`RSBQ#Nh
zB;%gt6v3_m%<9vKtG%l8Du1_eq<yM;jUCV~W=VA%3|^?yoO0CE12?hVueTjXcOr}N
z+wVrgH!v#0aZ2eZkYk|lq^F-pA+R$-*%#6Q-n5Njsndfq^<fRHETe&sr2EG}7bOs^
z-m(g}abS#V?W_$s4zox-C5hZnFxTImmQ2~m_IPo?)XY)i@3F1M@qbj0&>KwCf8|L{
zw&JL8#WMZBE93i0_WgDI#f#z;Tsz@H8b?EE+@&s!``BJQRR+HjX5ZES#025jY2bnX
z<3&T_RDb{8>(aiUOma3X0|<A1>FK>Hnd*S4fWaT~Ypih(w%lnF-;x(}O!02G2P(ag
zdUu|BXZfZLM9RD*jYnPOk}L>TR(l$sJ<epy9M)i+6@2p~rukHkc@n#{^U91-7Ov=}
zk4wgCzOA;e7<&ePl)G24_7bl>h0$8(=zAva;DuNJ0JpF<0f7q*;(TLQE=*WlN(KM`
e@0UJ80Z;+7mybdLHv!w1$3g)w2IN5j0001MN<UEm

delta 1689
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

diff --git a/workload/scripts/DSCStorageScripts/Configuration.ps1 b/workload/scripts/DSCStorageScripts/Configuration.ps1
index 6d55845c2..bd2736f8a 100644
--- a/workload/scripts/DSCStorageScripts/Configuration.ps1
+++ b/workload/scripts/DSCStorageScripts/Configuration.ps1
@@ -138,8 +138,9 @@ Configuration DomainJoinFileShare
     # Import the module that contains the File resource.
     Import-DscResource -ModuleName PsDesiredStateConfiguration
 
-    #$secStringPassword = ConvertTo-SecureString $AdminUserPassword -AsPlainText -Force
-    $AdminCred = New-Object System.Management.Automation.PSCredential ($AdminUserName, $AdminUserPassword) # $secStringPassword)
+    $secStringPassword = ConvertTo-SecureString $AdminUserPassword -AsPlainText -Force
+    #$AdminCred = New-Object System.Management.Automation.PSCredential ($AdminUserName, $AdminUserPassword) # $secStringPassword)
+    $AdminCred = New-Object System.Management.Automation.PSCredential ($AdminUserName, $secStringPassword)
 
     $ErrorActionPreference = 'Stop'