Merge branch 'ghmaster' into merge/gh-to-vsts

jeanfrancoislarente · Nov 7, 2019 · 05cea76 · 05cea76
2 parents a30bbd7 + 3547b0f
commit 05cea76
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
diff --git a/modules/SitecoreImageBuilder/SitecoreImageBuilder.psm1 b/modules/SitecoreImageBuilder/SitecoreImageBuilder.psm1
@@ -107,7 +107,7 @@ function Invoke-PackageRestore
                     {
                         throw ("Unable to login to '{0}' with the supplied credentials." -f $sitecoreDownloadUrl)
                     }
-                    
+
                     Write-Verbose ("Logged in to '{0}'." -f $sitecoreDownloadUrl)
                 }
 
@@ -414,16 +414,16 @@ function Initialize-BuildSpecifications
         "^sitecore-(xm1|xp)-sxa-(.*)-(standalone|cm|cd):(.*)$" # legacy\variants
 
         "^sitecore-(xm|xp)-(sql|sqldev):(.*)$", # windows/linux platform
-        "^sitecore-(xm|xp)-(standalone|cm|cd):(.*)$" # windows platform
-
-        "^sitecore-xp-(.*):(.*)$", # build XP before XC
-        "^sitecore-xc-(.*):(.*)$",
+        "^sitecore-(xm|xp)-(standalone|cm|cd|identity):(.*)$" # windows platform
+        "^sitecore-xp-xconnect(.*):(.*)$" # windows platform
 
         "^sitecore-(xm|xp)-(spe|pse)-(sql|sqldev):(.*)$" # SPE windows/linux variants
         "^sitecore-(xm|xp)-(spe|pse)-(standalone|cm|cd):(.*)$" # SPE windows variants
 
         "^sitecore-(xm|xp)-sxa-(sql|sqldev):(.*)$" # SXA windows/linux variants
         "^sitecore-(xm|xp)-sxa-(standalone|cm|cd):(.*)$" # SXA  windows variants
+
+        "^sitecore-xc-(.*):(.*)$" # XC windows variants
     )
 
     $patterns | ForEach-Object {

diff --git a/windows/9.2.x/sitecore-xp-identity/Dockerfile b/windows/9.2.x/sitecore-xp-identity/Dockerfile
@@ -51,7 +51,7 @@ RUN $env:INSTALL_TEMP = 'C:\\inetpub\\wwwroot\\temp\\install'; `
     Start-Process (Join-Path $env:INSTALL_TEMP '\\setup\\vc_redist.exe') -ArgumentList '/install', '/passive', '/norestart' -NoNewWindow -Wait; `
     Start-Process (Join-Path $env:INSTALL_TEMP '\\setup\\dotnet-hosting.exe') -ArgumentList '/install', '/quiet' -NoNewWindow -Wait; `
     # install tools
-    Copy-Item -Path (Join-Path $env:INSTALL_TEMP '\\tools') -Destination 'C:\\tools' -Force; `
+    Copy-Item -Path (Join-Path $env:INSTALL_TEMP '\\tools') -Force -Recurse -Destination 'C:\\tools' ; `
     setx /M PATH $($env:PATH + ';C:\tools\scripts;C:\tools\bin;C:\Program Files\dotnet') | Out-Null; `
     # install certificates
     $password = ConvertTo-SecureString -String (Get-Content -Path (Join-Path $env:INSTALL_TEMP '\\certificates\\password')) -Force -AsPlainText; `