From c9dadf7b9fbb205425fbefed8da0cc2ac9a8715f Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Tue, 9 Jul 2024 18:02:09 +0200
Subject: [PATCH] Fix temporary build errors when kiota source files are
 added/removed

---
 docs/usage/openapi-client.md                   | 18 +++++++++++++-----
 .../OpenApiKiotaClientExample.csproj           | 14 +++++++++++---
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/docs/usage/openapi-client.md b/docs/usage/openapi-client.md
index f1c4091c19..a956e77d1c 100644
--- a/docs/usage/openapi-client.md
+++ b/docs/usage/openapi-client.md
@@ -226,16 +226,24 @@ The available command-line switches for Kiota are described [here](https://learn
 
 At the time of writing, Kiota provides [no official integration](https://github.com/microsoft/kiota/issues/3005) with MSBuild.
 Our [example project](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/openapi/src/Examples/OpenApiKiotaClientExample) takes a stab at it,
-although it has glitches. If you're an MSBuild expert, please help out!
+which seems to work. If you're an MSBuild expert, please help out!
 
 ```xml
-<Target Name="KiotaRunTool" BeforeTargets="BeforeCompile;CoreCompile" Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
+<Target Name="RemoveKiotaGeneratedCode" BeforeTargets="BeforeCompile;CoreCompile" Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
+  <ItemGroup>
+    <Compile Remove="**\GeneratedCode\**\*.cs" />
+  </ItemGroup>
+</Target>
+
+<Target Name="KiotaRunTool" BeforeTargets="BeforeCompile;CoreCompile" AfterTargets="RemoveKiotaGeneratedCode"
+  Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
   <Exec
-    Command="dotnet kiota generate --language CSharp --class-name ExampleApiClient --namespace-name OpenApiKiotaClientExample.GeneratedCode --output ./GeneratedCode --backing-store --exclude-backward-compatible --clean-output --clear-cache --openapi ..\JsonApiDotNetCoreExample\GeneratedSwagger\JsonApiDotNetCoreExample.json" />
+    Command="dotnet kiota generate --language CSharp --class-name ExampleApiClient --namespace-name OpenApiKiotaClientExample.GeneratedCode --output ./GeneratedCode --backing-store --exclude-backward-compatible --clean-output --clear-cache --log-level Error --openapi ../JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json" />
+</Target>
 
+<Target Name="IncludeKiotaGeneratedCode" BeforeTargets="BeforeCompile;CoreCompile" AfterTargets="KiotaRunTool"
+  Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
   <ItemGroup>
-    <!-- This isn't entirely reliable: may require a second build after the source swagger.json has changed, to get rid of compile errors. -->
-    <Compile Remove="**\GeneratedCode\**\*.cs" />
     <Compile Include="**\GeneratedCode\**\*.cs" />
   </ItemGroup>
 </Target>
diff --git a/src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj b/src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj
index 220acaedf5..d0877c32e7 100644
--- a/src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj
+++ b/src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj
@@ -20,7 +20,14 @@
     <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="$(KiotaVersion)" />
   </ItemGroup>
 
-  <Target Name="KiotaRunTool" BeforeTargets="BeforeCompile;CoreCompile" Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
+  <Target Name="RemoveKiotaGeneratedCode" BeforeTargets="BeforeCompile;CoreCompile" Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
+    <ItemGroup>
+      <Compile Remove="**\GeneratedCode\**\*.cs" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="KiotaRunTool" BeforeTargets="BeforeCompile;CoreCompile" AfterTargets="RemoveKiotaGeneratedCode"
+    Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
     <!--
       Created from sources:
       - https://github.com/microsoft/kiota/issues/3005#issuecomment-1657806848
@@ -30,10 +37,11 @@
     -->
     <Exec
       Command="dotnet kiota generate --language CSharp --class-name ExampleApiClient --namespace-name OpenApiKiotaClientExample.GeneratedCode --output ./GeneratedCode --backing-store --exclude-backward-compatible --clean-output --clear-cache --log-level Error --openapi ../JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json" />
+  </Target>
 
+  <Target Name="IncludeKiotaGeneratedCode" BeforeTargets="BeforeCompile;CoreCompile" AfterTargets="KiotaRunTool"
+    Condition="$(DesignTimeBuild) != true And $(BuildingProject) == true">
     <ItemGroup>
-      <!-- This isn't entirely reliable: may require a second build after the source swagger.json has changed, to get rid of compile errors. -->
-      <Compile Remove="**\GeneratedCode\**\*.cs" />
       <Compile Include="**\GeneratedCode\**\*.cs" />
     </ItemGroup>
   </Target>