Merge branch 'main' into merge/release/5.0-to-main

Author: sebastienros

.azure/pipelines/blazor-daily-tests.yml

@@ -0,0 +1,67 @@
+# Uses Scheduled Triggers, which aren't supported in YAML yet.
+# https://docs.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=vsts&tabs=yaml#scheduled
+
+# Daily Tests for Blazor
+# These use Sauce Labs resources, hence they run daily rather than per-commit.
+
+# We just need one Windows machine because all it does is trigger SauceLabs.
+variables:
+  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+      - group: DotNet-MSRC-Storage
+      - group: AzureDevOps-Artifact-Feeds-Pats
+  - name: SAUCE_CONNECT_DOWNLOAD_ON_INSTALL
+    value: true
+  - name: E2ETESTS_SauceTest
+    value: true
+  - name: E2ETESTS_Sauce__TunnelIdentifier
+    value: 'blazor-e2e-sc-proxy-tunnel'
+  - name: E2ETESTS_Sauce__HostName
+    value: 'sauce.local'
+
+jobs:
+- template: jobs/default-build.yml
+  parameters:
+    buildDirectory: src/Components
+    isTestingJob: true
+    agentOs: Windows
+    jobName: BlazorDailyTests
+    jobDisplayName: "Blazor Daily Tests"
+    afterBuild:
+
+    # macOS/Safari
+    - script: 'dotnet test --no-build --configuration Release --filter "StandaloneAppTest"'
+      workingDirectory: 'src/Components/test/E2ETest'
+      displayName: 'Run Blazor tests - macOS/Safari'
+      condition: succeededOrFailed()
+      env:
+        # Secrets need to be explicitly mapped to env variables.
+        E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
+        E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
+        # Set platform/browser configuration.
+        E2ETESTS_Sauce__TestName: 'Blazor Daily Tests - macOS/Safari'
+        E2ETESTS_Sauce__PlatformName: 'macOS 10.14'
+        E2ETESTS_Sauce__BrowserName: 'Safari'
+        # Need to explicitly set version here because some older versions don't support timeouts in Safari.
+        E2ETESTS_Sauce__SeleniumVersion: '3.4.0'
+
+    # Android/Chrome
+    - script: 'dotnet test --no-build --configuration Release --filter "StandaloneAppTest"'
+      workingDirectory: 'src/Components/test/E2ETest'
+      displayName: 'Run Blazor tests - Android/Chrome'
+      condition: succeededOrFailed()
+      env:
+        # Secrets need to be explicitly mapped to env variables.
+        E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
+        E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
+        # Set platform/browser configuration.
+        E2ETESTS_Sauce__TestName: 'Blazor Daily Tests - Android/Chrome'
+        E2ETESTS_Sauce__PlatformName: 'Android'
+        E2ETESTS_Sauce__PlatformVersion: '10.0'
+        E2ETESTS_Sauce__BrowserName: 'Chrome'
+        E2ETESTS_Sauce__DeviceName: 'Android GoogleAPI Emulator'
+        E2ETESTS_Sauce__DeviceOrientation: 'portrait'
+        E2ETESTS_Sauce__AppiumVersion: '1.9.1'
+    artifacts:
+    - name: Windows_Logs
+      path: artifacts/log/
+      publishOnError: true

.azure/pipelines/ci.yml

@@ -7,8 +7,7 @@ trigger:
   batch: true
   branches:
     include:
-    - blazor-wasm
-    - master
+    - main
     - release/*
     - internal/release/*
 
@@ -33,12 +32,13 @@ variables:
 - name: _DotNetValidationArtifactsCategory
   value: .NETCORE
 - name: PostBuildSign
-  value: false
+  value: true
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - name: _BuildArgs
     value: /p:TeamName=$(_TeamName)
            /p:OfficialBuildId=$(Build.BuildNumber)
            /p:SkipTestBuild=true
+           /p:PostBuildSign=$(PostBuildSign)
   # DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
   # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
   - group: DotNet-Blob-Feed
@@ -67,7 +67,7 @@ variables:
     value: -ExcludeCIBinaryLog
 - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
   - name: _BuildArgs
-    value: '/p:SkipTestBuild=true'
+    value: '/p:SkipTestBuild=true /p:PostBuildSign=$(PostBuildSign)'
   - name: _PublishArgs
     value: ''
   # Write binary logs for all main Windows build steps except the x86 one in public and PR builds.
@@ -95,13 +95,15 @@ variables:
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
   - group: DotNet-MSRC-Storage
   - name: _InternalRuntimeDownloadArgs
-    value: -DotNetRuntimeSourceFeed https://dotnetclimsrc.blob.core.windows.net/dotnet -DotNetRuntimeSourceFeedKey
-           $(dotnetclimsrc-read-sas-token-base64) /p:DotNetAssetRootAccessTokenSuffix='$(dotnetclimsrc-read-sas-token-base64)'
-  # The code signing doesn't use the aspnet build scripts, so the msbuild parameters have
-  # to be passed directly. This is awkward, since we pass the same info above, but we have
-  # to have it in two different forms
+    value: -RuntimeSourceFeed https://dotnetclimsrc.blob.core.windows.net/dotnet
+           -RuntimeSourceFeedKey $(dotnetclimsrc-read-sas-token-base64)
+           /p:DotNetAssetRootAccessTokenSuffix='$(dotnetclimsrc-read-sas-token-base64)'
+  # The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
+  # is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
   - name: _InternalRuntimeDownloadCodeSignArgs
-    value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
+    value: $(_InternalRuntimeDownloadArgs)
+           /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
+           /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
   - group: DotNet-HelixApi-Access
   - name: _UseHelixOpenQueues
     value: 'false'
@@ -151,7 +153,7 @@ stages:
       # This is intentional to workaround https://github.com/dotnet/arcade/issues/1957 which always re-submits for code-signing, even
       # 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: ./build.cmd
+      - script: ./eng/build.cmd
                 -ci
                 -arch x64
                 -pack
@@ -163,7 +165,7 @@ stages:
 
       # Build the x86 shared framework
       # This is going to actually build x86 native assets.
-      - script: ./build.cmd
+      - script: ./eng/build.cmd
                 -ci
                 -noBuildRepoTasks
                 -arch x86
@@ -191,7 +193,7 @@ stages:
       # 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
+      - script: ./eng/build.cmd
                 -ci
                 -noBuildRepoTasks
                 -noBuildNative
@@ -204,7 +206,7 @@ stages:
         displayName: Code sign packages
 
       # Windows installers bundle both x86 and x64 assets
-      - script: ./build.cmd
+      - script: ./eng/build.cmd
                 -ci
                 -noBuildRepoTasks
                 -sign
@@ -285,7 +287,7 @@ stages:
       - name: Windows_arm64_Installers
         path: artifacts/installers/
       steps:
-      - script: ./build.cmd
+      - script: ./eng/build.cmd
                 -ci
                 -arch arm64
                 -sign
@@ -300,7 +302,7 @@ stages:
         displayName: Build ARM64
 
       # Windows installers bundle for arm64
-      - script: ./build.cmd
+      - script: ./eng/build.cmd
                 -ci
                 -noBuildRepoTasks
                 -arch arm64
@@ -326,11 +328,43 @@ stages:
             publishFeedCredentials: 'DevDiv - VS package feed'
 
 
-  # Build MacOS
+  # Build MacOS arm64
+  - template: jobs/default-build.yml
+    parameters:
+      jobName: MacOs_arm64_build
+      jobDisplayName: "Build: macOS arm64"
+      agentOs: macOs
+      buildArgs:
+        --arch arm64
+        --pack
+        --all
+        --no-build-nodejs
+        --no-build-java
+        -p:OnlyPackPlatformSpecificPackages=true
+        -p:AssetManifestFileName=aspnetcore-MacOS_arm64.xml
+        $(_BuildArgs)
+        $(_PublishArgs)
+        $(_InternalRuntimeDownloadArgs)
+      installNodeJs: false
+      installJdk: false
+      artifacts:
+      - name: MacOS_arm64_Logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
+      - name: MacOS_arm64_Packages
+        path: artifacts/packages/
+
+  - ${{ if ne(variables['PostBuildSign'], 'true') }}:
+    - template: jobs/codesign-xplat.yml
+      parameters:
+        inputName: MacOS_arm64
+
+  # Build MacOS x64
   - template: jobs/default-build.yml
     parameters:
       jobName: MacOs_x64_build
-      jobDisplayName: "Build: macOS"
+      jobDisplayName: "Build: macOS x64"
       agentOs: macOs
       buildArgs:
         --pack
@@ -365,7 +399,7 @@ stages:
       agentOs: Linux
       useHostedUbuntu: false
       steps:
-      - script: ./build.sh
+      - script: ./eng/build.sh
             --ci
             --arch x64
             --pack
@@ -375,7 +409,6 @@ stages:
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-Linux_x64.xml
             $(_BuildArgs)
-            $(_PublishArgs)
             $(_InternalRuntimeDownloadArgs)
         displayName: Run build.sh
       - script: |
@@ -405,7 +438,7 @@ stages:
             -p:OnlyPackPlatformSpecificPackages=true \
             -p:BuildRuntimeArchive=false \
             -p:LinuxInstallerType=rpm \
-            -p:AssetManifestFileName=aspnetcore-Linux_x64-installers.xml \
+            -p:AssetManifestFileName=aspnetcore-Linux_x64.xml \
             $(_BuildArgs) \
             $(_PublishArgs) \
             $(_InternalRuntimeDownloadArgs)
@@ -496,7 +529,7 @@ stages:
       jobDisplayName: "Build: Linux Musl x64"
       agentOs: Linux
       container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-WithNode-0fc54a3-20190918214015
-      buildScript: ./build.sh
+      buildScript: ./eng/build.sh
       buildArgs:
         --arch x64
         --os-name linux-musl
@@ -533,7 +566,7 @@ stages:
       agentOs: Linux
       useHostedUbuntu: false
       container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20200827125937-14441ae
-      buildScript: ./build.sh
+      buildScript: ./eng/build.sh
       buildArgs:
         --arch arm
         --os-name linux-musl
@@ -555,9 +588,11 @@ stages:
         includeForks: true
       - name: Linux_musl_arm_Packages
         path: artifacts/packages/
-  - template: jobs/codesign-xplat.yml
-    parameters:
-      inputName: Linux_musl_arm
+
+  - ${{ if ne(variables['PostBuildSign'], 'true') }}:
+    - template: jobs/codesign-xplat.yml
+      parameters:
+        inputName: Linux_musl_arm
 
   # Build Linux Musl ARM64
   - template: jobs/default-build.yml
@@ -567,7 +602,7 @@ stages:
       agentOs: Linux
       useHostedUbuntu: false
       container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20200413125008-406629a
-      buildScript: ./build.sh
+      buildScript: ./eng/build.sh
       buildArgs:
         --arch arm64
         --os-name linux-musl
@@ -633,8 +668,9 @@ stages:
         jobDisplayName: "Test: Templates - Windows Server 2016 x64"
         agentOs: Windows
         isTestingJob: true
+        testRunTitle: Templates-$(AgentOsName)-$(BuildConfiguration)
         steps:
-        - script: ./build.cmd -ci -nobl -all -pack $(_InternalRuntimeDownloadArgs)
+        - script: ./eng/build.cmd -ci -nobl -all -pack $(_InternalRuntimeDownloadArgs)
           displayName: Build Repo
         - script: ./src/ProjectTemplates/build.cmd -ci -nobl -noBuildRepoTasks -pack -NoRestore -noBuildNative -NoBuilddeps "/p:RunTemplateTests=true"
           displayName: Pack Templates
@@ -709,13 +745,13 @@ stages:
         timeoutInMinutes: 240
         steps:
         # Build the shared framework
-        - script: ./build.cmd -ci -nobl -all -pack -arch x64
+        - script: ./eng/build.cmd -ci -nobl -all -pack -arch x64
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
           displayName: Build shared fx
-        - script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
+        - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
           displayName: Restore interop projects
-        - script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
+        - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
                   /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
           displayName: Run build.cmd helix target
@@ -787,13 +823,23 @@ stages:
           - Windows_arm_build
           - Windows_arm64_build
           - ${{ if ne(variables['PostBuildSign'], 'true') }}:
+            - CodeSign_Xplat_MacOS_arm64
             - CodeSign_Xplat_MacOS_x64
             - CodeSign_Xplat_Linux_x64
             - CodeSign_Xplat_Linux_arm
             - CodeSign_Xplat_Linux_arm64
             - CodeSign_Xplat_Linux_musl_x64
             - CodeSign_Xplat_Linux_musl_arm
             - CodeSign_Xplat_Linux_musl_arm64
+          - ${{ if eq(variables['PostBuildSign'], 'true') }}:
+            - MacOs_arm64_build
+            - MacOs_x64_build
+            - Linux_x64_build
+            - Linux_arm_build
+            - Linux_arm64_build
+            - Linux_musl_x64_build
+            - Linux_musl_arm_build
+            - Linux_musl_arm64_build
           # In addition to the dependencies above, ensure the build was successful overall.
           - Source_Build
         pool:

.azure/pipelines/devBuilds.yml

@@ -20,7 +20,7 @@ stages:
       jobDisplayName: "Build: Components"
       agentOs: Windows
       steps:
-      - script: ./build.cmd
+      - script: ./eng/build.cmd
                 -ci
                 -arch x64
                 /bl:$(Build.SourcesDirectory)/artifacts/log/build.components.x64.binlog
@@ -43,7 +43,7 @@ stages:
       jobDisplayName: "Build: Servers"
       agentOs: Windows
       steps:
-      - script: ./build.cmd
+      - script: ./eng/build.cmd
                 -ci
                 -arch x64
                 /bl:$(Build.SourcesDirectory)/artifacts/log/build.servers.x64.binlog
@@ -66,7 +66,7 @@ stages:
       jobDisplayName: "Build: Project Templates"
       agentOs: Windows
       steps:
-      - script: ./build.cmd
+      - script: ./eng/build.cmd
                 -ci
                 -arch x64
                 /bl:$(Build.SourcesDirectory)/artifacts/log/build.projectTemplates.x64.binlog
@@ -89,7 +89,7 @@ stages:
       jobDisplayName: "Build: Everything"
       agentOs: Windows
       steps:
-      - script: ./build.cmd
+      - script: ./eng/build.cmd
                 -ci
                 -arch x64
                 /bl:$(Build.SourcesDirectory)/artifacts/log/build.all.x64.binlog