Address feedback, netfx build

Commit migrated from https://github.com/dotnet/corefx/commit/1b7b7f4fe7f7fbcf506e9c666c59a299f54ca887

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetTokenInformation.cs b/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetTokenInformation.cs
index 4366e59..40da1da 100644 (file)
--- a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetTokenInformation.cs
+++ b/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetTokenInformation.cs
@@ -26,7 +26,7 @@ internal static partial class Interop
             uint TokenInformationLength,
             out uint ReturnLength);
 
-        [DllImport(Interop.Libraries.Advapi32, CharSet = CharSet.Auto, SetLastError = true)]
+        [DllImport(Interop.Libraries.Advapi32, CharSet = CharSet.Unicode, SetLastError = true)]
         internal static extern bool GetTokenInformation(
             IntPtr TokenHandle,
             uint TokenInformationClass,

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WaitForSingleObject.cs b/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WaitForSingleObject.cs
index 41a40e5..ce5268c 100644 (file)
--- a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WaitForSingleObject.cs
+++ b/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WaitForSingleObject.cs
@@ -10,7 +10,7 @@ internal partial class Interop
 {
     internal partial class Kernel32
     {
-        [DllImport(Libraries.Kernel32, ExactSpelling=true, SetLastError=true, EntryPoint="WaitForSingleObject")]
+        [DllImport(Libraries.Kernel32, ExactSpelling=true, SetLastError=true)]
         internal static extern int WaitForSingleObject(SafeWaitHandle handle, int timeout);
     }
 }

diff --git a/src/libraries/Common/src/Interop/Windows/perfcounter/Interop.FormatFromRawValue.cs b/src/libraries/Common/src/Interop/Windows/perfcounter/Interop.FormatFromRawValue.cs
index aa6a27b..eb52202 100644 (file)
--- a/src/libraries/Common/src/Interop/Windows/perfcounter/Interop.FormatFromRawValue.cs
+++ b/src/libraries/Common/src/Interop/Windows/perfcounter/Interop.FormatFromRawValue.cs
@@ -9,7 +9,7 @@ internal partial class Interop
     internal partial class PerfCounter
     {
 #pragma warning disable BCL0015 // Invalid Pinvoke call
-        [DllImport(Libraries.PerfCounter, CharSet = CharSet.Auto)]
+        [DllImport(Libraries.PerfCounter, CharSet = CharSet.Unicode)]
         public static unsafe extern int FormatFromRawValue(
             uint dwCounterType,
             uint dwFormat,

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/ref/Configurations.props b/src/libraries/System.Diagnostics.PerformanceCounter/ref/Configurations.props
index d2022d3..78953df 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/ref/Configurations.props
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/ref/Configurations.props
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <BuildConfigurations>
       netstandard;
-      netfx;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj
index caef3a3..59829e6 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj
@@ -11,9 +11,5 @@
       <SubType>Component</SubType>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>