From b9d6cfe6946f048d97a4139ae2b84c93efe18713 Mon Sep 17 00:00:00 2001
From: Brady Gaster <bradygaster@Bradys-MacBook-Pro.local>
Date: Sat, 18 Apr 2020 15:09:02 -0700
Subject: [PATCH] fixed the workflow

---
 .../COVIDScreeningApi/Directory.Build.props   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Start/COVIDScreeningApi/COVIDScreeningApi/Directory.Build.props b/Start/COVIDScreeningApi/COVIDScreeningApi/Directory.Build.props
index 422560f..ff8c36b 100644
--- a/Start/COVIDScreeningApi/COVIDScreeningApi/Directory.Build.props
+++ b/Start/COVIDScreeningApi/COVIDScreeningApi/Directory.Build.props
@@ -64,17 +64,6 @@
     <OnError ExecuteTargets="InformCustomerHowToOverrideSwaggerDocName"/>
   </Target>
 
-  <!-- cleanup the Swashbuckle CLI dependencies -->
-  <Target Name="CleanUpAfterSwaggerGeneration" 
-          AfterTargets="CreateSwaggerFile,InformCustomerHowToOverrideSwaggerDocName">
-    <!-- uninstall the Swashbuckle CLI, as it is no longer needed -->
-    <Exec Command="dotnet tool uninstall Swashbuckle.AspNetCore.Cli &gt;&gt; swagger-log.txt" />
-    <!-- delete the log file of our swagger-file-creation process -->
-    <Delete Files="swagger-log.txt" />
-    <!-- remove the tool manifest if we created it -->
-    <RemoveDir Directories=".config" Condition="!$(ToolManifestExists)"/>
-  </Target>
-
   <!-- 
     In the case that the customer isn't using "v1" as the Open API doc, 
     we need to tell them how to mitigate it. 
@@ -82,6 +71,17 @@
   <Target Name="InformCustomerHowToOverrideSwaggerDocName">
     <Message Importance="High" 
              Text="Tell the customers how to unbreak themselves here by setting the 'OpenApiDocumentName' property in their .csproj file to override the default."/>
+    <CallTarget Targets="CleanUpAfterSwaggerGeneration"/>
+  </Target>
+
+  <!-- cleanup the Swashbuckle CLI dependencies -->
+  <Target Name="CleanUpAfterSwaggerGeneration" AfterTargets="CreateSwaggerFile">
+    <!-- uninstall the Swashbuckle CLI, as it is no longer needed -->
+    <Exec Command="dotnet tool uninstall Swashbuckle.AspNetCore.Cli &gt;&gt; swagger-log.txt" />
+    <!-- delete the log file of our swagger-file-creation process -->
+    <Delete Files="swagger-log.txt" />
+    <!-- remove the tool manifest if we created it -->
+    <RemoveDir Directories=".config" Condition="!$(ToolManifestExists)"/>
   </Target>
 
 </Project>
\ No newline at end of file