Skip to content

Commit 8efeefb

Browse files
pranavkmpranavkm
committed
Merge branch 'blazor-wasm' into prkrishn/merge-blazor-wasm
2 parents bb0f54f + 158126c commit 8efeefb

File tree

588 files changed

+32659
-13071
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

588 files changed

+32659
-13071
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ trigger:
77
batch: true
88
branches:
99
include:
10-
- blazor-wasm
1110
- master
1211
- release/*
12+
- internal/release/3.*
1313

1414
# Run PR validation on all branches
1515
pr:
@@ -80,18 +80,11 @@ variables:
8080
value: test
8181
- name: _PublishArgs
8282
value: ''
83-
<<<<<<< HEAD
84-
=======
85-
# used for post-build phases, internal builds only
86-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
87-
- group: DotNet-AspNet-SDLValidation-Params
88-
>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
8983

9084
stages:
9185
- stage: build
9286
displayName: Build
9387
jobs:
94-
<<<<<<< HEAD
9588
# Code check
9689
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
9790
- template: jobs/default-build.yml
@@ -116,8 +109,6 @@ stages:
116109
publishOnError: true
117110
includeForks: true
118111

119-
=======
120-
>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
121112
# Build Windows (x64/x86)
122113
- template: jobs/default-build.yml
123114
parameters:
@@ -151,13 +142,12 @@ stages:
151142
-arch x64
152143
-pack
153144
-all
154-
-NoBuildNative
145+
-buildNative
155146
/bl:artifacts/log/build.x64.binlog
156147
$(_BuildArgs)
157148
$(_InternalRuntimeDownloadArgs)
158149
displayName: Build x64
159150

160-
<<<<<<< HEAD
161151
# Build the x86 shared framework
162152
# TODO: make it possible to build for one Windows architecture at a time
163153
# This is going to actually build x86 native assets. See https://github.com/aspnet/AspNetCore/issues/7196
@@ -183,8 +173,6 @@ stages:
183173
$(_InternalRuntimeDownloadArgs)
184174
displayName: Build SiteExtension
185175

186-
=======
187-
>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
188176
# 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,
189177
# consider running code-signing inline with the other previous steps.
190178
# Sign check is disabled because it is run in a separate step below, after installers are built.
@@ -212,6 +200,16 @@ stages:
212200
/p:PublishInstallerBaseVersion=true
213201
displayName: Build Installers
214202

203+
# A few files must also go to the VS package feed.
204+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
205+
- task: NuGetCommand@2
206+
displayName: Push Visual Studio packages
207+
inputs:
208+
command: push
209+
packagesToPush: 'artifacts/packages/**/VS.Redist.Common.AspNetCore.*.nupkg'
210+
nuGetFeedType: external
211+
publishFeedCredentials: 'DevDiv - VS package feed'
212+
215213
artifacts:
216214
- name: Windows_Logs
217215
path: artifacts/log/
@@ -220,7 +218,6 @@ stages:
220218
- name: Windows_Packages
221219
path: artifacts/packages/
222220

223-
<<<<<<< HEAD
224221
# Build Windows ARM
225222
- template: jobs/default-build.yml
226223
parameters:
@@ -515,8 +512,6 @@ stages:
515512
parameters:
516513
inputName: Linux_musl_arm64
517514

518-
=======
519-
>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
520515
# Test jobs
521516
- template: jobs/default-build.yml
522517
parameters:
@@ -661,7 +656,6 @@ stages:
661656
publishOnError: true
662657
includeForks: true
663658

664-
<<<<<<< HEAD
665659
# Source build
666660
- job: Source_Build
667661
displayName: 'Test: Linux Source Build'
@@ -720,17 +714,23 @@ stages:
720714
artifactType: Container
721715
parallel: true
722716

723-
=======
724-
>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
725717
# Publish to the BAR
726718
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
727719
- template: /eng/common/templates/job/publish-build-assets.yml
728720
parameters:
729721
dependsOn:
730722
- Windows_build
723+
- Windows_arm_build
724+
- CodeSign_Xplat_MacOS_x64
725+
- CodeSign_Xplat_Linux_x64
726+
- CodeSign_Xplat_Linux_arm
727+
- CodeSign_Xplat_Linux_arm64
728+
- CodeSign_Xplat_Linux_musl_x64
729+
- CodeSign_Xplat_Linux_musl_arm64
731730
# In addition to the dependencies above, ensure the build was successful overall.
732731
- Linux_Test
733732
- MacOS_Test
733+
- Source_Build
734734
- Windows_Templates_Test
735735
- Windows_Test
736736
pool:

‎NuGet.config

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,20 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<<<<<<< HEAD
76
<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" />
7+
<add key="darc-pub-dotnet-corefx-66409e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-66409e39/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-blazor-cc44960" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-blazor-cc449601/nuget/v3/index.json" />
89
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
910
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1011
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1112
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
1213
<add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
1314
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
14-
=======
15-
<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" />
16-
<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" />
17-
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
18-
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1915
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
20-
<add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />
21-
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
22-
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
23-
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
24-
<add key="aspnet-stable" value="https://dotnetfeed.blob.core.windows.net/dotnet-core-3-1-rtm-014727/index.json" />
25-
<add key="grpc-nuget-dev" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
26-
<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
16+
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
17+
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
18+
<add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
2719
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
28-
<add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
29-
<add key="aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
30-
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
3120
<add key="blazor-wasm" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json" />
32-
>>>>>>> bbafecc0535e1de3264845e51ea8b3d18eb3ca61
3321
</packageSources>
3422
</configuration>

‎eng/Baseline.Designer.props

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-sql-cache' ">
1919
<BaselinePackageVersion>3.1.4</BaselinePackageVersion>
2020
</PropertyGroup>
21+
<!-- Package: Microsoft.Authentication.WebAssembly.Msal-->
22+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' ">
23+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
24+
</PropertyGroup>
25+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' AND '$(TargetFramework)' == 'netstandard2.1' ">
26+
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="[3.2.0, )" />
27+
</ItemGroup>
2128
<!-- Package: Microsoft.AspNetCore.ApiAuthorization.IdentityServer-->
2229
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApiAuthorization.IdentityServer' ">
2330
<BaselinePackageVersion>3.1.4</BaselinePackageVersion>
@@ -240,6 +247,48 @@
240247
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.4, )" />
241248
<BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.4, )" />
242249
</ItemGroup>
250+
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly-->
251+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' ">
252+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
253+
</PropertyGroup>
254+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' AND '$(TargetFramework)' == 'netstandard2.1' ">
255+
<BaselinePackageReference Include="Microsoft.JSInterop.WebAssembly" Version="[3.2.0, )" />
256+
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.3, )" />
257+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[3.1.3, )" />
258+
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.3, )" />
259+
</ItemGroup>
260+
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Build-->
261+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Build' ">
262+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
263+
</PropertyGroup>
264+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Build' AND '$(TargetFramework)' == 'any' ">
265+
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="[3.2.0, )" />
266+
</ItemGroup>
267+
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Server-->
268+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Server' ">
269+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
270+
</PropertyGroup>
271+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Server' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
272+
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Authentication-->
273+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' ">
274+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
275+
</PropertyGroup>
276+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' AND '$(TargetFramework)' == 'netstandard2.1' ">
277+
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="[3.1.3, )" />
278+
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.3, )" />
279+
</ItemGroup>
280+
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.HttpHandler-->
281+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.HttpHandler' ">
282+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
283+
</PropertyGroup>
284+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.HttpHandler' AND '$(TargetFramework)' == 'netstandard2.1' " />
285+
<!-- Package: Microsoft.JSInterop.WebAssembly-->
286+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' ">
287+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
288+
</PropertyGroup>
289+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' AND '$(TargetFramework)' == 'netstandard2.1' ">
290+
<BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.3, )" />
291+
</ItemGroup>
243292
<!-- Package: Microsoft.AspNetCore.ConcurrencyLimiter-->
244293
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ConcurrencyLimiter' ">
245294
<BaselinePackageVersion>3.1.4</BaselinePackageVersion>

‎eng/Baseline.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Update this list when preparing for a new patch.
88
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
99
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
1010
<Package Id="dotnet-sql-cache" Version="3.1.4" />
11+
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.0" />
1112
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.4" />
1213
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.4" />
1314
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.4" />
@@ -36,6 +37,12 @@ Update this list when preparing for a new patch.
3637
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.4" />
3738
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.4" />
3839
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.4" />
40+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
41+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" />
42+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0" />
43+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.0" />
44+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.0" />
45+
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.0" />
3946
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.4" />
4047
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.4" />
4148
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.4" />

‎eng/Build.props

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
$(RepoRoot)src\Installers\**\*.*proj;
3535
$(RepoRoot)src\SignalR\clients\ts\**\node_modules\**\*.*proj;
3636
$(RepoRoot)src\Components\Web.JS\node_modules\**\*.*proj;
37-
$(RepoRoot)src\Components\Blazor\Build\testassets\**\*.*proj;
38-
$(RepoRoot)src\ProjectTemplates\BlazorWasm.ProjectTemplates\content\**\*.csproj;
37+
$(RepoRoot)src\Components\WebAssembly\Build\testassets\**\*.csproj;
38+
$(RepoRoot)src\ProjectTemplates\ComponentsWebAssembly.ProjectTemplates\content\**\*.csproj;
3939
$(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.csproj;
4040
$(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.fsproj;
4141
$(RepoRoot)src\ProjectTemplates\Web.Spa.ProjectTemplates\content\**\*.csproj;
@@ -50,11 +50,6 @@
5050
" />
5151
</ItemGroup>
5252

53-
<PropertyGroup>
54-
<!-- For the Blazor WASM branch, only build a subset of projects -->
55-
<ProjectToBuild>$(RepoRoot)src\Components\**\*.csproj;$(RepoRoot)src\ProjectTemplates\**\*.csproj</ProjectToBuild>
56-
</PropertyGroup>
57-
5853
<Choose>
5954
<!-- Project selection can be overridden on the command line by passing in -projects -->
6055
<When Condition="'$(ProjectToBuild)' != ''">

‎eng/Dependencies.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ and are generated based on the last package release.
9292
<LatestPackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
9393
<LatestPackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
9494
<LatestPackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
95+
<LatestPackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonPackageVersion)" />
9596
<LatestPackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
9697
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
9798
<LatestPackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngPackageVersion)" />
@@ -122,7 +123,7 @@ and are generated based on the last package release.
122123
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.1" Version="$(MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion)" />
123124
<LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.2" Version="$(MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion)" />
124125
<LatestPackageReference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="$(MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion)" />
125-
<LatestPackageReference Include="Microsoft.AspNetCore.Blazor.Mono" Version="$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
126+
<LatestPackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="$(MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion)" />
126127
<LatestPackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
127128
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
128129
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)" />

0 commit comments

Comments
 (0)