diff --git a/build/Feature.Build.targets b/build/Feature.Build.targets
index 86ef63d..d08a2b3 100644
--- a/build/Feature.Build.targets
+++ b/build/Feature.Build.targets
@@ -9,12 +9,13 @@
     <PropertyGroup>
       <SergenTransformArgs>-p &quot;$(ProjectFileName)&quot; -prop:Configuration=$(Configuration) -prop:AssemblyName=&quot;$(AssemblyName)&quot; -prop:ESMAssetBasePath=&quot;$(ESMAssetBasePath)&quot; -prop:OutDir=&quot;$(OutDir.Trim('\'))&quot; -prop:RootNamespace=$(RootNamespace) -prop:TargetFramework=$(TargetFramework)</SergenTransformArgs>
     </PropertyGroup>
+    <Message Importance="high" Text="Transform Arguments: $(SergenTransformArgs)"/>
   </Target>
   <Target Name="TransformInitTools" BeforeTargets="BeforeBuild" Condition="!Exists('$(DotnetToolManifestFile)')">
     <Exec Command="dotnet new tool-manifest" ContinueOnError="true" WorkingDirectory="$(MSBuildProjectDirectory)\..\" />
     <Exec Command="dotnet tool install sergen" ContinueOnError="true" WorkingDirectory="$(MSBuildProjectDirectory)\..\" />
   </Target>
-  <Target Name="TransformToolRestore" BeforeTargets="BeforeBuild" DependsOnTargets="TransformInitProps;TransformInitTools"
+  <Target Name="TransformToolRestore" BeforeTargets="BeforeBuild" DependsOnTargets="TransformInitTools"
           Inputs="$(DotnetToolManifestFile)" Outputs="$(DotnetToolRestoreStamp)"
           Condition="'$(DotNetSergen)' == 'dotnet sergen' And ('$(SergenTransform)' != '' OR Exists('tsconfig.json'))">
     <Exec Command="dotnet tool restore" ContinueOnError="true" />
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 17ab3bd..1521dcd 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,15 +1,14 @@
 <Project>
   <Import Project="$(MSBuildThisFileDirectory)..\build\Feature.Build.targets" />
-  <Target Name="TransformMvc" BeforeTargets="BeforeBuild" DependsOnTargets="TransformToolRestore"
+  <Target Name="TransformMvc" BeforeTargets="BeforeBuild" DependsOnTargets="TransformInitProps;TransformToolRestore"
           Condition="'$(SergenTransform)' == 'mvc'">
     <Exec Command="$(DotNetSergen) mvc $(SergenTransformArgs)" ContinueOnError="true" />
-    <Message Importance="high" Text="$(SergenTransformArgs)"/>
   </Target>
-  <Target Name="TransformMvct" BeforeTargets="BeforeBuild" DependsOnTargets="TransformToolRestore"
+  <Target Name="TransformMvct" BeforeTargets="BeforeBuild" DependsOnTargets="TransformInitProps;TransformToolRestore"
           Condition="'$(SergenTransform)' == 'mvct' OR '$(SergenTransform)' == 'all'">
     <Exec Command="$(DotNetSergen) mvct $(SergenTransformArgs)" ContinueOnError="true" />
   </Target>
-  <Target Name="TransformServerTypings" AfterTargets="AfterBuild" DependsOnTargets="TransformToolRestore"
+  <Target Name="TransformServerTypings" AfterTargets="AfterBuild" DependsOnTargets="TransformInitProps;TransformToolRestore"
           Condition="'$(SergenTransform)' == 'servertypings' OR '$(SergenTransform)' == 'all'">
     <Exec Command="$(DotNetSergen) servertypings $(SergenTransformArgs)" ContinueOnError="true" />
   </Target>