Skip to content

Commit 35a546f

Browse files
committed
Cleaned up javascript build events.
1 parent 23e18e3 commit 35a546f

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

perf/NodeJS/Jering.Javascript.NodeJS.Performance.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<ProjectReference Include="..\..\src\NodeJS\Jering.Javascript.NodeJS.csproj" />
2121
</ItemGroup>
2222

23-
<Target Name="YarnInstall" BeforeTargets="DispatchToInnerBuilds;PreBuildEvent">
23+
<Target Name="JavascriptBuild" BeforeTargets="PreBuildEvent">
2424
<Yarn WorkingDirectory=".\Javascript" Command="run build" />
2525
</Target>
2626

src/NodeJS/Jering.Javascript.NodeJS.csproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,11 @@
8383
So we must specify both. This way if we are multi-targeting, JavascriptBuild runs once, before DispatchToInnerBuilds after which inputs == outputs.
8484
If we aren't multi-targeting, JavascriptBuild runs before PreBuildEvent.
8585
-->
86-
<Target Name="JavascriptBuild" BeforeTargets="DispatchToInnerBuilds;PreBuildEvent" Inputs="@(JavascriptInputs)" Outputs="@(JavascriptOutputs)">
86+
<Target Name="JavascriptBuildNonWindows" BeforeTargets="PreBuildEvent" Inputs="@(JavascriptInputs)" Outputs="@(JavascriptOutputs)" Condition="'$(OS)' != 'Windows_NT'">
87+
<Yarn WorkingDirectory=".\Javascript" Command="run build --env.mode=$(Configuration) --env.entry=.\Servers\OutOfProcess\Http\HttpServer.ts" />
88+
</Target>
89+
90+
<Target Name="JavascriptBuildWindows" BeforeTargets="DispatchToInnerBuilds" Inputs="@(JavascriptInputs)" Outputs="@(JavascriptOutputs)" Condition="'$(OS)' == 'Windows_NT'">
8791
<Yarn WorkingDirectory=".\Javascript" Command="run build --env.mode=$(Configuration) --env.entry=.\Servers\OutOfProcess\Http\HttpServer.ts" />
8892
</Target>
8993

test/NodeJS/Jering.Javascript.NodeJS.Tests.csproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@
4444
<EmbeddedResource Include=".\dummyEmbed.txt" LogicalName="dummyEmbed" />
4545
</ItemGroup>
4646

47-
<Target Name="YarnInstall" BeforeTargets="DispatchToInnerBuilds;PreBuildEvent">
47+
<Target Name="JavascriptBuildNonWindows" BeforeTargets="PreBuildEvent" Condition="'$(OS)' != 'Windows_NT'">
48+
<Yarn WorkingDirectory=".\Javascript" Command="run build" />
49+
</Target>
50+
51+
<Target Name="JavascriptBuildWindows" BeforeTargets="DispatchToInnerBuilds" Condition="'$(OS)' == 'Windows_NT'">
4852
<Yarn WorkingDirectory=".\Javascript" Command="run build" />
4953
</Target>
5054

0 commit comments

Comments
 (0)