Set DisableImplicitFrameworkReferences for all projects (dotnet/corefx#34786)

* Set DisableImplicitFrameworkReferences for all projects

The SDK added targets which require the assets file when framework reference items are set.

We can disable the implicit FrameworkReference item in order to prevent these from running.

* Don't rely on implicit VB imports

DisableImplicitFrameworkReferences also doubles as DisableImplicitNamespaceImports.

Rather than enable this I think it's better just to stop relying on the default imports.

* Add missing reference to EventLog

Commit migrated from https://github.com/dotnet/corefx/commit/6653c5fe2adc7c7fca962df3fdc6675354726951

diff --git a/eng/depProj.targets b/eng/depProj.targets
index c202436..d032988 100644 (file)
--- a/eng/depProj.targets
+++ b/eng/depProj.targets
@@ -36,8 +36,6 @@ See the LICENSE file in the project root for more information.
   <PropertyGroup>
     <!-- Always raise runtime/lib items even for frameworks that may not use them -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <!-- Don't reference implicit framework packages, depprojs are meant to be wholy explicit -->
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <!-- We don't need the SDK to validate that we get runtime packages -->
     <EnsureRuntimePackageDependencies>false</EnsureRuntimePackageDependencies>
     <!-- don't generate netcoreapp files -->

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
index 91136a0..2f8301e 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
@@ -108,8 +108,4 @@
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsUap)' == 'true'">
-    <!-- UAP is missing default imports -->
-    <Import Include="Microsoft.VisualBasic;System;System.Collections;System.Collections.Generic;System.Diagnostics;System.Linq;System.Xml.Linq;System.Threading.Tasks" />
-  </ItemGroup>
 </Project>

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.Windows.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.Windows.vb
index f6b58a5..977a91e 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.Windows.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.Windows.vb
@@ -4,7 +4,9 @@
 Option Strict On
 Option Explicit On
 
+Imports System
 Imports System.ComponentModel
+Imports System.Diagnostics
 Imports System.Security
 Imports System.Runtime.Versioning
 Imports System.Text

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb
index a04652f..08a1fbc 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/FileSystem.vb
@@ -3,8 +3,12 @@
 ' See the LICENSE file in the project root for more information.
 Option Strict On
 Option Explicit On
+
+Imports System
+Imports System.Collections
 Imports System.Collections.Specialized
 Imports System.ComponentModel
+Imports System.Diagnostics
 Imports System.Globalization
 Imports System.Security
 Imports System.Runtime.Versioning

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/MalformedLineException.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/MalformedLineException.vb
index 9ed1061..f530ce7 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/MalformedLineException.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/MalformedLineException.vb
@@ -4,6 +4,7 @@
 Option Explicit On
 Option Strict On
 
+Imports System
 Imports System.ComponentModel
 Imports System.Globalization
 Imports System.Security

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/SpecialDirectories.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/SpecialDirectories.vb
index 0885133..1f5ca7c 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/SpecialDirectories.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/SpecialDirectories.vb
@@ -3,6 +3,8 @@
 ' See the LICENSE file in the project root for more information.
 Option Strict On
 Option Explicit On
+
+Imports System
 Imports System.Environment
 Imports System.Security
 Imports Microsoft.VisualBasic.CompilerServices.Utils

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/TextFieldParser.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/TextFieldParser.vb
index 91cee42..71130c8 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/TextFieldParser.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/FileIO/TextFieldParser.vb
@@ -4,7 +4,9 @@
 Option Explicit On
 Option Strict On
 
+Imports System
 Imports System.ComponentModel
+Imports System.Diagnostics
 Imports System.Globalization
 Imports System.IO
 Imports System.Text

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/NativeMethods.Windows.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/NativeMethods.Windows.vb
index 651803e..0470a56 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/NativeMethods.Windows.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/NativeMethods.Windows.vb
@@ -4,6 +4,7 @@
 Option Strict On
 Option Explicit On
 
+Imports System
 Imports System.Security
 Imports System.Runtime.InteropServices
 Imports System.Runtime.Versioning

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/NativeTypes.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/NativeTypes.vb
index 40dbb12..cfef037 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/NativeTypes.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/NativeTypes.vb
@@ -4,6 +4,8 @@
 Option Explicit On
 Option Strict On
 
+Imports System
+Imports System.Diagnostics
 Imports System.Security
 Imports System.Runtime.ConstrainedExecution
 Imports System.Runtime.InteropServices

diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/UnsafeNativeMethods.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/UnsafeNativeMethods.vb
index 9205b74..1f9d8dd 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/UnsafeNativeMethods.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Helpers/UnsafeNativeMethods.vb
@@ -2,6 +2,7 @@
 ' The .NET Foundation licenses this file to you under the MIT license.
 ' See the LICENSE file in the project root for more information.
 
+Imports System
 Imports System.Security
 Imports System.Runtime.InteropServices
 Imports System.Runtime.Versioning

diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/FileIOTestBase.vb b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/FileIOTestBase.vb
index c66b565..7d0f1a4 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/FileIOTestBase.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/FileIOTestBase.vb
@@ -4,6 +4,7 @@
 Option Explicit On
 Option Strict On
 
+Imports System
 Imports System.Runtime.CompilerServices
 Imports Xunit
 Namespace Microsoft.VisualBasic.Tests.VB

diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/FileIOTests.vb b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/FileIOTests.vb
index 368d368..15ede09 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/FileIOTests.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/FileIOTests.vb
@@ -5,7 +5,10 @@ Option Explicit On
 Option Strict On
 
 Imports Microsoft.VisualBasic.FileIO
+Imports System
+Imports System.Collections.Generic
 Imports System.Collections.ObjectModel
+Imports System.Linq
 Imports System.Runtime.CompilerServices
 Imports System.Runtime.InteropServices
 Imports System.Text

diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/Helpers.vb b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/Helpers.vb
index 9bae201..a744ccc 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/Helpers.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/Helpers.vb
@@ -4,6 +4,7 @@
 Option Explicit On
 Option Strict On
 
+Imports System
 Imports System.Runtime.CompilerServices
 
 Namespace Microsoft.VisualBasic.Tests.VB

diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/Microsoft.VisualBasic.VB.Tests.vbproj b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/Microsoft.VisualBasic.VB.Tests.vbproj
index 20c0f42..cfa3c78 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/Microsoft.VisualBasic.VB.Tests.vbproj
+++ b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/Microsoft.VisualBasic.VB.Tests.vbproj
@@ -11,8 +11,4 @@
     <Compile Include="FileIOTests.vb" />
     <Compile Include="TextFieldParserTests.vb" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsUap)' == 'true'">
-    <!-- UAP is missing default imports -->
-    <Import Include="Microsoft.VisualBasic;System;System.Collections;System.Collections.Generic;System.Diagnostics;System.Linq;System.Xml.Linq;System.Threading.Tasks" />
-  </ItemGroup>
 </Project>

diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/SpecialDirectoriesTests.vb b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/SpecialDirectoriesTests.vb
index 56abd41..a0131af 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/SpecialDirectoriesTests.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/SpecialDirectoriesTests.vb
@@ -4,6 +4,7 @@
 Option Explicit On
 Option Strict On
 
+Imports System
 Imports System.Environment
 Imports Microsoft.VisualBasic.FileIO
 Imports Xunit

diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/TextFieldParserTests.vb b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/TextFieldParserTests.vb
index cf3855d..cdd8b10 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/tests/VB/TextFieldParserTests.vb
+++ b/src/libraries/Microsoft.VisualBasic.Core/tests/VB/TextFieldParserTests.vb
@@ -5,6 +5,7 @@ Option Explicit On
 Option Strict On
 
 Imports Microsoft.VisualBasic.FileIO
+Imports System
 Imports Xunit
 
 Namespace Microsoft.VisualBasic.Tests.VB

diff --git a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj
index 57b63a0..1179040 100644 (file)
--- a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj
+++ b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj
@@ -13,6 +13,7 @@
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
     <Reference Include="mscorlib" />
     <Reference Include="System" />
+    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true'">
     <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" />

diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
index 81ce847..d78eb58 100644 (file)
--- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
+++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
@@ -2,13 +2,13 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_EventLog</GeneratePlatformNotSupportedAssemblyMessage>
+    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_EventLog</GeneratePlatformNotSupportedAssemblyMessage>
     <!-- Although we have a netstandard configuration, we know we are not currently UAP compatible-->
     <UWPCompatible>false</UWPCompatible>
     <ProjectGuid>{432779B9-3CBD-4871-A7DC-D8A192319DBD}</ProjectGuid>
     <Configurations>net461-Debug;net461-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netfx-Debug;netfx-Release;netstandard-Debug;netstandard-Release</Configurations>
   </PropertyGroup>
-  <ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp'))">
+  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="System\Diagnostics\CompModSwitches.cs" />
     <Compile Include="System\Diagnostics\EntryWrittenEventArgs.cs" />
     <Compile Include="System\Diagnostics\EntryWrittenEventHandler.cs" />
@@ -122,6 +122,7 @@
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
     <Reference Include="mscorlib" />
     <Reference Include="System" />
+    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true'">
     <Reference Include="Microsoft.Win32.Primitives" />