Merge commit 'bbafecc0535e1de3264845e51ea8b3d18eb3ca61' into prkrishn/merge-blazor-wasm

Author: pranavkm

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

@@ -0,0 +1,59 @@
+# 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:
+  SAUCE_CONNECT_DOWNLOAD_ON_INSTALL: true
+  E2ETESTS_SauceTest: true
+  E2ETESTS_Sauce__TunnelIdentifier: 'blazor-e2e-sc-proxy-tunnel'
+  E2ETESTS_Sauce__HostName: '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 --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 --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,9 +7,9 @@ trigger:
   batch: true
   branches:
     include:
+    - blazor-wasm
     - master
     - release/*
-    - internal/release/3.*
 
 # Run PR validation on all branches
 pr:
@@ -80,11 +80,18 @@ variables:
       value: test
     - name: _PublishArgs
       value: ''
+<<<<<<< HEAD
+=======
+  # used for post-build phases, internal builds only
+  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - group: DotNet-AspNet-SDLValidation-Params
+>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
 
 stages:
 - stage: build
   displayName: Build
   jobs:
+<<<<<<< HEAD
   # Code check
   - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
     - template: jobs/default-build.yml
@@ -109,6 +116,8 @@ stages:
           publishOnError: true
           includeForks: true
 
+=======
+>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
   # Build Windows (x64/x86)
   - template: jobs/default-build.yml
     parameters:
@@ -142,12 +151,13 @@ stages:
                 -arch x64
                 -pack
                 -all
-                -buildNative
+                -NoBuildNative
                 /bl:artifacts/log/build.x64.binlog
                 $(_BuildArgs)
                 $(_InternalRuntimeDownloadArgs)
         displayName: Build x64
 
+<<<<<<< HEAD
       # Build the x86 shared framework
       # 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
@@ -173,6 +183,8 @@ stages:
                 $(_InternalRuntimeDownloadArgs)
         displayName: Build SiteExtension
 
+=======
+>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
       # 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.
@@ -200,16 +212,6 @@ stages:
                 /p:PublishInstallerBaseVersion=true
         displayName: Build Installers
 
-      # A few files must also go to the VS package feed.
-      - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-        - task: NuGetCommand@2
-          displayName: Push Visual Studio packages
-          inputs:
-            command: push
-            packagesToPush: 'artifacts/packages/**/VS.Redist.Common.AspNetCore.*.nupkg'
-            nuGetFeedType: external
-            publishFeedCredentials: 'DevDiv - VS package feed'
-
       artifacts:
       - name: Windows_Logs
         path: artifacts/log/
@@ -218,6 +220,7 @@ stages:
       - name: Windows_Packages
         path: artifacts/packages/
 
+<<<<<<< HEAD
   # Build Windows ARM
   - template: jobs/default-build.yml
     parameters:
@@ -512,6 +515,8 @@ stages:
     parameters:
       inputName: Linux_musl_arm64
 
+=======
+>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
   # Test jobs
   - template: jobs/default-build.yml
     parameters:
@@ -656,6 +661,7 @@ stages:
         publishOnError: true
         includeForks: true
 
+<<<<<<< HEAD
   # Source build
   - job: Source_Build
     displayName: 'Test: Linux Source Build'
@@ -714,23 +720,17 @@ stages:
         artifactType: Container
         parallel: true
 
+=======
+>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
   # Publish to the BAR
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - template: /eng/common/templates/job/publish-build-assets.yml
       parameters:
         dependsOn:
           - Windows_build
-          - Windows_arm_build
-          - 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_arm64
           # In addition to the dependencies above, ensure the build was successful overall.
           - Linux_Test
           - MacOS_Test
-          - Source_Build
           - Windows_Templates_Test
           - Windows_Test
         pool:

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-serve": {
+      "version": "1.5.0",
+      "commands": [
+        "dotnet-serve"
+      ]
+    }
+  }
+}

NuGet.config

@@ -3,12 +3,32 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+<<<<<<< HEAD
     <add key="darc-pub-dotnet-corefx-8a3ffed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-8a3ffed5/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
     <add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+=======
+    <add key="darc-pub-dotnet-core-setup-65f04fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-65f04fb6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
+    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
+    <add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />
+    <add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
+    <add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
+    <add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
+    <add key="aspnet-stable" value="https://dotnetfeed.blob.core.windows.net/dotnet-core-3-1-rtm-014727/index.json" />
+    <add key="grpc-nuget-dev" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
+    <add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
+    <add key="aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
+    <add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
+    <add key="blazor-wasm" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json" />
+>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
   </packageSources>
 </configuration>

eng/Build.props

@@ -34,7 +34,8 @@
                       $(RepoRoot)src\Installers\**\*.*proj;
                       $(RepoRoot)src\SignalR\clients\ts\**\node_modules\**\*.*proj;
                       $(RepoRoot)src\Components\Web.JS\node_modules\**\*.*proj;
-                      $(RepoRoot)src\Components\Blazor\Templates\src\content\**\*.*proj;
+                      $(RepoRoot)src\Components\Blazor\Build\testassets\**\*.*proj;
+                      $(RepoRoot)src\ProjectTemplates\BlazorWasm.ProjectTemplates\content\**\*.csproj;
                       $(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.csproj;
                       $(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.fsproj;
                       $(RepoRoot)src\ProjectTemplates\Web.Spa.ProjectTemplates\content\**\*.csproj;
@@ -49,6 +50,11 @@
                       " />
   </ItemGroup>
 
+  <PropertyGroup>
+    <!-- For the Blazor WASM branch, only build a subset of projects -->
+    <ProjectToBuild>$(RepoRoot)src\Components\**\*.csproj;$(RepoRoot)src\ProjectTemplates\**\*.csproj</ProjectToBuild>
+  </PropertyGroup>
+
   <Choose>
     <!-- Project selection can be overridden on the command line by passing in -projects -->
     <When Condition="'$(ProjectToBuild)' != ''">

eng/common/tools.ps1

@@ -257,7 +257,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
     if ($msbuildCmd -ne $null) {
       # Workaround for https://github.com/dotnet/roslyn/issues/35793
       # Due to this issue $msbuildCmd.Version returns 0.0.0.0 for msbuild.exe 16.2+
-      $msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split(@('-', '+'))[0])
+      $msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split([char[]]@('-', '+'))[0])
 
       if ($msbuildVersion -ge $vsMinVersion) {
         return $global:_MSBuildExe = $msbuildCmd.Path

eng/scripts/CodeCheck.ps1

@@ -170,10 +170,11 @@ try {
         & $PSScriptRoot\GenerateReferenceAssemblies.ps1 -ci:$ci
     }
 
-    Write-Host "Re-generating package baselines"
-    Invoke-Block {
-        & dotnet run -p "$repoRoot/eng/tools/BaselineGenerator/"
-    }
+    # Temporarily disable package baseline generation while we stage for publishing
+    # Write-Host "Re-generating package baselines"
+    # Invoke-Block {
+    #     & dotnet run -p "$repoRoot/eng/tools/BaselineGenerator/"
+    # }
 
     Write-Host "Run git diff to check for pending changes"
 

global.json

@@ -1,9 +1,16 @@
 {
   "sdk": {
+<<<<<<< HEAD
     "version": "3.1.103"
   },
   "tools": {
     "dotnet": "3.1.103",
+=======
+    "version": "3.1.100"
+  },
+  "tools": {
+    "dotnet": "3.1.100",
+>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
     "runtimes": {
       "dotnet/x64": [
         "$(MicrosoftNETCoreAppInternalPackageVersion)"
@@ -25,7 +32,12 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.15.2",
+<<<<<<< HEAD
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20213.4",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20213.4"
+=======
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19577.5"
+>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
   }
 }

src/Components/Blazor/Blazor.Version.props

@@ -0,0 +1,8 @@
+<Project>
+  <PropertyGroup>
+    <!-- Override version labels -->
+    <VersionPrefix>3.2.0</VersionPrefix>
+    <PreReleaseVersionLabel>preview1</PreReleaseVersionLabel>
+    <DotNetFinalVersionKind />
+  </PropertyGroup>
+</Project>

src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.1.cs

@@ -0,0 +1,69 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Blazor
+{
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+    public static partial class JSInteropMethods
+    {
+        [Microsoft.JSInterop.JSInvokableAttribute("NotifyLocationChanged")]
+        public static void NotifyLocationChanged(string uri, bool isInterceptedLink) { }
+    }
+}
+namespace Microsoft.AspNetCore.Blazor.Hosting
+{
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct RootComponentMapping
+    {
+        private readonly object _dummy;
+        public RootComponentMapping(System.Type componentType, string selector) { throw null; }
+        public System.Type ComponentType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Selector { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    public partial class RootComponentMappingCollection : System.Collections.ObjectModel.Collection<Microsoft.AspNetCore.Blazor.Hosting.RootComponentMapping>
+    {
+        public RootComponentMappingCollection() { }
+        public void Add(System.Type componentType, string selector) { }
+        public void AddRange(System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Blazor.Hosting.RootComponentMapping> items) { }
+        public void Add<TComponent>(string selector) where TComponent : Microsoft.AspNetCore.Components.IComponent { }
+    }
+    public sealed partial class WebAssemblyHost : System.IAsyncDisposable
+    {
+        internal WebAssemblyHost() { }
+        public Microsoft.Extensions.Configuration.IConfiguration Configuration { get { throw null; } }
+        public System.IServiceProvider Services { get { throw null; } }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public System.Threading.Tasks.ValueTask DisposeAsync() { throw null; }
+        public System.Threading.Tasks.Task RunAsync() { throw null; }
+    }
+    public sealed partial class WebAssemblyHostBuilder
+    {
+        internal WebAssemblyHostBuilder() { }
+        public Microsoft.Extensions.Configuration.IConfigurationBuilder Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Blazor.Hosting.RootComponentMappingCollection RootComponents { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Blazor.Hosting.WebAssemblyHost Build() { throw null; }
+        public static Microsoft.AspNetCore.Blazor.Hosting.WebAssemblyHostBuilder CreateDefault(string[] args = null) { throw null; }
+    }
+}
+namespace Microsoft.AspNetCore.Blazor.Http
+{
+    public enum FetchCredentialsOption
+    {
+        Omit = 0,
+        SameOrigin = 1,
+        Include = 2,
+    }
+    public static partial class WebAssemblyHttpMessageHandlerOptions
+    {
+        public static Microsoft.AspNetCore.Blazor.Http.FetchCredentialsOption DefaultCredentials { get { throw null; } set { } }
+    }
+}
+namespace Microsoft.AspNetCore.Blazor.Rendering
+{
+    public static partial class WebAssemblyEventDispatcher
+    {
+        [Microsoft.JSInterop.JSInvokableAttribute("DispatchEvent")]
+        public static System.Threading.Tasks.Task DispatchEvent(Microsoft.AspNetCore.Components.RenderTree.WebEventDescriptor eventDescriptor, string eventArgsJson) { throw null; }
+    }
+}