Copy sergen output to src/artifacts/sergen during pack and use it from there instead of Serenity.CodeGenerator/bin/ folder which causes locks during build sometimes. This means for a clean build, dotnet pack should be run from the Serenity.CodeGenerator folder first, or it will use old sergen tool from nuget.

volkanceylan · volkanceylan · commit e24506e53bf6 · 2024-12-15T18:46:38.000+03:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -61,18 +61,10 @@ jobs:
       run: npm install
       working-directory: "./serene/src/Serene.Web"
 
-    - name: dotnet build Serenity.Net.CodeGenerator
-      run: dotnet build 
+    - name: dotnet pack Serenity.Net.CodeGenerator
+      run: dotnet pack 
       working-directory: "./src/Serenity.Net.CodeGenerator"
 
-    - name: dotnet tool restore commmon-features
-      run: dotnet tool restore
-      working-directory: "./common-features/src"
-
-    - name: dotnet tool restore Serene
-      run: dotnet tool restore
-      working-directory: "./serene/src/Serene.Web"
-
     - name: dotnet build Serenity.sln
       run: dotnet build /p:SkipNodeScripts=true
 
diff --git a/common-features/build/Feature.Build.props b/common-features/build/Feature.Build.props
@@ -7,7 +7,7 @@
     <SerenityDir Condition="'$(SerenityDir)' == '' And Exists('$(MSBuildThisFileDirectory)..\..\Serenity.sln')">$(MSBuildThisFileDirectory)..\..\</SerenityDir>
     <SerenitySrc Condition="'$(SerenitySrc)' == ''">$(SerenityDir)src\</SerenitySrc>
     <SerenityWebProj Condition="'$(SerenityWebProj)' == ''">$(SerenitySrc)Serenity.Net.Web\Serenity.Net.Web.csproj</SerenityWebProj>
-    <DotNetSergenDir>$(SerenitySrc)Serenity.Net.CodeGenerator\bin\</DotNetSergenDir>
+    <DotNetSergenDir>$(SerenitySrc)artifacts\artifacts\sergen\</DotNetSergenDir>
     <DotNetSergen Condition="'$(DotNetSergen)' == '' And Exists('$(DotNetSergenDir)sergen')">$(DotNetSergenDir)sergen</DotNetSergen>
     <DotNetSergen Condition="'$(DotNetSergen)' == '' And Exists('$(DotNetSergenDir)sergen.exe')">$(DotNetSergenDir)sergen.exe</DotNetSergen>
     <DotNetSergen Condition="'$(DotNetSergen)' == ''">dotnet sergen</DotNetSergen>
diff --git a/serene/src/Serene.Web/Serene.Web.csproj b/serene/src/Serene.Web/Serene.Web.csproj
@@ -8,7 +8,7 @@
     <!--#if (IsNotTemplate)-->
     <CommonSrc>..\..\..\common-features\src\</CommonSrc>
     <SerenitySrc>..\..\..\src\</SerenitySrc>
-    <DotNetSergenDir>$(SerenitySrc)Serenity.Net.CodeGenerator\bin\</DotNetSergenDir>
+    <DotNetSergenDir>$(SerenitySrc)artifacts\sergen\</DotNetSergenDir>
     <DotNetSergen Condition="Exists('$(DotNetSergenDir)sergen')">$(DotNetSergenDir)sergen</DotNetSergen>
     <DotNetSergen Condition="Exists('$(DotNetSergenDir)sergen.exe')">$(DotNetSergenDir)sergen.exe</DotNetSergen>
     <DefineConstants>$(DefineConstants);Northwind;BasicSamples</DefineConstants>
@@ -67,7 +67,7 @@
     </ItemGroup>
   </Target>
   <Target Name="TransformMvcClientTypes" BeforeTargets="BeforeBuild" DependsOnTargets="SetSergenTransformArgs">
-    <Exec Command="dotnet tool restore" ContinueOnError="true" />
+    <Exec Command="dotnet tool restore" ContinueOnError="true" Condition="'$(DotNetSergen)' == 'dotnet sergen'" />
     <Exec Command="$(DotNetSergen) mvct $(SergenTransformArgs)" ContinueOnError="true" />
   </Target>
   <Target Name="TransformServerTypings" AfterTargets="AfterBuild" DependsOnTargets="SetSergenTransformArgs">
diff --git a/src/Serenity.Net.CodeGenerator/Serenity.Net.CodeGenerator.csproj b/src/Serenity.Net.CodeGenerator/Serenity.Net.CodeGenerator.csproj
@@ -27,4 +27,10 @@
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" />
     <PackageReference Include="Spectre.Console" Version="0.49.1" />
   </ItemGroup>
+  <Target Name="CopySergenToArtifacts" AfterTargets="CopyFilesToOutputDirectory">
+    <ItemGroup>
+      <_OutputFilesToCopy Include="$(OutDir)\**\*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(_OutputFilesToCopy)" DestinationFolder="$(MSBuildProjectDirectory)\..\artifacts\sergen\%(RecursiveDir)" UseHardlinksIfPossible="true" SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true" />
+  </Target>
 </Project>
