Skip to content

Commit bb889c5

Browse files
author
Mackinnon Buck
committed
Disable blazor.webview.js check when not building nodejs
1 parent 3ba179a commit bb889c5

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,14 @@
6464
</PropertyGroup>
6565

6666
<!-- blazor.webview.js should exist after eng/Npm.Workspace.nodeproj builds. Fall back if not. -->
67-
<Target Name="_CheckBlazorWebViewJSPath" AfterTargets="ResolveProjectReferences" Condition=" !EXISTS('$(BlazorWebViewJSFile)') ">
68-
<Warning Text="'$(BlazorWebViewJSFile)' does not exist. Falling back to checked-in copy." />
69-
<PropertyGroup>
70-
<BlazorWebViewJSFile>..\..\..\Web.JS\dist\Release\$(BlazorWebViewJSFilename)</BlazorWebViewJSFile>
71-
</PropertyGroup>
67+
<Target Name="_CheckBlazorWebViewJSPath" AfterTargets="ResolveProjectReferences" Condition=" '$(BuildNodeJS)' == 'true' AND !EXISTS('$(BlazorWebViewJSFile)') ">
68+
<Error Text="'$(BlazorWebViewJSFile)' does not exist. Falling back to checked-in copy." />
7269
</Target>
7370

7471
<Target Name="_AddEmbeddedBlazorWebView" BeforeTargets="_CalculateEmbeddedFilesManifestInputs" DependsOnTargets="_CheckBlazorWebViewJSPath">
7572
<ItemGroup>
7673
<EmbeddedResource Include="blazor.modules.json" LogicalName="_framework/blazor.modules.json" />
77-
<EmbeddedResource Include="$(BlazorWebViewJSFile)" LogicalName="_framework/$(BlazorWebViewJSFilename)" />
74+
<EmbeddedResource Include="$(BlazorWebViewJSFile)" LogicalName="_framework/$(BlazorWebViewJSFilename)" Condition="Exists('$(BlazorWebViewJSFile)')" />
7875
<EmbeddedResource Include="$(BlazorWebViewJSFile).map" LogicalName="_framework/$(BlazorWebViewJSFilename).map" Condition="Exists('$(BlazorWebViewJSFile).map')" />
7976
</ItemGroup>
8077
</Target>

0 commit comments

Comments
 (0)