Skip to content

Commit 56e2080

Browse files
authored
Always fully build Components.Server.csproj (#9421)
* Always fully build Components.Server.csproj * Use pre-built js files instead of building on the fly * Use a sourcemap file for Debug. .gitignore sourcemap files * Install nodejs on CodeCheck agents Fixes #9402
1 parent 2f6b888 commit 56e2080

15 files changed

+17406
-43
lines changed

.azure/pipelines/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
jobDisplayName: Code check
2525
agentOs: Windows
2626
installJdk: false
27-
installNodeJs: false
2827
steps:
2928
- powershell: ./eng/scripts/CodeCheck.ps1 -ci
3029
displayName: Run eng/scripts/CodeCheck.ps1

eng/scripts/CodeCheck.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ try {
130130
& $dotnet run -p "$repoRoot/eng/tools/BaselineGenerator/"
131131
}
132132

133+
Write-Host "Re-generating Browser.JS files"
134+
Invoke-Block {
135+
& $dotnet build "$repoRoot\src\Components\Browser.JS\Microsoft.AspNetCore.Components.Browser.JS.npmproj"
136+
}
137+
133138
Write-Host "Run git diff to check for pending changes"
134139

135140
# Redirect stderr to stdout because PowerShell does not consistently handle output to stderr

eng/targets/Npm.Common.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<Target Name="Restore">
2020
<Message Importance="High" Text="Running yarn install on $(MSBuildProjectFullPath)" />
21-
<Yarn Command="install $(InstallArgs)" />
21+
<Yarn Command="install $(InstallArgs)" StandardOutputImportance="High" StandardErrorImportance="High" />
2222
</Target>
2323

2424
<Target Name="PrepareForBuild">

src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<PropertyGroup>
2525
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
2626
<NuspecProperties>
27+
configuration=$(Configuration);
2728
version=$(PackageVersion);
2829
publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir)));
2930
componentsversion=$(ComponentsPackageVersion);

src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<file src="build\**" target="build" />
2222
<file src="targets\**" target="targets" />
2323
<file src="$publishdir$netcoreapp3.0\**\*" target="tools/" />
24-
<file src="..\..\..\Browser.JS\src\dist\blazor.*.js" target="tools/blazor" />
24+
<file src="..\..\..\Browser.JS\dist\$configuration$\blazor.*.js" target="tools/blazor" />
2525
</files>
2626
</package>

src/Components/Blazor/Build/src/ReferenceFromSource.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<PropertyGroup>
1313
<BlazorBuildReferenceFromSource>true</BlazorBuildReferenceFromSource>
14-
<BlazorJsPath>$(RepositoryRoot)src\Components\Browser.JS\src\dist\blazor.*.js</BlazorJsPath>
14+
<BlazorJsPath>$(RepositoryRoot)src\Components\Browser.JS\dist\$(Configuration)\blazor.*.js</BlazorJsPath>
1515
</PropertyGroup>
1616

1717
<Import Project="$(MSBuildThisFileDirectory)targets/All.props" />

src/Components/Browser.JS/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
node_modules/
2-
dist/
2+
*.js.map

src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,23 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<WebpackInputs Include="**\*.ts" Exclude="node_modules\**" />
11-
<WebPackOutputs Include="src\dist\blazor.webassembly.js" />
12-
<WebPackOutputs Include="src\dist\blazor.server.js" />
10+
<WebpackInputs Include="src\**\*.ts" />
11+
<WebPackOutputs Include="dist\Debug\blazor.webassembly.js" />
12+
<WebPackOutputs Include="dist\Release\blazor.webassembly.js" />
13+
<WebPackOutputs Include="dist\Debug\blazor.server.js" />
14+
<WebPackOutputs Include="dist\Release\blazor.server.js" />
1315
</ItemGroup>
1416

1517
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
1618

17-
<!--
18-
Invoking build[.cmd|.sh] does not restore npm projects by default. This is a performance optimization.
19-
However, we want to ensure yarn's restored before a P2P build happens. We'll conservatively yarn install
20-
if the node_modules directory is missing.
21-
-->
22-
<Target Name="FastRestore" DependsOnTargets="Restore" Condition="!Exists('node_modules')" />
23-
2419
<!-- Override the default 'Build' target from eng/targets/Npm.Common.targets. -->
2520
<Target Name="Build"
26-
DependsOnTargets="FastRestore"
2721
Inputs="@(WebpackInputs)"
2822
Outputs="@(WebPackOutputs)">
2923
<RemoveDir Directories="dist" />
30-
<Yarn Command="run build:debug" Condition="'$(Configuration)' == 'Debug'" />
31-
<Yarn Command="run build:production" Condition="'$(Configuration)' != 'Debug'" />
24+
25+
<Yarn Command="run build:debug" StandardOutputImportance="High" StandardErrorImportance="High" />
26+
<Yarn Command="run build:production" StandardOutputImportance="High" StandardErrorImportance="High" />
3227
</Target>
3328

3429
</Project>

src/Components/Browser.JS/dist/Debug/blazor.server.js

Lines changed: 14908 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)