Skip to content

Commit 1247d57

Browse files
committed
Fix bad merge
1 parent b33b4a0 commit 1247d57

File tree

1 file changed

+0
-35
lines changed

1 file changed

+0
-35
lines changed

src/Exceptionless.Web/Exceptionless.Web.csproj

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -54,39 +54,4 @@
5454
<None Include="$(AngularSpaRoot)**" Exclude="$(AngularSpaRoot)node_modules\**;" />
5555
</ItemGroup>
5656

57-
<Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
58-
<!-- Ensure Node.js is installed -->
59-
<Exec Command="node --version" ContinueOnError="true">
60-
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
61-
</Exec>
62-
<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
63-
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
64-
<Exec WorkingDirectory="$(SpaRoot)" Command="npm ci" />
65-
</Target>
66-
67-
<Target Name="PublishRunWebBuild" AfterTargets="ComputeFilesToPublish" Condition="'$(SkipSpaPublish)' != 'true'">
68-
<!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
69-
<Exec WorkingDirectory="$(SpaRoot)" Command="npm ci" />
70-
<Exec WorkingDirectory="$(SpaRoot)" Command="npm run build" />
71-
<Exec WorkingDirectory="$(AngularSpaRoot)" Command="npm ci" />
72-
<Exec WorkingDirectory="$(AngularSpaRoot)" Command="npm run build" />
73-
74-
<!-- Include the newly-built files in the publish output -->
75-
<ItemGroup>
76-
<DistFiles Include="$(SpaRoot)build\**" />
77-
<ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
78-
<RelativePath>wwwroot\next\%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
79-
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
80-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
81-
</ResolvedFileToPublish>
82-
</ItemGroup>
83-
<ItemGroup>
84-
<DistFiles Include="$(AngularSpaRoot)dist\**" />
85-
<ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
86-
<RelativePath>wwwroot\%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
87-
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
88-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
89-
</ResolvedFileToPublish>
90-
</ItemGroup>
91-
</Target>
9257
</Project>

0 commit comments

Comments
 (0)