From d1dedb3a9b7157ffff364ec34f5ba046372be452 Mon Sep 17 00:00:00 2001
From: volkanceylan <volkanceylan@gmail.com>
Date: Thu, 26 Dec 2024 21:08:34 +0300
Subject: [PATCH] Use GenerateComputedBuildStaticWebAssetsDependsOn

---
 common-features/build/Feature.Build.targets | 5 ++++-
 packages/corelib/Serenity.Corelib.csproj    | 2 +-
 packages/sleekgrid                          | 2 +-
 serene/src/Serene.Web/Serene.Web.csproj     | 7 ++++---
 src/RestoreNpmPackages.targets              | 1 +
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/common-features/build/Feature.Build.targets b/common-features/build/Feature.Build.targets
index fdfb8dddef..1896f9e3ff 100644
--- a/common-features/build/Feature.Build.targets
+++ b/common-features/build/Feature.Build.targets
@@ -8,7 +8,10 @@
   </ItemGroup>
   <Import Project="$(SerenitySrc)Serenity.Net.Web\Serenity.Net.Web.targets" Condition="'$(AddAutoRefs)' != 'false'" />
   <Import Project="$(SerenitySrc)RestoreNpmPackages.targets" />
-  <Target Name="CompileProjectTSConfig" AfterTargets="AfterBuild" DependsOnTargets="NpmInstall;RestoreNodeTypes"
+  <PropertyGroup>
+    <GenerateComputedBuildStaticWebAssetsDependsOn>CompileProjectTSConfig;$(GenerateComputedBuildStaticWebAssetsDependsOn)</GenerateComputedBuildStaticWebAssetsDependsOn>
+  </PropertyGroup>
+  <Target Name="CompileProjectTSConfig" DependsOnTargets="NpmInstall;RestoreNodeTypes"
           Condition="Exists('tsconfig.json') And '$(BuildingProject)' != 'false' And '$(DesignTimeBuild)' != 'true'">
     <Message Text="Executing TypeScript compiler for $(ProjectName)..." Importance="high"></Message>
     <Exec Command="node &quot;$(TSJavaScriptFile.Replace('build\\..\tools\', 'tools\'))&quot; -p ./tsconfig.json" Condition="!Exists('tsbuild.js')" ContinueOnError="true" />
diff --git a/packages/corelib/Serenity.Corelib.csproj b/packages/corelib/Serenity.Corelib.csproj
index ba3b401c00..99a9371107 100644
--- a/packages/corelib/Serenity.Corelib.csproj
+++ b/packages/corelib/Serenity.Corelib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
     <Description>NuGet version of @serenity-is/corelib NPM package</Description>
-    <PrepareForBuildDependsOn>TSBuild;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
+    <GenerateComputedBuildStaticWebAssetsDependsOn>TSBuild;$(GenerateComputedBuildStaticWebAssetsDependsOn)</GenerateComputedBuildStaticWebAssetsDependsOn>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\sleekgrid\Serenity.SleekGrid.csproj" />
diff --git a/packages/sleekgrid b/packages/sleekgrid
index 0dc996d7b6..db3543b448 160000
--- a/packages/sleekgrid
+++ b/packages/sleekgrid
@@ -1 +1 @@
-Subproject commit 0dc996d7b6124ae952050be15bb85183934a4c8a
+Subproject commit db3543b4482f2572e2b0ae915dfb62fe435fc0b9
diff --git a/serene/src/Serene.Web/Serene.Web.csproj b/serene/src/Serene.Web/Serene.Web.csproj
index 4cbdb77f29..230cecb3ce 100644
--- a/serene/src/Serene.Web/Serene.Web.csproj
+++ b/serene/src/Serene.Web/Serene.Web.csproj
@@ -4,6 +4,7 @@
     <RootNamespace>Serene</RootNamespace>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <TypeScriptNoEmitOnError>false</TypeScriptNoEmitOnError>
+    <GenerateComputedBuildStaticWebAssetsDependsOn>RunTSBuild;$(GenerateComputedBuildStaticWebAssetsDependsOn)</GenerateComputedBuildStaticWebAssetsDependsOn>
     <!--#if (IsNotTemplate)-->
     <CommonSrc>..\..\..\common-features\src\</CommonSrc>
     <SerenitySrc>..\..\..\src\</SerenitySrc>
@@ -46,12 +47,12 @@
   </ItemGroup>
   <ItemGroup Condition="'$(UseProjectRefs)' == 'false'">
   </ItemGroup>
-  <Target Name="NpmInstall" BeforeTargets="BeforeBuild" Condition="!Exists('node_modules\@serenity-is\tsbuild\package.json')">
-    <Message Text="Installing NPM packages..." Importance="high" />
+  <Target Name="NpmInstall" Condition="!Exists('node_modules\@serenity-is\tsbuild\package.json')">
+    <Message Text="Installing NPM packages for $(ProjectName)..." Importance="high" />
     <Exec Command="npm install" Condition="!Exists('..\..\..\pnpm-workspace.yaml')" />
     <Exec Command="pnpm install" Condition="Exists('..\..\..\pnpm-workspace.yaml')" />
   </Target>
-  <Target Name="RunTSBuild" BeforeTargets="BeforeBuild;GenerateStaticWebAssetsManifest" DependsOnTargets="RestoreNodeTypes;NpmInstall" Condition="'$(SkipTSBuild)' != 'true'">
+  <Target Name="RunTSBuild" DependsOnTargets="RestoreNodeTypes;NpmInstall" Condition="'$(SkipTSBuild)' != 'true'">
     <Message Text="Executing TypeScript compiler for $(ProjectName)..." Importance="high" />
     <ItemGroup>
       <CleanedEsmFiles Include="wwwroot\esm\**" />
diff --git a/src/RestoreNpmPackages.targets b/src/RestoreNpmPackages.targets
index 1076c5ffc1..a14e4482b4 100644
--- a/src/RestoreNpmPackages.targets
+++ b/src/RestoreNpmPackages.targets
@@ -10,6 +10,7 @@
     </ItemGroup>
   </Target>
   <Target Name="NpmInstall" Condition="'$(SkipNodeScripts)' != 'true'" DependsOnTargets="ComputeNpmPackageMetadata" Inputs="@(NpmPackageFile)" Outputs="%(NpmPackageFile.StampFile)">
+    <Message Text="Installing NPM packages for $(ProjectName)..." Importance="high" />  
     <Exec Command="%(NpmPackageFile.InstallCommand)" WorkingDirectory="%(WorkingDir)"  />
     <Touch Files="%(NpmPackageFile.StampFile)" AlwaysCreate="true" Condition="Exists('%(NodeModulesDir)')" ContinueOnError="true" />
   </Target>