diff --git a/configureawait.props b/configureawait.props
index 4356600b62..a38cc8a80f 100644
--- a/configureawait.props
+++ b/configureawait.props
@@ -6,4 +6,22 @@
         <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       </PackageReference>
   </ItemGroup>
+
+  <!-- The xsd only feeds editor completion and Fody rewrites it on every run. -->
+  <PropertyGroup>
+      <FodyGenerateXsd>false</FodyGenerateXsd>
+  </PropertyGroup>
+
+  <!-- Component assemblies keep their own FodyWeavers.xml: their lifecycle methods must
+       resume on the renderer's synchronization context. Unconditional because a solution
+       build compiles cross-solution project references with the default configuration. -->
+  <PropertyGroup Condition="$(MSBuildProjectName.EndsWith('.Bundling'))
+                            Or (!$(MSBuildProjectName.Contains('Blazor'))
+                                And !$(MSBuildProjectName.Contains('AspNetCore.Components')))">
+      <WeaverConfiguration Condition="'$(WeaverConfiguration)' == ''">
+          <Weavers>
+              <ConfigureAwait ContinueOnCapturedContext="false" />
+          </Weavers>
+      </WeaverConfiguration>
+  </PropertyGroup>
 </Project>
diff --git a/templates/module/aspnet-core/common.props b/templates/module/aspnet-core/common.props
index 87cf88dc65..19805c1498 100644
--- a/templates/module/aspnet-core/common.props
+++ b/templates/module/aspnet-core/common.props
@@ -14,7 +14,23 @@
     </PackageReference>
   </ItemGroup>
 
+  <!-- The xsd only feeds editor completion and Fody rewrites it on every run. -->
+  <PropertyGroup>
+      <FodyGenerateXsd>false</FodyGenerateXsd>
+  </PropertyGroup>
 
+  <!-- Component assemblies keep their own FodyWeavers.xml: their lifecycle methods must
+       resume on the renderer's synchronization context. Unconditional because a solution
+       build compiles cross-solution project references with the default configuration. -->
+  <PropertyGroup Condition="$(MSBuildProjectName.EndsWith('.Bundling'))
+                            Or (!$(MSBuildProjectName.Contains('Blazor'))
+                                And !$(MSBuildProjectName.Contains('AspNetCore.Components')))">
+      <WeaverConfiguration Condition="'$(WeaverConfiguration)' == ''">
+          <Weavers>
+              <ConfigureAwait ContinueOnCapturedContext="false" />
+          </Weavers>
+      </WeaverConfiguration>
+  </PropertyGroup>
   <Target Name="NoWarnOnRazorViewImportedTypeConflicts" BeforeTargets="RazorCoreCompile">
     <PropertyGroup>
       <NoWarn>$(NoWarn);0436</NoWarn>