Merge pull request #8655 from abpframework/liangshiwei/patch-1

Resolved the conflicted import paths
5 years ago · 857ace673f
parent 2fc0b2d910 bb4da57cbb
commit 857ace673f
2 changed files with 17 additions and 2 deletions
--- a/templates/app/aspnet-core/common.props
+++ b/templates/app/aspnet-core/common.props
@ -2,7 +2,14 @@
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
    <Version>1.0.0</Version>
-    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
 	<AbpProjectType>app</AbpProjectType>
  </PropertyGroup>
+
+  <Target Name="NoWarnOnRazorViewImportedTypeConflicts" BeforeTargets="RazorCoreCompile">
+    <PropertyGroup>
+      <NoWarn>$(NoWarn);0436</NoWarn>
+    </PropertyGroup>
+  </Target>
+
 </Project>
--- a/templates/module/aspnet-core/common.props
+++ b/templates/module/aspnet-core/common.props
@ -2,7 +2,7 @@
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
    <Version>0.1.0</Version>
-    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
    <AbpProjectType>module</AbpProjectType>
  </PropertyGroup>
  
@ -13,4 +13,12 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
  </ItemGroup>
+
+
+  <Target Name="NoWarnOnRazorViewImportedTypeConflicts" BeforeTargets="RazorCoreCompile">
+    <PropertyGroup>
+      <NoWarn>$(NoWarn);0436</NoWarn>
+    </PropertyGroup>
+  </Target>
+
 </Project>