Skip to content

Cleanup '#if CORECLR' from some files #8332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 5 commits into from
Nov 26, 2018
Merged

Cleanup '#if CORECLR' from some files #8332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a03336
CommonUtilities
iSazonov Nov 23, 2018
b10d8d1
CredSSP
iSazonov Nov 23, 2018
0cc423d
WsManHelper.cs
iSazonov Nov 23, 2018
1e9abd1
InternalHost
iSazonov Nov 23, 2018
2d55e4c
[Feature]
iSazonov Nov 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions src/Microsoft.PowerShell.Commands.Diagnostics/CommonUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
using System.Collections;
using System.Diagnostics;
using System.Globalization;
using System.Reflection;
using System.Resources;
using System.Runtime.InteropServices;
using System.Text;
using System.Resources;
using System.Reflection;

#if CORECLR
using System.ComponentModel;
#else
using System.Threading;
#endif

namespace Microsoft.PowerShell.Commands.Diagnostics.Common
{
Expand All @@ -38,7 +32,6 @@ public static string StringArrayToString(IEnumerable input)
return ret;
}

#if CORECLR
private const string LibraryLoadDllName = "api-ms-win-core-libraryloader-l1-2-0.dll";
private const string LocalizationDllName = "api-ms-win-core-localization-l1-2-1.dll";
private const string SysInfoDllName = "api-ms-win-core-sysinfo-l1-2-1.dll";
Expand All @@ -62,10 +55,6 @@ internal struct OSVERSIONINFOEX

[DllImport(SysInfoDllName, CharSet = CharSet.Unicode, SetLastError = true)]
internal static extern bool GetVersionEx(ref OSVERSIONINFOEX osVerEx);
#else
private const string LibraryLoadDllName = "kernel32.dll";
private const string LocalizationDllName = "kernel32.dll";
#endif

private const uint FORMAT_MESSAGE_ALLOCATE_BUFFER = 0x00000100;
private const uint FORMAT_MESSAGE_IGNORE_INSERTS = 0x00000200;
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.WSMan.Management/CredSSP.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
using System.Globalization;
using System.Security;
using System.Threading;
#if CORECLR
using System.Xml.XPath;
#endif

using Dbg = System.Management.Automation;

Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.WSMan.Management/WsManHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
using System.Management.Automation;
using System.Management.Automation.Provider;
using System.Threading;
#if CORECLR
using System.Xml.XPath;
#endif

namespace Microsoft.WSMan.Management
{
Expand Down
4 changes: 0 additions & 4 deletions src/System.Management.Automation/engine/hostifaces/InternalHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,7 @@ public override CultureInfo CurrentUICulture
{
get
{
#if CORECLR // No CultureInfo.InstalledUICulture In CoreCLR. Locale cannot be changed On CSS.
CultureInfo ci = _externalHostRef.Value.CurrentUICulture ?? CultureInfo.CurrentUICulture;
#else
CultureInfo ci = _externalHostRef.Value.CurrentUICulture ?? CultureInfo.InstalledUICulture;
#endif
return ci;
}
}
Expand Down