Remove EnablePInvokeAnalyzer exceptions and replace with data files.

5 files changed, 66 insertions, 6 deletions

diff --git a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
index 2d7b02cd61..8ab0533cdf 100644
--- a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
+++ b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
@@ -7,8 +7,6 @@
     <AssemblyName>System.ComponentModel.TypeConverter</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <!-- TODO: RE-ENABLE THIS -->
-    <EnablePInvokeAnalyzer>false</EnablePInvokeAnalyzer>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
diff --git a/src/System.Drawing.Common/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Drawing.Common/src/PinvokeAnalyzerExceptionList.analyzerdata
new file mode 100644
index 0000000000..4147d127f5
--- /dev/null
+++ b/src/System.Drawing.Common/src/PinvokeAnalyzerExceptionList.analyzerdata
@@ -0,0 +1,65 @@
+comdlg32.dll!PrintDlg
+comdlg32.dll!PrintDlg
+gdi32.dll!AbortDoc
+gdi32.dll!AddFontResourceEx
+gdi32.dll!BitBlt
+gdi32.dll!CombineRgn
+gdi32.dll!CreateCompatibleBitmap
+gdi32.dll!CreateCompatibleDC
+gdi32.dll!CreateCompatibleDC
+gdi32.dll!CreateDC
+gdi32.dll!CreateDIBSection
+gdi32.dll!CreateFontIndirect
+gdi32.dll!CreateIC
+gdi32.dll!CreateRectRgn
+gdi32.dll!CreateRectRgn
+gdi32.dll!DeleteDC
+gdi32.dll!DeleteDC
+gdi32.dll!DeleteObject
+gdi32.dll!DeleteObject
+gdi32.dll!EndDoc
+gdi32.dll!EndPage
+gdi32.dll!ExtEscape
+gdi32.dll!ExtEscape
+gdi32.dll!GetClipRgn
+gdi32.dll!GetClipRgn
+gdi32.dll!GetCurrentObject
+gdi32.dll!GetDeviceCaps
+gdi32.dll!GetDIBits
+gdi32.dll!GetObject
+gdi32.dll!GetObject
+gdi32.dll!GetObjectType
+gdi32.dll!GetPaletteEntries
+gdi32.dll!GetRgnBox
+gdi32.dll!GetStockObject
+gdi32.dll!IntersectClipRect
+gdi32.dll!OffsetViewportOrgEx
+gdi32.dll!ResetDC
+gdi32.dll!RestoreDC
+gdi32.dll!SaveDC
+gdi32.dll!SelectClipRgn
+gdi32.dll!SelectClipRgn
+gdi32.dll!SelectObject
+gdi32.dll!StartDoc
+gdi32.dll!StartPage
+kernel32.dll!RtlMoveMemory
+shell32.dll!ExtractAssociatedIcon
+user32.dll!CopyImage
+user32.dll!CreateIconFromResourceEx
+user32.dll!DestroyIcon
+user32.dll!DrawIconEx
+user32.dll!GetDC
+user32.dll!GetDC
+user32.dll!GetIconInfo
+user32.dll!GetSysColor
+user32.dll!GetSystemMetrics
+user32.dll!LoadIcon
+user32.dll!ReleaseDC
+user32.dll!ReleaseDC
+user32.dll!SystemParametersInfo
+user32.dll!SystemParametersInfo
+user32.dll!WindowFromDC
+winspool.drv!DeviceCapabilities
+winspool.drv!DocumentProperties
+winspool.drv!DocumentProperties
+winspool.drv!EnumPrinters
diff --git a/src/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/System.Drawing.Common/src/System.Drawing.Common.csproj
index 0fddb02bd9..0bc4af0a95 100644
--- a/src/System.Drawing.Common/src/System.Drawing.Common.csproj
+++ b/src/System.Drawing.Common/src/System.Drawing.Common.csproj
@@ -6,8 +6,6 @@
     <ProjectGuid>{191B3618-FECD-4ABD-9D6B-5AC90DC33621}</ProjectGuid>
     <DefineConstants>$(DefineConstants);DRAWING_NAMESPACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <!-- TODO: RE-ENABLE THIS -->
-    <EnablePInvokeAnalyzer>false</EnablePInvokeAnalyzer>
     <WarningsNotAsErrors>CS0618</WarningsNotAsErrors>
     <DefineConstants Condition="'$(TargetsWindows)' == 'true'">$(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS</DefineConstants>
     <DefineConstants Condition="'$(TargetsUnix)' == 'true'">$(DefineConstants);CORECLR;NETCORE</DefineConstants>
diff --git a/src/System.Drawing.Primitives/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Drawing.Primitives/src/PinvokeAnalyzerExceptionList.analyzerdata
new file mode 100644
index 0000000000..f34a4770cf
--- /dev/null
+++ b/src/System.Drawing.Primitives/src/PinvokeAnalyzerExceptionList.analyzerdata
@@ -0,0 +1 @@
+user32.dll!GetSysColor
diff --git a/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
index fdc487ae3b..032f8247d1 100644
--- a/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
+++ b/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
@@ -7,8 +7,6 @@
     <AssemblyName>System.Drawing.Primitives</AssemblyName>
     <ProjectGuid>{8F472B93-574C-4AEC-9D28-6C2360A55BBF}</ProjectGuid>
     <DefineConstants Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'uap'">$(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS</DefineConstants>
-    <!-- This library contains PInvokes that cannot be used on OneCore. -->
-    <EnablePInvokeAnalyzer>false</EnablePInvokeAnalyzer>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />