Move default setting of DisableImplicitNamespaceImports to .targets

Users set DisableImplicitFrameworkReferences in project file, so if the default is set in .props then it won't affect the value of DisableImplicitNamespaceImports
dotnet · May 18, 2017 · 79d9c53 · 79d9c53
1 parent ffdbc7f
commit 79d9c53
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.VisualBasic.props b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.VisualBasic.props
@@ -20,7 +20,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <OptionCompare Condition=" '$(OptionCompare)' == '' ">Binary</OptionCompare>
     <OptionStrict Condition=" '$(OptionStrict)' == '' ">Off</OptionStrict>
     <OptionInfer Condition=" '$(OptionInfer)' == '' ">On</OptionInfer>
-    <DisableImplicitNamespaceImports Condition="'$(DisableImplicitNamespaceImports)'==''">$(DisableImplicitFrameworkReferences)</DisableImplicitNamespaceImports>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.VisualBasic.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.VisualBasic.targets
@@ -16,6 +16,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   </PropertyGroup>
   <PropertyGroup>
     <DefineConstants>$(DefineConstants),$(ImplicitFrameworkDefine)</DefineConstants>
+    <DisableImplicitNamespaceImports Condition="'$(DisableImplicitNamespaceImports)'==''">$(DisableImplicitFrameworkReferences)</DisableImplicitNamespaceImports>
   </PropertyGroup>
   <ItemGroup Condition=" '$(DisableImplicitNamespaceImports)' != 'true' and '$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <!-- These namespaces are present in 2.0 Framework assemblies -->