Update ci.yml

Author: HaoK

.azure/pipelines/ci.yml

@@ -663,28 +663,23 @@ stages:
 
   - template: jobs/default-build.yml
     parameters:
-      condition: ne(variables['Build.Reason'], 'PullRequest')
+      # condition: ne(variables['Build.Reason'], 'PullRequest') UNCOMMENT after testing
       jobName: Helix_x64_daily
       jobDisplayName: 'Tests: Helix x64 Daily'
       agentOs: Windows
       timeoutInMinutes: 180
       steps:
+      # Build the shared framework
       - script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog
         displayName: Build shared fx
       # Build the x86 shared framework
       # This is going to actually build x86 native assets.
-      - script: ./build.cmd
-                -ci
-                -arch x86
-                -pack
-                -all
-                -buildNative
-                -noBuildJava
-                /p:OnlyPackPlatformSpecificPackages=true
-                /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
-                /bl:artifacts/log/helix.daily.build.x86.binlog
-                $(_BuildArgs)
+      - script: ./build.cmd -ci -arch x86 -pack -all -buildNative -noBuildJava /p:OnlyPackPlatformSpecificPackages=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x86.binlog $(_BuildArgs)
         displayName: Build x86 shared framework pieces
+      - script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.template.pack.binlog"
+        displayName: Pack Templates        
+      - script: .\restore.cmd -ci
+        displayName: Restore
       - script: .\build.cmd -ci -noRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
         displayName: Run build.cmd helix target
         env: