In debug mode, don't enable the linker by default (plus other minor build fixes) (#19374)
* In debug mode, don't enable the linker by default * Fixup * Update Blazor.MonoRuntime.targets * Ensure we have a true/false value. Stop inferring from BlazorLinkOnBuild. * Avoid doing work for ServiceWorkerAssetsManifest when it's not being used * React to BlazorLinkOnBuild->BlazorWebAssemblyEnableLinking rename Co-authored-by: Pranav K <prkrishn@hotmail.com>
This commit is contained in:
parent
4319bbf722
commit
eed3605ae5
|
|
@ -1,6 +1,7 @@
|
||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<BlazorWebAssemblyEnableLinking Condition="$(BlazorWebAssemblyEnableLinking) == ''">true</BlazorWebAssemblyEnableLinking>
|
<BlazorWebAssemblyEnableLinking Condition="'$(BlazorWebAssemblyEnableLinking)' == '' AND '$(Configuration)' != 'Debug'">true</BlazorWebAssemblyEnableLinking>
|
||||||
|
<BlazorWebAssemblyEnableLinking Condition="'$(BlazorWebAssemblyEnableLinking)' == ''">false</BlazorWebAssemblyEnableLinking>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Target
|
<Target
|
||||||
|
|
@ -9,12 +10,8 @@
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="_ResolveBlazorInputs" DependsOnTargets="ResolveReferences;ResolveRuntimePackAssets">
|
<Target Name="_ResolveBlazorInputs" DependsOnTargets="ResolveReferences;ResolveRuntimePackAssets">
|
||||||
<Warning Text="BlazorLinkOnBuild has been renamed to BlazorWebAssemblyEnableLinking. Please update your project files to use the new property."
|
<Error Text="BlazorLinkOnBuild has been renamed to BlazorWebAssemblyEnableLinking. Please update your project files to use the new property."
|
||||||
Condition="'$(BlazorLinkOnBuild)' != ''" />
|
Condition="'$(BlazorLinkOnBuild)' != ''" />
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(BlazorLinkOnBuild)' != ''">
|
|
||||||
<BlazorWebAssemblyEnableLinking>$(BlazorLinkOnBuild)</BlazorWebAssemblyEnableLinking>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- /obj/<<configuration>>/<<targetframework>>/blazor -->
|
<!-- /obj/<<configuration>>/<<targetframework>>/blazor -->
|
||||||
|
|
@ -65,10 +62,6 @@
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="_ResolveBlazorOutputs" DependsOnTargets="_ResolveBlazorOutputsWhenLinked;_ResolveBlazorOutputsWhenNotLinked">
|
<Target Name="_ResolveBlazorOutputs" DependsOnTargets="_ResolveBlazorOutputsWhenLinked;_ResolveBlazorOutputsWhenNotLinked">
|
||||||
<Error
|
|
||||||
Message="Unrecongnized value for BlazorWebAssemblyEnableLinking: '$(BlazorWebAssemblyEnableLinking)'. Valid values are 'true' or 'false'."
|
|
||||||
Condition="'$(BlazorWebAssemblyEnableLinking)' != 'true' AND '$(BlazorWebAssemblyEnableLinking)' != 'false'" />
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
These are the items calculated as the closure of the runtime assemblies, either by calling the linker
|
These are the items calculated as the closure of the runtime assemblies, either by calling the linker
|
||||||
or by calling our custom ResolveBlazorRuntimeDependencies task if the linker was disabled. Other than
|
or by calling our custom ResolveBlazorRuntimeDependencies task if the linker was disabled. Other than
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
<!-- The linker is not incremental, so to support incremental compression in addition to linking we need to compute the hashes of the dlls and
|
<!-- The linker is not incremental, so to support incremental compression in addition to linking we need to compute the hashes of the dlls and
|
||||||
pdbs, write them to a file when they change and use that as input for the compression task instead. -->
|
pdbs, write them to a file when they change and use that as input for the compression task instead. -->
|
||||||
<_BlazorFileToCompress Condition="'$(BlazorLinkOnBuild)' == 'true' and ('%(Extension)' == '.dll' or '%(Extension)' == '.pdb')">
|
<_BlazorFileToCompress Condition="'$(BlazorWebAssemblyEnableLinking)' == 'true' and ('%(Extension)' == '.dll' or '%(Extension)' == '.pdb')">
|
||||||
<InputSource>$([MSBuild]::NormalizePath('$(_BlazorFilesIntermediateOutputPath)%(RelativePath).hash'))</InputSource>
|
<InputSource>$([MSBuild]::NormalizePath('$(_BlazorFilesIntermediateOutputPath)%(RelativePath).hash'))</InputSource>
|
||||||
</_BlazorFileToCompress>
|
</_BlazorFileToCompress>
|
||||||
|
|
||||||
|
|
@ -36,7 +36,7 @@
|
||||||
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<GetFileHash Files="@(_BlazorFileToCompress)" Condition="'$(BlazorLinkOnBuild)' == 'true' and ('%(Extension)' == '.dll' or '%(Extension)' == '.pdb')">
|
<GetFileHash Files="@(_BlazorFileToCompress)" Condition="'$(BlazorWebAssemblyEnableLinking)' == 'true' and ('%(Extension)' == '.dll' or '%(Extension)' == '.pdb')">
|
||||||
<Output TaskParameter="Items" ItemName="_LinkerOutputHashes" />
|
<Output TaskParameter="Items" ItemName="_LinkerOutputHashes" />
|
||||||
</GetFileHash>
|
</GetFileHash>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
<UsingTask TaskName="GenerateServiceWorkerAssetsManifest" AssemblyFile="$(_BlazorTasksPath)" />
|
<UsingTask TaskName="GenerateServiceWorkerAssetsManifest" AssemblyFile="$(_BlazorTasksPath)" />
|
||||||
|
|
||||||
<Target Name="_WriteServiceWorkerAssetsManifest"
|
<Target Name="_WriteServiceWorkerAssetsManifest"
|
||||||
|
Condition="'$(ServiceWorkerAssetsManifest)' != ''"
|
||||||
Inputs="@(ServiceWorkerAssetsManifestItem)"
|
Inputs="@(ServiceWorkerAssetsManifestItem)"
|
||||||
Outputs="$(_ServiceWorkerAssetsManifestIntermediateOutputPath)"
|
Outputs="$(_ServiceWorkerAssetsManifestIntermediateOutputPath)"
|
||||||
BeforeTargets="_BlazorStaticWebAssetsCopyGeneratedFilesToOutputDirectory"
|
BeforeTargets="_BlazorStaticWebAssetsCopyGeneratedFilesToOutputDirectory"
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
|
||||||
{
|
{
|
||||||
// Arrange
|
// Arrange
|
||||||
using var project = ProjectDirectory.Create("standalone");
|
using var project = ProjectDirectory.Create("standalone");
|
||||||
var result = await MSBuildProcessManager.DotnetMSBuild(project, args: "/p:BlazorLinkOnBuild=false");
|
var result = await MSBuildProcessManager.DotnetMSBuild(project, args: "/p:BlazorWebAssemblyEnableLinking=false");
|
||||||
|
|
||||||
Assert.BuildPassed(result);
|
Assert.BuildPassed(result);
|
||||||
|
|
||||||
|
|
@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
|
||||||
// Assert
|
// Assert
|
||||||
for (var i = 0; i < 3; i++)
|
for (var i = 0; i < 3; i++)
|
||||||
{
|
{
|
||||||
result = await MSBuildProcessManager.DotnetMSBuild(project, args: "/p:BlazorLinkOnBuild=false");
|
result = await MSBuildProcessManager.DotnetMSBuild(project, args: "/p:BlazorWebAssemblyEnableLinking=false");
|
||||||
Assert.BuildPassed(result);
|
Assert.BuildPassed(result);
|
||||||
|
|
||||||
var newThumbPrint = FileThumbPrint.CreateFolderThumbprint(project, compressedFilesFolder);
|
var newThumbPrint = FileThumbPrint.CreateFolderThumbprint(project, compressedFilesFolder);
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Razor" TreatAsLocalProperty="BlazorLinkOnBuild">
|
<Project Sdk="Microsoft.NET.Sdk.Razor" TreatAsLocalProperty="BlazorWebAssemblyEnableLinking">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netstandard2.1</TargetFramework>
|
<TargetFramework>netstandard2.1</TargetFramework>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue