Remove ifdefs

elinor-fung · elinor-fung · commit 93a716652b3b · 2021-11-09T19:23:28.000-08:00
diff --git a/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetTokenInformation.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetTokenInformation.cs
@@ -9,39 +9,24 @@ internal static partial class Interop
 {
     internal static partial class Advapi32
     {
-#if DLLIMPORTGENERATOR_ENABLED
         [GeneratedDllImport(Interop.Libraries.Advapi32, SetLastError = true)]
         internal static partial bool GetTokenInformation(
-#else
-        [DllImport(Interop.Libraries.Advapi32, SetLastError = true)]
-        internal static extern bool GetTokenInformation(
-#endif
             SafeAccessTokenHandle TokenHandle,
             uint TokenInformationClass,
             SafeLocalAllocHandle TokenInformation,
             uint TokenInformationLength,
             out uint ReturnLength);
 
-#if DLLIMPORTGENERATOR_ENABLED
         [GeneratedDllImport(Interop.Libraries.Advapi32, SetLastError = true)]
         internal static partial bool GetTokenInformation(
-#else
-        [DllImport(Interop.Libraries.Advapi32, SetLastError = true)]
-        internal static extern bool GetTokenInformation(
-#endif
             IntPtr TokenHandle,
             uint TokenInformationClass,
             SafeLocalAllocHandle TokenInformation,
             uint TokenInformationLength,
             out uint ReturnLength);
 
-#if DLLIMPORTGENERATOR_ENABLED
-        [GeneratedDllImport(Interop.Libraries.Advapi32, CharSet = CharSet.Unicode, SetLastError = true)]
+        [GeneratedDllImport(Interop.Libraries.Advapi32, SetLastError = true)]
         internal static partial bool GetTokenInformation(
-#else
-        [DllImport(Interop.Libraries.Advapi32, CharSet = CharSet.Unicode, SetLastError = true)]
-        internal static extern bool GetTokenInformation(
-#endif
             IntPtr TokenHandle,
             uint TokenInformationClass,
             IntPtr TokenInformation,
diff --git a/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.RegConnectRegistry.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.RegConnectRegistry.cs
@@ -14,13 +14,8 @@ internal static partial class Interop
 {
     internal static partial class Advapi32
     {
-#if DLLIMPORTGENERATOR_ENABLED
         [GeneratedDllImport(Libraries.Advapi32, EntryPoint = "RegConnectRegistryW", CharSet = CharSet.Unicode)]
         internal static partial int RegConnectRegistry(
-#else
-        [DllImport(Libraries.Advapi32, EntryPoint = "RegConnectRegistryW", CharSet = CharSet.Unicode, BestFitMapping = false)]
-        internal static extern int RegConnectRegistry(
-#endif
             string machineName,
             SafeRegistryHandle key,
             out SafeRegistryHandle result);
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateFileMapping.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateFileMapping.cs
@@ -10,27 +10,17 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
-#if DLLIMPORTGENERATOR_ENABLED
-        [GeneratedDllImport(Libraries.Kernel32, EntryPoint = "CreateFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
+        [GeneratedDllImport(Libraries.Kernel32, EntryPoint = "CreateFileMappingW", CharSet = CharSet.Unicode, ExactSpelling = true, SetLastError = true)]
         internal static partial SafeMemoryMappedFileHandle CreateFileMapping(
-#else
-        [DllImport(Libraries.Kernel32, EntryPoint = "CreateFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
-        internal static extern SafeMemoryMappedFileHandle CreateFileMapping(
-#endif
             SafeFileHandle hFile,
             ref SECURITY_ATTRIBUTES lpFileMappingAttributes,
             int flProtect,
             int dwMaximumSizeHigh,
             int dwMaximumSizeLow,
             string? lpName);
 
-#if DLLIMPORTGENERATOR_ENABLED
-        [GeneratedDllImport(Libraries.Kernel32, EntryPoint = "CreateFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
+        [GeneratedDllImport(Libraries.Kernel32, EntryPoint = "CreateFileMappingW", CharSet = CharSet.Unicode, ExactSpelling = true, SetLastError = true)]
         internal static partial SafeMemoryMappedFileHandle CreateFileMapping(
-#else
-        [DllImport(Libraries.Kernel32, EntryPoint = "CreateFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
-        internal static extern SafeMemoryMappedFileHandle CreateFileMapping(
-#endif
             IntPtr hFile,
             ref SECURITY_ATTRIBUTES lpFileMappingAttributes,
             int flProtect,
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DuplicateHandle_SafeWaitHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DuplicateHandle_SafeWaitHandle.cs
@@ -9,13 +9,8 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
-#if DLLIMPORTGENERATOR_ENABLED
         [GeneratedDllImport(Libraries.Kernel32, SetLastError = true)]
         internal static partial bool DuplicateHandle(
-#else
-        [DllImport(Libraries.Kernel32, SetLastError = true)]
-        internal static extern bool DuplicateHandle(
-#endif
             IntPtr hSourceProcessHandle,
             SafeHandle hSourceHandle,
             IntPtr hTargetProcess,
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessTimes.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessTimes.cs
@@ -8,13 +8,8 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
-#if DLLIMPORTGENERATOR_ENABLED
         [GeneratedDllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true)]
         internal static partial bool GetProcessTimes(
-#else
-        [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true)]
-        internal static extern bool GetProcessTimes(
-#endif
             SafeProcessHandle handle, out long creation, out long exit, out long kernel, out long user);
     }
 }
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MapViewOfFile.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MapViewOfFile.cs
@@ -9,13 +9,8 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
-#if DLLIMPORTGENERATOR_ENABLED
         [GeneratedDllImport(Libraries.Kernel32, EntryPoint = "MapViewOfFile", CharSet = CharSet.Unicode, SetLastError = true)]
         internal static partial SafeMemoryMappedViewHandle MapViewOfFile(
-#else
-        [DllImport(Libraries.Kernel32, EntryPoint = "MapViewOfFile", CharSet = CharSet.Unicode, SetLastError = true)]
-        internal static extern SafeMemoryMappedViewHandle MapViewOfFile(
-#endif
             SafeMemoryMappedFileHandle hFileMappingObject,
             int dwDesiredAccess,
             int dwFileOffsetHigh,
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.OpenFileMapping.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.OpenFileMapping.cs
@@ -8,13 +8,8 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
-#if DLLIMPORTGENERATOR_ENABLED
-        [GeneratedDllImport(Libraries.Kernel32, EntryPoint = "OpenFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
+        [GeneratedDllImport(Libraries.Kernel32, EntryPoint = "OpenFileMappingW", CharSet = CharSet.Unicode, ExactSpelling = true, SetLastError = true)]
         internal static partial SafeMemoryMappedFileHandle OpenFileMapping(
-#else
-        [DllImport(Libraries.Kernel32, EntryPoint = "OpenFileMappingW", CharSet = CharSet.Unicode, SetLastError = true)]
-        internal static extern SafeMemoryMappedFileHandle OpenFileMapping(
-#endif
             int dwDesiredAccess,
             [MarshalAs(UnmanagedType.Bool)] bool bInheritHandle,
             string lpName);
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.OpenProcess.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.OpenProcess.cs
@@ -8,13 +8,8 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
-#if DLLIMPORTGENERATOR_ENABLED
         [GeneratedDllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true)]
         internal static partial SafeProcessHandle OpenProcess(
-#else
-        [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true)]
-        internal static extern SafeProcessHandle OpenProcess(
-#endif
             int access, bool inherit, int processId);
     }
 }
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.UnmapViewOfFile.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.UnmapViewOfFile.cs
@@ -8,12 +8,7 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
-#if DLLIMPORTGENERATOR_ENABLED
         [GeneratedDllImport(Libraries.Kernel32, SetLastError = true)]
         internal static partial bool UnmapViewOfFile(IntPtr lpBaseAddress);
-#else
-        [DllImport(Libraries.Kernel32, SetLastError = true)]
-        internal static extern bool UnmapViewOfFile(IntPtr lpBaseAddress);
-#endif
     }
 }
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.VirtualQuery.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.VirtualQuery.cs
@@ -8,13 +8,8 @@ internal static partial class Interop
 {
     internal static partial class Kernel32
     {
-#if DLLIMPORTGENERATOR_ENABLED
         [GeneratedDllImport(Libraries.Kernel32, ExactSpelling = true, SetLastError = true)]
         internal static partial UIntPtr VirtualQuery(
-#else
-        [DllImport(Libraries.Kernel32, ExactSpelling = true, SetLastError = true)]
-        internal static extern UIntPtr VirtualQuery(
-#endif
             SafeHandle lpAddress,
             ref MEMORY_BASIC_INFORMATION lpBuffer,
             UIntPtr dwLength);
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
@@ -3,6 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+    <EnableDllImportGenerator>true</EnableDllImportGenerator>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="MemoryMappedFile.CreateFromFile.Tests.cs" />

Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,8 @@ internal static partial class Interop`
`14`	`14`	`{`
`15`	`15`	`internal static partial class Advapi32`
`16`	`16`	`{`
`17`		`-#if DLLIMPORTGENERATOR_ENABLED`
`18`	`17`	`[GeneratedDllImport(Libraries.Advapi32, EntryPoint = "RegConnectRegistryW", CharSet = CharSet.Unicode)]`
`19`	`18`	`internal static partial int RegConnectRegistry(`
`20`		`-#else`
`21`		`- [DllImport(Libraries.Advapi32, EntryPoint = "RegConnectRegistryW", CharSet = CharSet.Unicode, BestFitMapping = false)]`
`22`		`- internal static extern int RegConnectRegistry(`
`23`		`-#endif`
`24`	`19`	`string machineName,`
`25`	`20`	`SafeRegistryHandle key,`
`26`	`21`	`out SafeRegistryHandle result);`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,8 @@ internal static partial class Interop`
`9`	`9`	`{`
`10`	`10`	`internal static partial class Kernel32`
`11`	`11`	`{`
`12`		`-#if DLLIMPORTGENERATOR_ENABLED`
`13`	`12`	`[GeneratedDllImport(Libraries.Kernel32, SetLastError = true)]`
`14`	`13`	`internal static partial bool DuplicateHandle(`
`15`		`-#else`
`16`		`- [DllImport(Libraries.Kernel32, SetLastError = true)]`
`17`		`- internal static extern bool DuplicateHandle(`
`18`		`-#endif`
`19`	`14`	`IntPtr hSourceProcessHandle,`
`20`	`15`	`SafeHandle hSourceHandle,`
`21`	`16`	`IntPtr hTargetProcess,`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,8 @@ internal static partial class Interop`
`8`	`8`	`{`
`9`	`9`	`internal static partial class Kernel32`
`10`	`10`	`{`
`11`		`-#if DLLIMPORTGENERATOR_ENABLED`
`12`	`11`	`[GeneratedDllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true)]`
`13`	`12`	`internal static partial bool GetProcessTimes(`
`14`		`-#else`
`15`		`- [DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true)]`
`16`		`- internal static extern bool GetProcessTimes(`
`17`		`-#endif`
`18`	`13`	`SafeProcessHandle handle, out long creation, out long exit, out long kernel, out long user);`
`19`	`14`	`}`
`20`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,7 @@ internal static partial class Interop`
`8`	`8`	`{`
`9`	`9`	`internal static partial class Kernel32`
`10`	`10`	`{`
`11`		`-#if DLLIMPORTGENERATOR_ENABLED`
`12`	`11`	`[GeneratedDllImport(Libraries.Kernel32, SetLastError = true)]`
`13`	`12`	`internal static partial bool UnmapViewOfFile(IntPtr lpBaseAddress);`
`14`		`-#else`
`15`		`- [DllImport(Libraries.Kernel32, SetLastError = true)]`
`16`		`- internal static extern bool UnmapViewOfFile(IntPtr lpBaseAddress);`
`17`		`-#endif`
`18`	`13`	`}`
`19`	`14`	`}`