Browse Source
Merge pull request #8655 from abpframework/liangshiwei/patch-1
Resolved the conflicted import paths
pull/8662/head
maliming
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
17 additions and
2 deletions
-
templates/app/aspnet-core/common.props
-
templates/module/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> |
|
|
|
@ -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> |
