diff --git a/common.props b/common.props
index 6a1fa9c4b1..88dcfe1e36 100644
--- a/common.props
+++ b/common.props
@@ -18,17 +18,17 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(UsingMicrosoftNETSdkWeb)' != 'true' AND '$(UsingMicrosoftNETSdkRazor)' != 'true'">
+    <None Remove="*.abppkg.analyze.json" />
     <Content Include="*.abppkg.analyze.json">
 		<Pack>true</Pack>
 		<PackagePath>content\</PackagePath>
 	</Content>
-    <None Remove="*.abppkg.analyze.json" />
+    <None Remove="*.abppkg.json" />
     <Content Include="*.abppkg.json">
 		<Pack>true</Pack>
 		<PackagePath>content\</PackagePath>
 	</Content>
-    <None Remove="*.abppkg.json" />
   </ItemGroup>
   <ItemGroup Condition="$(AssemblyName.EndsWith('HttpApi.Client'))">
     <EmbeddedResource Include="**\*generate-proxy.json" />