merge (#7)

merge

Co-authored-by: Pranav K <prkrishn@hotmail.com>
Co-authored-by: null <dotnet-maestro-bot@microsoft.com>
Co-authored-by: Justin Kotalik <jukotali@microsoft.com>
Co-authored-by: Arthur Vickers <ajcvickers@hotmail.com>
Co-authored-by: Nate McMaster <natemcmaster@users.noreply.github.com>
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Co-authored-by: Balint Farkas <balint.farkas@windowslive.com>
Co-authored-by: Mikael Mengistu <mikaelm12@users.noreply.github.com>
Co-authored-by: Brennan <brecon@microsoft.com>
Co-authored-by: Chris Ross <Tratcher@Outlook.com>
Co-authored-by: Kahbazi <A.Kahbazi@gmail.com>
Co-authored-by: Hao Kung <HaoK@users.noreply.github.com>
Co-authored-by: Javier Calvarro Nelson <jacalvar@microsoft.com>
Co-authored-by: David Fowler <davidfowl@gmail.com>
Co-authored-by: Stephen Halter <halter73@gmail.com>
Co-authored-by: Ryan Brandenburg <rybrande@microsoft.com>
Co-authored-by: John Luo <johluo@microsoft.com>
Co-authored-by: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Co-authored-by: Ajay Bhargav Baaskaran <ajaybhargavb@gmail.com>
Co-authored-by: Andrew Stanton-Nurse <andrew@stanton-nurse.com>
Co-authored-by: null <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
Co-authored-by: Dylan Dmitri Gray <d.dylan.g@gmail.com>
Co-authored-by: Ryan Nowak <rynowak@microsoft.com>
Co-authored-by: Alessio Franceschelli <alessio@franceschelli.me>
Co-authored-by: Loïc Sharma <sharma.loic@gmail.com>
Co-authored-by: Arthur Irgashev <arthur.irgashev@gmail.com>
Co-authored-by: Kevin Pilch <kevinpi@microsoft.com>
Co-authored-by: dudu <dudu@cnblogs.com>
Co-authored-by: Fabien Barbier <8518235+GoldenCrystal@users.noreply.github.com>

.azure/pipelines/ci.yml

@@ -25,7 +25,7 @@ variables:
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - name: _BuildArgs
     value: /p:TeamName=$(_TeamName)
-           /p:OfficialBuildId=$(Build.BuildNumber)
+      /p:OfficialBuildId=$(Build.BuildNumber)
 - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
   - name: _BuildArgs
     value: ''
@@ -58,75 +58,59 @@ jobs:
     # if they have already been signed. This results in slower builds due to re-submitting the same .nupkg many times for signing.
     # The sign settings have been configured to
 
-    - script: ./eng/scripts/cibuild.cmd
+    - script: ./build.cmd
+          -ci
           -arch x64
-          -BuildNative
-          /p:DisableCodeSigning=true
+          -pack
+          -all
+          -buildNative
           /bl:artifacts/log/build.x64.binlog
           $(_BuildArgs)
       displayName: Build x64
     # TODO: make it possible to build for one Windows architecture at a time
     # This is going to actually build x86 native assets. See https://github.com/aspnet/AspNetCore/issues/7196
 
     # Build the x86 shared framework
-    # Set DisableSignCheck because we'll run sign check in an explicit step after installers build
-    - script: ./eng/scripts/cibuild.cmd
+    - script: ./build.cmd
+            -ci
             -arch x86
-            -NoRestore
-            -BuildNative
-            /t:BuildSharedFx
+            -pack
+            -all
+            -buildNative
+            -noBuildJava
             /p:OnlyPackPlatformSpecificPackages=true
-            /p:DisableCodeSigning=true
             /bl:artifacts/log/build.x86.binlog
             $(_BuildArgs)
       displayName: Build x86
 
     # This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53
-    - script: ./build.cmd
+    - script: .\src\SiteExtensions\build.cmd
             -ci
-            -sign
-            -forceCoreMsbuild
-            /p:DisableCodeSigning=true
-            -projects ./src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
+            -pack
+            -noBuildDeps
             $(_BuildArgs)
       displayName: Build SiteExtension
 
-    # Remove all task build output
-    - script: rmdir /s /q build\tasks\bin
-      displayName: Clear task build output
-
     # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If https://github.com/dotnet/arcade/issues/1957 is resolved,
     # consider running code-signing inline with the other previous steps.
     # Sign check is disabled because it is run in a separate step below, after installers are built.
     - script: ./build.cmd
               -ci
+              -noBuild
+              -noRestore
               -sign
-              -NoRestore
-              /t:CodeSign
-              /p:SignType=$(_SignType)
-              /p:DisableSignCheck=true
               /bl:artifacts/log/build.codesign.binlog
               $(_BuildArgs)
       displayName: Code sign packages
 
     # Windows installers bundle both x86 and x64 assets
-    - powershell: ./src/Installers/Windows/build.ps1
-        -ci
-        /p:SignType=$(_SignType)
-         $(_BuildArgs)
-      displayName: Build Installers
-
-    # Run sign check to verify everything was code signed.
     - script: ./build.cmd
-        -ci
-        -sign
-        -NoRestore
-        /t:SignCheck
-        /p:SignType=$(_SignType)
-        /bl:artifacts/log/build.signcheck.binlog
-         $(_BuildArgs)
-      displayName: Run sign check
-      condition: and(succeeded(), eq(variables['_SignType'], 'real'))
+            -ci
+            -sign
+            -buildInstallers
+            /bl:artifacts/log/installers.msbuild.binlog
+            $(_BuildArgs)
+      displayName: Build Installers
 
     artifacts:
     - name: Windows_Logs
@@ -150,12 +134,13 @@ jobs:
     jobName: Windows_arm_build
     jobDisplayName: "Build: Windows ARM"
     agentOs: Windows
-    buildScript: ./eng/scripts/cibuild.cmd
-    buildArgs: -arch arm
-      -NoBuildNodeJS
-      -NoBuildJava
+    buildArgs:
+      -arch arm
+      -sign
+      -pack
+      -noBuildNodeJS
+      -noBuildJava
       /p:OnlyPackPlatformSpecificPackages=true
-      /p:SignType=$(_SignType)
       /bl:artifacts/log/build.win-arm.binlog
       $(_BuildArgs)
     installNodeJs: false
@@ -177,8 +162,10 @@ jobs:
     jobName: MacOs_x64_build
     jobDisplayName: "Build: macOS"
     agentOs: macOs
-    buildScript: ./eng/scripts/cibuild.sh
-    buildArgs: --no-build-nodejs
+    buildArgs:
+      --pack
+      --all
+      --no-build-nodejs
       --no-build-java
       -p:OnlyPackPlatformSpecificPackages=true
       -bl:artifacts/log/build.macos.binlog
@@ -206,40 +193,37 @@ jobs:
     agentOs: Linux
     installNodeJs: false
     steps:
-    - script: ./eng/scripts/cibuild.sh
+    - script: ./build.sh
+          --ci
           --arch x64
+          --pack
+          --all
           --no-build-nodejs
           --no-build-java
           -p:OnlyPackPlatformSpecificPackages=true
           -bl:artifacts/log/build.linux-x64.binlog
           $(_BuildArgs)
-      displayName: Run cibuild.sh
+      displayName: Run build.sh
     - script: |
-        rm -rf .dotnet/
-        git clean -xfd src/
+        git clean -xfd src/**/obj/
         ./dockerbuild.sh bionic \
-          --ci --pack --all --no-build-nodejs --no-build-java \
+          --ci \
           --arch x64 \
-          -e KOREBUILD_SKIP_INSTALL_NETFX=0 \
-          --no-restore \
+          --build-installers \
           --no-build-deps \
-          -t:BuildSharedFx  \
           -p:OnlyPackPlatformSpecificPackages=true \
           -p:BuildRuntimeArchive=false \
           -p:LinuxInstallerType=deb \
           -bl:artifacts/log/build.deb.binlog \
           $(_BuildArgs)
       displayName: Build Debian installers
     - script: |
-        rm -rf .dotnet/
-        git clean -xfd src/
+        git clean -xfd src/**/obj/
         ./dockerbuild.sh rhel \
-          --ci --pack --all --no-build-nodejs --no-build-java \
+          --ci \
           --arch x64 \
-          -e KOREBUILD_SKIP_INSTALL_NETFX=0 \
-          --no-restore \
+          --build-installers \
           --no-build-deps \
-          -t:BuildSharedFx  \
           -p:OnlyPackPlatformSpecificPackages=true \
           -p:BuildRuntimeArchive=false \
           -p:LinuxInstallerType=rpm \
@@ -266,8 +250,10 @@ jobs:
     jobName: Linux_arm_build
     jobDisplayName: "Build: Linux ARM"
     agentOs: Linux
-    buildScript: ./eng/scripts/cibuild.sh
-    buildArgs: --arch arm
+    buildArgs:
+      --arch arm
+      --pack
+      --all
       --no-build-nodejs
       --no-build-java
       -p:OnlyPackPlatformSpecificPackages=true
@@ -294,8 +280,10 @@ jobs:
     jobName: Linux_arm64_build
     jobDisplayName: "Build: Linux ARM64"
     agentOs: Linux
-    buildScript: ./eng/scripts/cibuild.sh
-    buildArgs: --arch arm64
+    buildArgs:
+      --arch arm64
+      --all
+      --pack
       --no-build-nodejs
       --no-build-java
       -p:OnlyPackPlatformSpecificPackages=true
@@ -323,12 +311,12 @@ jobs:
     jobDisplayName: "Build: Linux Musl x64"
     agentOs: Linux
     buildScript: ./dockerbuild.sh alpine
-    buildArgs: --ci
-      --pack
-      --all
-      -e KOREBUILD_SKIP_INSTALL_NETFX=0
+    buildArgs:
+      --ci
       --arch x64
       --os-name linux-musl
+      --pack
+      --all
       --no-build-nodejs
       --no-build-java
       -p:OnlyPackPlatformSpecificPackages=true
@@ -356,12 +344,12 @@ jobs:
     jobDisplayName: "Build: Linux Musl ARM64"
     agentOs: Linux
     buildScript: ./dockerbuild.sh ubuntu-alpine37
-    buildArgs: --ci
-      --pack
-      --all
-      -e KOREBUILD_SKIP_INSTALL_NETFX=0
+    buildArgs:
+      --ci
       --arch arm64
       --os-name linux-musl
+      --pack
+      --all
       --no-build-nodejs
       --no-build-java
       -p:OnlyPackPlatformSpecificPackages=true
@@ -390,8 +378,7 @@ jobs:
     jobDisplayName: "Test: Windows Server 2016 x64"
     agentOs: Windows
     isTestingJob: true
-    buildScript: ./eng/scripts/cibuild.cmd
-    buildArgs: -test -BuildNative "/p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false /p:BuildSiteExtensions=false"
+    buildArgs: -all -pack -test -BuildNative "/p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false"
     beforeBuild:
     - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
       displayName: Setup IISExpress test certificates and schema
@@ -403,6 +390,9 @@ jobs:
     - name: Windows_Test_Logs
       path: artifacts/log/
       publishOnError: true
+    - name: Windows_Test_Results
+      path: artifacts/TestResults/
+      publishOnError: true
 
 - template: jobs/default-build.yml
   parameters:
@@ -411,15 +401,20 @@ jobs:
     jobDisplayName: "Test: Templates - Windows Server 2016 x64"
     agentOs: Windows
     isTestingJob: true
-    buildScript: ./src/ProjectTemplates/build.cmd
-    buildArgs: -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /p:BuildSiteExtensions=false"
-    beforeBuild:
-    - powershell:  ./eng/scripts/cibuild.cmd
+    steps:
+    - script: ./build.cmd -ci -all -pack
       displayName: Build Repo
+    - script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.pack.binlog"
+      displayName: Pack Templates
+    - script: ./src/ProjectTemplates/build.cmd -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.test.binlog"
+      displayName: Test Templates
     artifacts:
     - name: Windows_Test_Templates_Logs
       path: artifacts/log/
       publishOnError: true
+    - name: Windows_Test_Templates_Results
+      path: artifacts/TestResults/
+      publishOnError: true
 
 - template: jobs/default-build.yml
   parameters:
@@ -428,19 +423,25 @@ jobs:
     jobDisplayName: "Test: macOS 10.13"
     agentOs: macOs
     isTestingJob: true
-    buildScript: ./eng/scripts/cibuild.sh
-    buildArgs: --test
+    buildArgs: --all --test "/p:RunTemplateTests=false"
     beforeBuild:
     - bash: "./eng/scripts/install-nginx-mac.sh"
       displayName: Installing Nginx
     afterBuild:
+    - bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
+      displayName: Pack Packages (for Template tests)
+    - bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
+      displayName: Pack Templates (for Template tests)
     - bash: ./build.sh --no-build --ci --test -p:RunFlakyTests=true
       displayName: Run Flaky Tests
       continueOnError: true
     artifacts:
     - name: MacOS_Test_Logs
       path: artifacts/log/
       publishOnError: true
+    - name: MacOS_Test_Results
+      path: artifacts/TestResults/
+      publishOnError: true
 
 - template: jobs/default-build.yml
   parameters:
@@ -449,18 +450,24 @@ jobs:
     jobDisplayName: "Test: Ubuntu 16.04 x64"
     agentOs: Linux
     isTestingJob: true
-    buildScript: ./eng/scripts/cibuild.sh
-    buildArgs: --test
+    buildArgs: --all --test "/p:RunTemplateTests=false"
     beforeBuild:
     - bash: "./eng/scripts/install-nginx-linux.sh"
       displayName: Installing Nginx
     - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
       displayName: Increase inotify limit
     afterBuild:
+    - bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
+      displayName: Pack Packages (for Template tests)
+    - bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
+      displayName: Pack Templates (for Template tests)
     - bash: ./build.sh --no-build --ci --test -p:RunFlakyTests=true
       displayName: Run Flaky Tests
       continueOnError: true
     artifacts:
     - name: Linux_Test_Logs
       path: artifacts/log/
       publishOnError: true
+    - name: Linux_Test_Results
+      path: artifacts/TestResults/
+      publishOnError: true

.azure/pipelines/helix-test.yml

@@ -15,7 +15,9 @@ jobs:
     agentOs: Windows
     timeoutInMinutes: 240
     steps:
-    - script: .\build.cmd -all -ci /p:BuildNative=true /t:Helix /p:IsHelixJob=true /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\SendToHelix.binlog
+    - script: .\restore.cmd -ci
+      displayName: Restore
+    - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true -bl
       displayName: Run build.cmd helix target
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops