Skip to content

Commit 432dc97

Browse files
wtgodbewtgodbe
authored
Merge pull request #21921 from dotnet/prkrishn/merge-blazor-wasm
Merge blazor-wasm -> 3.1
2 parents 99e90f5 + b3ad812 commit 432dc97

File tree

660 files changed

+38074
-14720
lines changed

Some content is hidden

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

660 files changed

+38074
-14720
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,8 @@ stages:
664664
vmImage: 'ubuntu-16.04'
665665
variables:
666666
DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
667+
# This isn't needed in the path because build does not need to _use_ global tools.
668+
DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
667669
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true
668670
steps:
669671
- script: |

‎.azure/pipelines/jobs/default-build.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ jobs:
113113
- _BuildConfig: ${{ parameters.configuration }}
114114
- BuildConfiguration: ${{ parameters.configuration }}
115115
- BuildDirectory: ${{ parameters.buildDirectory }}
116+
- DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
116117
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
117118
- TeamName: AspNetCore
118119
- ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
@@ -155,6 +156,12 @@ jobs:
155156
- ${{ if and(eq(parameters.installTar, 'true'), eq(parameters.agentOs, 'Windows')) }}:
156157
- powershell: ./eng/scripts/InstallTar.ps1
157158
displayName: Find or install Tar
159+
- ${{ if eq(parameters.agentOs, 'Windows') }}:
160+
- powershell: Write-Host "##vso[task.prependpath]$(DOTNET_CLI_HOME)\.dotnet\tools"
161+
displayName: Add dotnet tools to path
162+
- ${{ if ne(parameters.agentOs, 'Windows') }}:
163+
- script: echo "##vso[task.prependpath]$(DOTNET_CLI_HOME)/.dotnet/tools"
164+
displayName: Add dotnet tools to path
158165

159166
- ${{ parameters.beforeBuild }}
160167

‎.config/dotnet-tools.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"dotnet-serve": {
6+
"version": "1.7.125",
7+
"commands": [
8+
"dotnet-serve"
9+
]
10+
}
11+
}
12+
}

‎eng/Baseline.Designer.props

Lines changed: 50 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.5</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.5</BaselinePackageVersion>
@@ -201,6 +208,49 @@
201208
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.5, )" />
202209
<BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.5, )" />
203210
</ItemGroup>
211+
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly-->
212+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' ">
213+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
214+
</PropertyGroup>
215+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' AND '$(TargetFramework)' == 'netstandard2.1' ">
216+
<BaselinePackageReference Include="Microsoft.JSInterop.WebAssembly" Version="[3.2.0, )" />
217+
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="[3.2.0, )" />
218+
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.3, )" />
219+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[3.1.3, )" />
220+
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.3, )" />
221+
</ItemGroup>
222+
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Build-->
223+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Build' ">
224+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
225+
</PropertyGroup>
226+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Build' AND '$(TargetFramework)' == 'any' ">
227+
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="[3.2.0, )" />
228+
</ItemGroup>
229+
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Server-->
230+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Server' ">
231+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
232+
</PropertyGroup>
233+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Server' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
234+
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Authentication-->
235+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' ">
236+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
237+
</PropertyGroup>
238+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' AND '$(TargetFramework)' == 'netstandard2.1' ">
239+
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="[3.1.3, )" />
240+
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.3, )" />
241+
</ItemGroup>
242+
<!-- Package: Microsoft.AspNetCore.Components.WebAssembly.HttpHandler-->
243+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.HttpHandler' ">
244+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
245+
</PropertyGroup>
246+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.HttpHandler' AND '$(TargetFramework)' == 'netstandard2.1' " />
247+
<!-- Package: Microsoft.JSInterop.WebAssembly-->
248+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' ">
249+
<BaselinePackageVersion>3.2.0</BaselinePackageVersion>
250+
</PropertyGroup>
251+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' AND '$(TargetFramework)' == 'netstandard2.1' ">
252+
<BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.3, )" />
253+
</ItemGroup>
204254
<!-- Package: Microsoft.AspNetCore.ConcurrencyLimiter-->
205255
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ConcurrencyLimiter' ">
206256
<BaselinePackageVersion>3.1.5</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.5" />
11+
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.0" />
1112
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.5" />
1213
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.5" />
1314
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.5" />
@@ -30,6 +31,12 @@ Update this list when preparing for a new patch.
3031
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.5" />
3132
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.5" />
3233
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.5" />
34+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
35+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" />
36+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0" />
37+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.0" />
38+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.0" />
39+
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.0" />
3340
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.5" />
3441
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.5" />
3542
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.5" />

‎eng/Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +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\Templates\src\content\**\*.*proj;
37+
$(RepoRoot)src\Components\WebAssembly\Build\testassets\**\*.csproj;
38+
$(RepoRoot)src\ProjectTemplates\ComponentsWebAssembly.ProjectTemplates\content\**\*.csproj;
3839
$(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.csproj;
3940
$(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.fsproj;
4041
$(RepoRoot)src\ProjectTemplates\Web.Spa.ProjectTemplates\content\**\*.csproj;

‎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)" />

‎eng/ProjectReferences.props

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,14 @@
5555
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" ProjectPath="$(RepoRoot)src\SignalR\common\Protocols.NewtonsoftJson\src\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj" />
5656
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Specification.Tests" ProjectPath="$(RepoRoot)src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj" />
5757
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" ProjectPath="$(RepoRoot)src\SignalR\server\StackExchangeRedis\src\Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj" />
58-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor" ProjectPath="$(RepoRoot)src\Components\Blazor\Blazor\src\Microsoft.AspNetCore.Blazor.csproj" />
59-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Build" ProjectPath="$(RepoRoot)src\Components\Blazor\Build\src\Microsoft.AspNetCore.Blazor.Build.csproj" />
60-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.HttpClient" ProjectPath="$(RepoRoot)src\Components\Blazor\Http\src\Microsoft.AspNetCore.Blazor.HttpClient.csproj" />
61-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Server" ProjectPath="$(RepoRoot)src\Components\Blazor\Server\src\Microsoft.AspNetCore.Blazor.Server.csproj" />
62-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.DataAnnotations.Validation" ProjectPath="$(RepoRoot)src\Components\Blazor\Validation\src\Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj" />
6358
<ProjectReferenceProvider Include="Ignitor" ProjectPath="$(RepoRoot)src\Components\Ignitor\src\Ignitor.csproj" />
59+
<ProjectReferenceProvider Include="Microsoft.Authentication.WebAssembly.Msal" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Authentication.Msal\src\Microsoft.Authentication.WebAssembly.Msal.csproj" />
60+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Build" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Build\src\Microsoft.AspNetCore.Components.WebAssembly.Build.csproj" />
61+
<ProjectReferenceProvider Include="blazor-brotli" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Compression\src\Microsoft.AspNetCore.Components.WebAssembly.Build.BrotliCompression.csproj" />
62+
<ProjectReferenceProvider Include="Microsoft.JSInterop.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\JSInterop\src\Microsoft.JSInterop.WebAssembly.csproj" />
63+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Server" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Server\src\Microsoft.AspNetCore.Components.WebAssembly.Server.csproj" />
64+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly.Authentication\src\Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj" />
65+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly\src\Microsoft.AspNetCore.Components.WebAssembly.csproj" />
6466
<ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />
6567
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.Abstractions" ProjectPath="$(RepoRoot)src\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\DataProtection\Abstractions\ref\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" />
6668
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Cryptography.Internal" ProjectPath="$(RepoRoot)src\DataProtection\Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj" RefProjectPath="$(RepoRoot)src\DataProtection\Cryptography.Internal\ref\Microsoft.AspNetCore.Cryptography.Internal.csproj" />

‎eng/Version.Details.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.1.0-preview4.19605.1" Pinned="true">
13-
<Uri>https://github.com/aspnet/Blazor</Uri>
14-
<Sha>7868699de745fd30a654c798a99dc541b77b95c0</Sha>
12+
<Dependency Name="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="3.2.0">
13+
<Uri>https://github.com/dotnet/blazor</Uri>
14+
<Sha>cc449601d638ffaab58ae9487f0fd010bb178a12</Sha>
15+
</Dependency>
16+
<Dependency Name="System.Net.Http.Json" Version="3.2.0">
17+
<Uri>https://github.com/dotnet/corefx</Uri>
18+
<Sha>66409e392d64ed96e5d3a5fda712d9baf51196ed</Sha>
1519
</Dependency>
1620
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.1.5">
1721
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri>

‎eng/Versions.props

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>6</AspNetCorePatchVersion>
1212
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
13+
14+
<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
15+
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
16+
<ComponentsWebAssemblyPatchVersion>1</ComponentsWebAssemblyPatchVersion>
17+
1318
<!--
1419
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1520
-->
@@ -19,9 +24,6 @@
1924
<IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
2025
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
2126
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
22-
<!-- Blazor Client packages will not RTM with 3.1 -->
23-
<BlazorClientPreReleasePreviewNumber>4</BlazorClientPreReleasePreviewNumber>
24-
<BlazorClientPreReleaseVersionLabel>preview$(BlazorClientPreReleasePreviewNumber)</BlazorClientPreReleaseVersionLabel>
2527
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
2628
<!-- The following property may need to be updated if ingesting new versions of Extensions.Refs package. The package override version is used to create PackageOverrides.txt in the targeting pack. -->
2729
<MicrosoftInternalExtensionsRefsPackageOverrideVersion>3.1.0</MicrosoftInternalExtensionsRefsPackageOverrideVersion>
@@ -30,6 +32,7 @@
3032
<!-- Servicing builds have different characteristics for the way dependencies, framework references, and versions are handled. -->
3133
<IsServicingBuild Condition=" '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
3234
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
35+
<ComponentsWebAssemblyVersionPrefix>$(ComponentsWebAssemblyMajorVersion).$(ComponentsWebAssemblyMinorVersion).$(ComponentsWebAssemblyPatchVersion)</ComponentsWebAssemblyVersionPrefix>
3336
<!-- TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats. -->
3437
<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>
3538
<!-- Targeting packs do not produce patch versions in servicing builds. No API changes are allowed in patches. -->
@@ -92,12 +95,13 @@
9295
<SystemServiceProcessServiceControllerPackageVersion>4.7.0</SystemServiceProcessServiceControllerPackageVersion>
9396
<SystemTextEncodingsWebPackageVersion>4.7.1</SystemTextEncodingsWebPackageVersion>
9497
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
98+
<SystemNetHttpJsonPackageVersion>3.2.0</SystemNetHttpJsonPackageVersion>
9599
<SystemThreadingChannelsPackageVersion>4.7.1</SystemThreadingChannelsPackageVersion>
96100
<SystemWindowsExtensionsPackageVersion>4.7.0</SystemWindowsExtensionsPackageVersion>
97101
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
98102
<MicrosoftNETCorePlatformsPackageVersion>3.1.1</MicrosoftNETCorePlatformsPackageVersion>
99103
<!-- Packages from aspnet/Blazor -->
100-
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.1.0-preview4.19605.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
104+
<MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
101105
<!-- Packages from aspnet/Extensions -->
102106
<InternalAspNetCoreAnalyzersPackageVersion>3.1.5-servicing.20270.9</InternalAspNetCoreAnalyzersPackageVersion>
103107
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.5-servicing.20270.9</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>

‎eng/scripts/CodeCheck.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ try {
138138
Get-ChildItem "$repoRoot/*.sln" -Recurse `
139139
| ? {
140140
# These .sln files are used by the templating engine.
141-
($_.Name -ne "BlazorServerWeb_CSharp.sln")
141+
(($_.Name -ne "BlazorServerWeb_CSharp.sln") -and ($_.Name -ne 'ComponentsWebAssembly-CSharp.sln'))
142142
} `
143143
| % {
144144
Write-Host " Checking $(Split-Path -Leaf $_)"

0 commit comments

Comments
 (0)