Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<!-- By default the SDK produces ref assembly for 5.0 or later -->
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<!-- We have very special projects that don't always contain default references. We also build MSBuild Tasks
and there are some implicit namespaces that clash, i.e System.Threading.Tasks. -->
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/tools/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<IsShipping>false</IsShipping>
<SignAssembly>false</SignAssembly>
<RunAnalyzers>false</RunAnalyzers>
<DisableImplicitNamespaceImports_DotNet>true</DisableImplicitNamespaceImports_DotNet>
</PropertyGroup>

<!-- MSBuild doesn't understand the Checked configuration -->
Expand Down
4 changes: 0 additions & 4 deletions src/libraries/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@
'$(DisableImplicitFrameworkReferences)' != 'true' and
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
('$(IsReferenceAssembly)' == 'true' or '$(IsSourceProject)' == 'true')">true</DisableImplicitAssemblyReferences>

<!-- When we disable implicit assembly references disabling namespace imports is not handled by the SDK as this is our custom
way to disable assembly references for OOBs. -->
<DisableImplicitNamespaceImports Condition="'$(DisableImplicitAssemblyReferences)' == 'true'">true</DisableImplicitNamespaceImports>
</PropertyGroup>

<Import Project="$(RepositoryEngineeringDir)versioning.targets" />
Expand Down