Update Pinvoke baselines to match latest modernapis.xml entries (#21028)

* Pinvoke updates

* S.S.AccessControl

* csp

* Networking

* Add issues

* comment

* Remove memory mapped file baseline

* Fix RtlGetVersion

* Remove unnecsesary baseline

* Remove dead condition

* Add comments

* Update buildtools

* Add GetKeyState to OneCore baseline

* baselines

* Fix violation in RI

33 files changed, 82 insertions, 182 deletions

diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
index 36592e5283..0d9718e699 100644
--- a/BuildToolsVersion.txt
+++ b/BuildToolsVersion.txt
@@ -1 +1 @@
-2.0.0-prerelease-01712-01
+2.0.0-prerelease-01714-03
\ No newline at end of file
diff --git a/src/System.Console/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Console/src/PinvokeAnalyzerExceptionList.analyzerdata
deleted file mode 100644
index 931b673fcf..0000000000
--- a/src/System.Console/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ /dev/null
@@ -1,28 +0,0 @@
-kernel32.dll!Beep
-kernel32.dll!GetConsoleCursorInfo
-kernel32.dll!SetConsoleCursorInfo
-kernel32.dll!FillConsoleOutputAttribute
-kernel32.dll!FillConsoleOutputCharacterW
-kernel32.dll!GetConsoleScreenBufferInfo
-kernel32.dll!GetConsoleCP
-kernel32.dll!GetConsoleTitleW
-kernel32.dll!GetConsoleMode
-kernel32.dll!SetConsoleMode
-kernel32.dll!GetConsoleOutputCP
-kernel32.dll!GetLargestConsoleWindowSize
-kernel32.dll!GetStdHandle
-kernel32.dll!PeekConsoleInputW
-kernel32.dll!ReadConsoleW
-kernel32.dll!ReadConsoleInputW
-kernel32.dll!ReadConsoleOutputW
-kernel32.dll!SetConsoleCP
-kernel32.dll!SetConsoleCtrlHandler
-kernel32.dll!SetConsoleCursorPosition
-kernel32.dll!SetConsoleOutputCP
-kernel32.dll!SetConsoleScreenBufferSize
-kernel32.dll!SetConsoleTextAttribute
-kernel32.dll!SetConsoleWindowInfo
-kernel32.dll!SetConsoleTitleW
-kernel32.dll!WriteConsoleW
-kernel32.dll!WriteConsoleOutputW
-user32.dll!GetKeyState
\ No newline at end of file
diff --git a/src/System.Console/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp b/src/System.Console/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp
new file mode 100644
index 0000000000..2e448cefb0
--- /dev/null
+++ b/src/System.Console/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp
@@ -0,0 +1,2 @@
+# Windows are adding to OneCore
+user32.dll!GetKeyState
\ No newline at end of file
diff --git a/src/System.Console/src/PinvokeAnalyzerExceptionList.analyzerdata.uap b/src/System.Console/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
new file mode 100644
index 0000000000..acc87f2e33
--- /dev/null
+++ b/src/System.Console/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
@@ -0,0 +1,2 @@
+# Windows are adding to WACK and OneCore
+user32.dll!GetKeyState
\ No newline at end of file
diff --git a/src/System.Diagnostics.FileVersionInfo/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Diagnostics.FileVersionInfo/src/PinvokeAnalyzerExceptionList.analyzerdata
deleted file mode 100644
index 60adf0311b..0000000000
--- a/src/System.Diagnostics.FileVersionInfo/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ /dev/null
@@ -1,4 +0,0 @@
-kernel32.dll!VerLanguageNameW
-version.dll!GetFileVersionInfoExW
-version.dll!GetFileVersionInfoSizeExW
-version.dll!VerQueryValueW
\ No newline at end of file
diff --git a/src/System.Diagnostics.Process/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Diagnostics.Process/src/PinvokeAnalyzerExceptionList.analyzerdata
deleted file mode 100644
index 34132ba704..0000000000
--- a/src/System.Diagnostics.Process/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ /dev/null
@@ -1,35 +0,0 @@
-advapi32.dll!CreateProcessWithLogonW
-advapi32.dll!OpenProcessToken
-kernel32.dll!CreatePipe
-kernel32.dll!CreateProcessW
-kernel32.dll!GetComputerNameW
-kernel32.dll!GetConsoleCP
-kernel32.dll!GetConsoleOutputCP
-kernel32.dll!GetPriorityClass
-kernel32.dll!GetProcessAffinityMask
-kernel32.dll!GetProcessPriorityBoost
-kernel32.dll!GetProcessWorkingSetSizeEx
-kernel32.dll!GetStdHandle
-kernel32.dll!GetThreadPriorityBoost
-kernel32.dll!IsWow64Process
-kernel32.dll!K32EnumProcesses
-kernel32.dll!K32EnumProcessModules
-kernel32.dll!SetPriorityClass
-kernel32.dll!SetProcessAffinityMask
-kernel32.dll!SetProcessPriorityBoost
-kernel32.dll!SetProcessWorkingSetSizeEx
-kernel32.dll!SetThreadAffinityMask
-kernel32.dll!SetThreadPriorityBoost
-ntdll.dll!NtQueryInformationProcess
-ntdll.dll!NtQuerySystemInformation
-user32.dll!EnumWindows
-user32.dll!GetWindow
-user32.dll!GetWindowLongW
-user32.dll!GetWindowTextW
-user32.dll!GetWindowTextLengthW
-user32.dll!GetWindowThreadProcessId
-user32.dll!IsWindowVisible
-user32.dll!PostMessageW
-user32.dll!SendMessageTimeoutW
-user32.dll!WaitForInputIdle
-shell32.dll!ShellExecuteExW
diff --git a/src/System.Diagnostics.Process/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp b/src/System.Diagnostics.Process/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp
new file mode 100644
index 0000000000..efb577d99c
--- /dev/null
+++ b/src/System.Diagnostics.Process/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp
@@ -0,0 +1,12 @@
+# Not available in OneCore: we fall back gracefully on Nano because
+# stub APIs are present and our tests currently don't use actual windows
+shell32.dll!ShellExecuteExW
+user32.dll!EnumWindows
+user32.dll!GetWindow
+user32.dll!GetWindowLongW
+user32.dll!GetWindowTextLengthW
+user32.dll!GetWindowTextW
+user32.dll!GetWindowThreadProcessId
+user32.dll!IsWindowVisible
+user32.dll!PostMessageW
+user32.dll!WaitForInputIdle
\ No newline at end of file
diff --git a/src/System.Diagnostics.Process/src/PinvokeAnalyzerExceptionList.analyzerdata.uap b/src/System.Diagnostics.Process/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
new file mode 100644
index 0000000000..07c1cd2c40
--- /dev/null
+++ b/src/System.Diagnostics.Process/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
@@ -0,0 +1,7 @@
+advapi32.dll!OpenProcessToken
+kernel32.dll!GetProcessAffinityMask
+kernel32.dll!K32EnumProcessModules
+kernel32.dll!SetProcessAffinityMask
+kernel32.dll!SetThreadAffinityMask
+ntdll.dll!NtQueryInformationProcess
+ntdll.dll!NtQuerySystemInformation
\ No newline at end of file
diff --git a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
index 38c94e722d..9c8b6fdc53 100644
--- a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
+++ b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
@@ -46,39 +46,41 @@
     <Compile Include="System\Diagnostics\MonitoringDescriptionAttribute.cs" />
     <Compile Include="System\Collections\Specialized\StringDictionaryWrapper.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)'!='true'">
-    <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
-    </Compile>
+  <ItemGroup Condition=" '$(TargetsWindows)' == 'true' and '$(TargetGroup)' != 'uap'">
     <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.EnumWindows.cs">
       <Link>Common\Interop\Windows\user32\Interop.EnumWindows.cs</Link>
     </Compile>
+    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindow.cs">
+      <Link>Common\Interop\Windows\user32\Interop.GetWindow.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindowLong.cs">
+      <Link>Common\Interop\Windows\user32\Interop.GetWindowLong.cs</Link>
+    </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindowTextLengthW.cs">
       <Link>Common\Interop\Windows\user32\Interop.GetWindowTextLengthW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.SendMessageTimeout.cs">
-      <Link>Common\Interop\Windows\user32\Interop.SendMessageTimeout.cs</Link>
-    </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindowTextW.cs">
       <Link>Common\Interop\Windows\user32\Interop.GetWindowTextW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindow.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetWindow.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindowThreadProcessId.cs">
+      <Link>Common\Interop\Windows\user32\Interop.GetWindowThreadProcessId.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.PostMessage.cs">
       <Link>Common\Interop\Windows\user32\Interop.PostMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindowLong.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetWindowLong.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.IsWindowVisible.cs">
+      <Link>Common\Interop\Windows\user32\Interop.IsWindowVisible.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.SendMessageTimeout.cs">
+      <Link>Common\Interop\Windows\user32\Interop.SendMessageTimeout.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.WaitForInputIdle.cs">
       <Link>Common\Interop\Windows\user32\Interop.WaitForInputIdle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.IsWindowVisible.cs">
-      <Link>Common\Interop\Windows\user32\Interop.IsWindowVisible.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindowThreadProcessId.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetWindowThreadProcessId.cs</Link>
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
+    <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
+      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CloseHandle.cs">
       <Link>Common\Interop\Windows\kernel32\Interop.CloseHandle.cs</Link>
@@ -274,7 +276,7 @@
     <Compile Include="System\Diagnostics\ProcessThreadTimes.cs" />
     <Compile Include="System\Diagnostics\ProcessWaitHandle.Windows.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetsUnix)' == 'true' AND '$(IsPartialFacadeAssembly)'!='true'">
+  <ItemGroup Condition=" '$(TargetsUnix)' == 'true'">
     <Compile Include="Microsoft\Win32\SafeHandles\SafeProcessHandle.Unix.cs" />
     <Compile Include="System\Diagnostics\Process.Unix.cs" />
     <Compile Include="System\Diagnostics\ProcessManager.Unix.cs" />
@@ -334,7 +336,7 @@
       <Link>Common\Interop\Unix\Interop.WaitPid.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetsLinux)' == 'true' AND '$(IsPartialFacadeAssembly)'!='true'">
+  <ItemGroup Condition=" '$(TargetsLinux)' == 'true'">
     <Compile Include="System\Diagnostics\Process.Linux.cs" />
     <Compile Include="System\Diagnostics\ProcessManager.Linux.cs" />
     <Compile Include="System\Diagnostics\ProcessThread.Linux.cs" />
@@ -357,7 +359,7 @@
       <Link>Common\System\Text\ReusableTextReader.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetsOSX)' == 'true' AND '$(IsPartialFacadeAssembly)'!='true'">
+  <ItemGroup Condition=" '$(TargetsOSX)' == 'true'">
     <Compile Include="System\Diagnostics\Process.OSX.cs" />
     <Compile Include="System\Diagnostics\ProcessManager.OSX.cs" />
     <Compile Include="System\Diagnostics\ProcessThread.OSX.cs" />
@@ -387,7 +389,7 @@
     <Compile Include="System\Diagnostics\ProcessManager.Uap.cs" />
     <Compile Include="System\Diagnostics\ProcessStartInfo.Uap.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" ('$(TargetsFreeBSD)' == 'true' OR '$(TargetsUnknownUnix)' == 'true') AND '$(IsPartialFacadeAssembly)'!='true'">
+  <ItemGroup Condition=" ('$(TargetsFreeBSD)' == 'true' OR '$(TargetsUnknownUnix)' == 'true')">
     <Compile Include="System\Diagnostics\Process.UnknownUnix.cs" />
     <Compile Include="System\Diagnostics\ProcessManager.UnknownUnix.cs" />
     <Compile Include="System\Diagnostics\ProcessThread.UnknownUnix.cs" />
diff --git a/src/System.DirectoryServices.AccountManagement/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.DirectoryServices.AccountManagement/src/PinvokeAnalyzerExceptionList.analyzerdata.netstandard
index 9df17a61aa..6aacd75e95 100644
--- a/src/System.DirectoryServices.AccountManagement/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ b/src/System.DirectoryServices.AccountManagement/src/PinvokeAnalyzerExceptionList.analyzerdata.netstandard
@@ -1,3 +1,4 @@
+# not available in OneCore
 activeds.dll!ADsOpenObject
 advapi32.dll!LsaNtStatusToWinError
 credui.dll!CredUIParseUserNameW
diff --git a/src/System.IO.FileSystem.DriveInfo/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.IO.FileSystem.DriveInfo/src/PinvokeAnalyzerExceptionList.analyzerdata
deleted file mode 100644
index 4a86b6a2a7..0000000000
--- a/src/System.IO.FileSystem.DriveInfo/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ /dev/null
@@ -1,5 +0,0 @@
-kernel32.dll!GetDriveTypeW
-kernel32.dll!GetLogicalDrives
-kernel32.dll!GetVolumeInformationW
-kernel32.dll!SetThreadErrorMode
-kernel32.dll!SetVolumeLabelW
diff --git a/src/System.IO.FileSystem.Watcher/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.IO.FileSystem.Watcher/src/PinvokeAnalyzerExceptionList.analyzerdata
deleted file mode 100644
index c2ec44e811..0000000000
--- a/src/System.IO.FileSystem.Watcher/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ /dev/null
@@ -1,2 +0,0 @@
-kernel32.dll!CreateFileW
-kernel32.dll!ReadDirectoryChangesW
diff --git a/src/System.IO.FileSystem.Watcher/src/PinvokeAnalyzerExceptionList.analyzerdata.uap b/src/System.IO.FileSystem.Watcher/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
new file mode 100644
index 0000000000..0719fa0f9d
--- /dev/null
+++ b/src/System.IO.FileSystem.Watcher/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
@@ -0,0 +1,3 @@
+## need to create a uap config that uses CreateFileFromApp, then remove this baseline ##
+# https://github.com/dotnet/corefx/issues/21025
+kernel32.dll!CreateFileW
\ No newline at end of file
diff --git a/src/System.IO.FileSystem/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.IO.FileSystem/src/PinvokeAnalyzerExceptionList.analyzerdata
deleted file mode 100644
index 4b690b7504..0000000000
--- a/src/System.IO.FileSystem/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ /dev/null
@@ -1,6 +0,0 @@
-kernel32.dll!CopyFileExW
-kernel32.dll!CreateFileW
-kernel32.dll!DeleteVolumeMountPointW
-kernel32.dll!GetLogicalDrives
-kernel32.dll!SetThreadErrorMode
-
diff --git a/src/System.IO.MemoryMappedFiles/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.IO.MemoryMappedFiles/src/PinvokeAnalyzerExceptionList.analyzerdata
deleted file mode 100644
index 33367e4f3a..0000000000
--- a/src/System.IO.MemoryMappedFiles/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ /dev/null
@@ -1,4 +0,0 @@
-kernel32.dll!CreateFileMappingW
-kernel32.dll!MapViewOfFile
-kernel32.dll!OpenFileMappingW
-kernel32.dll!VirtualAlloc
diff --git a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
index 5e21d731b6..9b57c2bd08 100644
--- a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
+++ b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
@@ -43,11 +43,6 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' != 'uap'">
     <Compile Include="System\IO\MemoryMappedFiles\Interop.Windows.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GlobalMemoryStatusEx.cs">
-      <Link>Common\Interop\Windows\Interop.GlobalMemoryStatusEx.cs</Link>
-    </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFileMapping.cs">
       <Link>Common\Interop\Windows\Interop.CreateFileMapping.cs</Link>
     </Compile>
@@ -57,12 +52,17 @@
     <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.OpenFileMapping.cs">
       <Link>Common\Interop\Windows\Interop.OpenFileMapping.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SECURITY_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs</Link>
-    </Compile>    
     <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.VirtualAlloc.cs">
       <Link>Common\Interop\Windows\Interop.VirtualAlloc.cs</Link>
     </Compile>
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
+    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GlobalMemoryStatusEx.cs">
+      <Link>Common\Interop\Windows\Interop.GlobalMemoryStatusEx.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SECURITY_ATTRIBUTES.cs">
+      <Link>Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs</Link>
+    </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
diff --git a/src/System.IO.Pipes/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.IO.Pipes/src/PinvokeAnalyzerExceptionList.analyzerdata
index 096979fa7d..0719fa0f9d 100644
--- a/src/System.IO.Pipes/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ b/src/System.IO.Pipes/src/PinvokeAnalyzerExceptionList.analyzerdata
@@ -1,11 +1,3 @@
-advapi32.dll!ImpersonateNamedPipeClient
-advapi32.dll!RevertToSelf
-kernel32.dll!ConnectNamedPipe
-kernel32.dll!CreateFileW
-kernel32.dll!CreateNamedPipeW
-kernel32.dll!CreatePipe
-kernel32.dll!DisconnectNamedPipe
-kernel32.dll!GetNamedPipeHandleStateW
-kernel32.dll!GetNamedPipeInfo
-kernel32.dll!SetNamedPipeHandleState
-kernel32.dll!WaitNamedPipeW
\ No newline at end of file
+## need to create a uap config that uses CreateFileFromApp, then remove this baseline ##
+# https://github.com/dotnet/corefx/issues/21025
+kernel32.dll!CreateFileW
\ No newline at end of file
diff --git a/src/System.IO.Ports/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.IO.Ports/src/PinvokeAnalyzerExceptionList.analyzerdata
index 5464e9945c..0719fa0f9d 100644
--- a/src/System.IO.Ports/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ b/src/System.IO.Ports/src/PinvokeAnalyzerExceptionList.analyzerdata
@@ -1,14 +1,3 @@
-kernel32.dll!ClearCommBreak
-kernel32.dll!ClearCommError
-kernel32.dll!CreateFileW
-kernel32.dll!EscapeCommFunction
-kernel32.dll!GetCommModemStatus
-kernel32.dll!GetCommProperties
-kernel32.dll!GetCommState
-kernel32.dll!PurgeComm
-kernel32.dll!SetCommBreak
-kernel32.dll!SetCommMask
-kernel32.dll!SetCommState
-kernel32.dll!SetCommTimeouts
-kernel32.dll!SetupComm
-kernel32.dll!WaitCommEvent
+## need to create a uap config that uses CreateFileFromApp, then remove this baseline ##
+# https://github.com/dotnet/corefx/issues/21025
+kernel32.dll!CreateFileW
\ No newline at end of file
diff --git a/src/System.Net.Mail/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Net.Mail/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
index e229924b6e..7129605e6a 100644
--- a/src/System.Net.Mail/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ b/src/System.Net.Mail/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
@@ -1,3 +1,4 @@
+# Discussing with Networking team
 sspicli.dll!AcceptSecurityContext
 sspicli.dll!AcquireCredentialsHandleW
 sspicli.dll!ApplyControlToken
diff --git a/src/System.Net.Security/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Net.Security/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
index e229924b6e..7129605e6a 100644
--- a/src/System.Net.Security/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ b/src/System.Net.Security/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
@@ -1,3 +1,4 @@
+# Discussing with Networking team
 sspicli.dll!AcceptSecurityContext
 sspicli.dll!AcquireCredentialsHandleW
 sspicli.dll!ApplyControlToken
diff --git a/src/System.Runtime.Extensions/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Runtime.Extensions/src/PinvokeAnalyzerExceptionList.analyzerdata
deleted file mode 100644
index 83392d90a2..0000000000
--- a/src/System.Runtime.Extensions/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ /dev/null
@@ -1,8 +0,0 @@
-kernel32.dll!ExpandEnvironmentStringsW
-kernel32.dll!GetComputerNameW
-kernel32.dll!GetLogicalDrives
-kernel32.dll!GetSystemDirectoryW
-kernel32.dll!GetVersionExW
-kernel32.dll!IsWow64Process
-secur32.dll!GetUserNameExW
-shell32.dll!SHGetKnownFolderPath
\ No newline at end of file
diff --git a/src/System.Runtime.Extensions/src/PinvokeAnalyzerExceptionList.analyzerdata.uap b/src/System.Runtime.Extensions/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
new file mode 100644
index 0000000000..b6a3730d5f
--- /dev/null
+++ b/src/System.Runtime.Extensions/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
@@ -0,0 +1,2 @@
+kernel32.dll!GetSystemDirectoryW
+shell32.dll!SHGetKnownFolderPath
\ No newline at end of file
diff --git a/src/System.Runtime.Extensions/src/PinvokeAnalyzerExceptionList.analyzerdata.uapaot b/src/System.Runtime.Extensions/src/PinvokeAnalyzerExceptionList.analyzerdata.uapaot
new file mode 100644
index 0000000000..b6a3730d5f
--- /dev/null
+++ b/src/System.Runtime.Extensions/src/PinvokeAnalyzerExceptionList.analyzerdata.uapaot
@@ -0,0 +1,2 @@
+kernel32.dll!GetSystemDirectoryW
+shell32.dll!SHGetKnownFolderPath
\ No newline at end of file
diff --git a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
index 3ff71dbe1e..20a2cea4dc 100644
--- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
+++ b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
@@ -160,7 +160,7 @@
     <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SYSTEM_INFO.cs">
       <Link>Common\Interop\Windows\kernel32\Interop.SYSTEM_INFO.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\secur32\Interop.GetUserNameExW.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\secur32\Interop.GetUserNameExW.cs" Condition="'$(TargetGroup)' != 'uapaot' and '$(TargetGroup)' != 'uap'" >
       <Link>Common\Interop\Windows\secur32\Interop.GetUserNameExW.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\shell32\Interop.SHGetKnownFolderPath.cs">
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Runtime.InteropServices.RuntimeInformation/src/PinvokeAnalyzerExceptionList.analyzerdata
deleted file mode 100644
index 98ae555040..0000000000
--- a/src/System.Runtime.InteropServices.RuntimeInformation/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ /dev/null
@@ -1 +0,0 @@
-ntdll.dll!RtlGetVersion
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/PinvokeAnalyzer_win8-wpa81-APIs.txt b/src/System.Runtime.InteropServices.RuntimeInformation/src/PinvokeAnalyzer_win8-wpa81-APIs.txt
deleted file mode 100644
index 334e3b3783..0000000000
--- a/src/System.Runtime.InteropServices.RuntimeInformation/src/PinvokeAnalyzer_win8-wpa81-APIs.txt
+++ /dev/null
@@ -1 +0,0 @@
-api-ms-win-core-sysinfo-l1-2-0.dll!GetNativeSystemInfo
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
index bc7e1a012d..8a4aa14e9d 100644
--- a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -10,6 +10,7 @@
     <DefineConstants Condition="'$(TargetGroup)'=='wpa81'">$(DefineConstants);wpa81</DefineConstants>
     <DefineConstants Condition="'$(TargetGroup)'=='win8'">$(DefineConstants);win8</DefineConstants>
     <DefineConstants Condition="'$(TargetGroup)'=='uap'">$(DefineConstants);uap</DefineConstants>
+    <DefineConstants Condition="'$(TargetGroup)'=='netstandard1.1'">$(DefineConstants);netstandard11</DefineConstants>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)'=='netstandard1.1' AND '$(OSGroup)'=='AnyOS'">SR.PlatformNotSupported_RuntimeInformation</GeneratePlatformNotSupportedAssemblyMessage>
     <!-- use netstandard1.1 refs for win8 and wpa81 -->
     <RefPath Condition="'$(TargetGroup)'=='wpa81' OR '$(TargetGroup)'=='win8'">$(RefRootPath)/netstandard1.1</RefPath>
@@ -65,7 +66,7 @@
     </Compile>
     <Compile Include="System\Runtime\InteropServices\RuntimeInformation\RuntimeInformation.Unix.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsWindows)'=='true' And ('$(TargetGroup)' != 'win8' AND '$(TargetGroup)' != 'wpa81')">
+  <ItemGroup Condition="'$(TargetsWindows)'=='true' And ('$(TargetGroup)' != 'win8' AND '$(TargetGroup)' != 'wpa81' and '$(TargetGroup)' != 'netstandard1.1' and '$(TargetGroup)' != 'uap')">
     <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlGetVersion.cs">
       <Link>Common\Interop\Windows\NtDll\Interop.RtlGetVersion.cs</Link>
     </Compile>
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/RuntimeInformation.Windows.cs b/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/RuntimeInformation.Windows.cs
index e07cbbdd64..89a7a51eb8 100644
--- a/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/RuntimeInformation.Windows.cs
+++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/RuntimeInformation.Windows.cs
@@ -25,7 +25,7 @@ namespace System.Runtime.InteropServices
             {
                 if (null == s_osDescription)
                 {
-#if uap || win8
+#if uap || win8 || netstandard11 // all these are subject to WACK
                     s_osDescription = "Microsoft Windows";
 #elif wpa81
                     s_osDescription = "Microsoft Windows Phone";
diff --git a/src/System.Security.AccessControl/dir.props b/src/System.Security.AccessControl/dir.props
index b51f23eaab..0b90c056e3 100644
--- a/src/System.Security.AccessControl/dir.props
+++ b/src/System.Security.AccessControl/dir.props
@@ -6,7 +6,5 @@
     <AssemblyKey>MSFT</AssemblyKey>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsNETCoreAppRef>false</IsNETCoreAppRef>
-    <IsUAP>true</IsUAP>
-    <ISUAPRef>false</ISUAPRef>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/System.Security.AccessControl/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Security.AccessControl/src/PinvokeAnalyzerExceptionList.analyzerdata
deleted file mode 100644
index 897dbec063..0000000000
--- a/src/System.Security.AccessControl/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ /dev/null
@@ -1,4 +0,0 @@
-advapi32.dll!OpenProcessToken
-advapi32.dll!OpenThreadToken
-advapi32.dll!RevertToSelf
-advapi32.dll!SetThreadToken
diff --git a/src/System.Security.AccessControl/src/PinvokeAnalyzerExceptionList.analyzerdata.uap b/src/System.Security.AccessControl/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
new file mode 100644
index 0000000000..48869872a9
--- /dev/null
+++ b/src/System.Security.AccessControl/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
@@ -0,0 +1,6 @@
+# No longer in UAP package, so this is harmless, still need to remove UAP configuration and add this to project
+#     <!-- Although we have a netstandard configuration, we know we are not currently UAP compatible-->
+#    <UWPCompatible>false</UWPCompatible>
+# then remove this baseline
+# https://github.com/dotnet/corefx/issues/21023
+advapi32.dll!OpenProcessToken
diff --git a/src/System.Security.Cryptography.Csp/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Security.Cryptography.Csp/src/PinvokeAnalyzerExceptionList.analyzerdata
deleted file mode 100644
index 31cd158b19..0000000000
--- a/src/System.Security.Cryptography.Csp/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ /dev/null
@@ -1,21 +0,0 @@
-advapi32.dll!CryptAcquireContextW
-advapi32.dll!CryptCreateHash
-advapi32.dll!CryptDecrypt
-advapi32.dll!CryptDeriveKey
-advapi32.dll!CryptDestroyHash
-advapi32.dll!CryptDestroyKey
-advapi32.dll!CryptEncrypt
-advapi32.dll!CryptExportKey
-advapi32.dll!CryptGenKey
-advapi32.dll!CryptGetDefaultProviderW
-advapi32.dll!CryptGetHashParam
-advapi32.dll!CryptGetKeyParam
-advapi32.dll!CryptGetProvParam
-advapi32.dll!CryptGetUserKey
-advapi32.dll!CryptHashData
-advapi32.dll!CryptImportKey
-advapi32.dll!CryptSetHashParam
-advapi32.dll!CryptSetKeyParam
-advapi32.dll!CryptSetProvParam
-advapi32.dll!CryptSignHashW
-advapi32.dll!CryptVerifySignatureW
diff --git a/src/System.Security.Principal.Windows/src/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Security.Principal.Windows/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
index f3f83f0173..7d214fce2d 100644
--- a/src/System.Security.Principal.Windows/src/PinvokeAnalyzerExceptionList.analyzerdata
+++ b/src/System.Security.Principal.Windows/src/PinvokeAnalyzerExceptionList.analyzerdata.uap
@@ -1,16 +1,14 @@
-advapi32.dll!ImpersonateLoggedOnUser
+# Discussing with networking team
 advapi32.dll!LsaClose
 advapi32.dll!LsaFreeMemory
 advapi32.dll!LsaLookupNames2
 advapi32.dll!LsaLookupSids
 advapi32.dll!LsaOpenPolicy
 advapi32.dll!OpenProcessToken
-advapi32.dll!OpenThreadToken
-advapi32.dll!RevertToSelf
 ntdll.dll!RtlNtStatusToDosError
 sspicli.dll!LsaConnectUntrusted
 sspicli.dll!LsaDeregisterLogonProcess
 sspicli.dll!LsaFreeReturnBuffer
 sspicli.dll!LsaGetLogonSessionData
 sspicli.dll!LsaLogonUser
-sspicli.dll!LsaLookupAuthenticationPackage
+sspicli.dll!LsaLookupAuthenticationPackage
\ No newline at end of file