aphrody-labs/PowerShell
1
0 Fork 0
mirror of https://github.com/aphrody-labs/PowerShell.git synced 2026-10-17 12:45:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1210 from PowerShell/andschwa/rtm

Browse Source 
Update PowerShell to use .NET Core 1.0
This commit is contained in:
Andy Schwartzmeyer authored and GitHub committed 2016-06-28 14:37:20 -07:00
2 parents 1b130b20e1 5e3150f429
commit b294a46d2e
43 files changed
+117 -3157
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/System.Management.Automation/engine/Credential.cs
+2 -1
View File
@@ -9,6 +9,7 @@ using System.Net;
using System.Security;
using SafeString=System.String;
using System.Runtime.Serialization;
using System.Runtime.InteropServices;
using System.Security.Cryptography;
using Microsoft.PowerShell;
@@ -286,7 +287,7 @@ namespace System.Management.Automation
{
if (unmanagedPtr != IntPtr.Zero)
{
ClrFacade.ZeroFreeCoTaskMemUnicode(unmanagedPtr);
Marshal.ZeroFreeCoTaskMemUnicode(unmanagedPtr);
}
}
#else
src/System.Management.Automation/engine/Utils.cs
+1 -1
View File
@@ -179,7 +179,7 @@ namespace System.Management.Automation
{
if (p != IntPtr.Zero)
{
ClrFacade.ZeroFreeCoTaskMemUnicode(p);
Marshal.ZeroFreeCoTaskMemUnicode(p);
}
}
src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
+1 -1
View File
@@ -379,7 +379,7 @@ namespace System.Management.Automation.Remoting.Client
{
if (cred.password != IntPtr.Zero)
{
ClrFacade.ZeroFreeCoTaskMemUnicode(cred.password);
Marshal.ZeroFreeCoTaskMemUnicode(cred.password);
cred.password = IntPtr.Zero;
}
src/System.Management.Automation/project.json
+31 -31
View File
@@ -23,7 +23,7 @@
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"imports": [ "dnxcore50" ],
"buildOptions": {
"define": [ "CORECLR", "PORTABLE" ],
@@ -131,36 +131,36 @@
"Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": "1.0.0-*",
"Microsoft.PowerShell.CoreCLR.Eventing": "1.0.0-*",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"Microsoft.Win32.Registry.AccessControl": "4.0.0-rc2-24027",
"System.Collections.Specialized": "4.0.1-rc2-24027",
"System.Collections.NonGeneric": "4.0.1-rc2-24027",
"System.ComponentModel.EventBasedAsync": "4.0.11-rc2-24027",
"System.ComponentModel.TypeConverter": "4.0.1-rc2-24027",
"System.Data.Common": "4.0.1-rc2-24027",
"System.Diagnostics.Contracts": "4.0.1-rc2-24027",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24027",
"System.Diagnostics.Process": "4.1.0-rc2-24027",
"System.Diagnostics.StackTrace": "4.0.1-rc2-24027",
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.IO.FileSystem.AccessControl": "4.0.0-rc2-24027",
"System.IO.FileSystem.DriveInfo": "4.0.0-rc2-24027",
"System.IO.FileSystem.Watcher": "4.0.0-rc2-24027",
"System.IO.Pipes": "4.0.0-rc2-24027",
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Net.Http": "4.0.1-rc2-24027",
"System.Net.NetworkInformation": "4.1.0-rc2-24027",
"System.Reflection.Emit": "4.0.1-rc2-24027",
"System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027",
"System.Security.AccessControl": "4.0.0-rc2-24027",
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
"System.Security.Cryptography.X509Certificates": "4.1.0-rc2-24027",
"System.Threading.Thread": "4.0.0-rc2-24027",
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
"System.Xml.XPath.XmlDocument": "4.0.1-rc2-24027",
"System.Xml.XmlDocument": "4.0.1-rc2-24027",
"System.Xml.XmlSerializer": "4.0.11-rc2-24027"
"Microsoft.CSharp": "4.0.1",
"Microsoft.Win32.Registry.AccessControl": "4.0.0",
"System.Collections.Specialized": "4.0.1",
"System.Collections.NonGeneric": "4.0.1",
"System.ComponentModel.EventBasedAsync": "4.0.11",
"System.ComponentModel.TypeConverter": "4.1.0",
"System.Data.Common": "4.1.0",
"System.Diagnostics.Contracts": "4.0.1",
"System.Diagnostics.FileVersionInfo": "4.0.0",
"System.Diagnostics.Process": "4.1.0",
"System.Diagnostics.StackTrace": "4.0.1",
"System.Diagnostics.TraceSource": "4.0.0",
"System.Dynamic.Runtime": "4.0.11",
"System.IO.FileSystem.AccessControl": "4.0.0",
"System.IO.FileSystem.DriveInfo": "4.0.0",
"System.IO.FileSystem.Watcher": "4.0.0",
"System.IO.Pipes": "4.0.0",
"System.Linq.Expressions": "4.1.0",
"System.Net.Http": "4.1.0",
"System.Net.NetworkInformation": "4.1.0",
"System.Reflection.Emit": "4.0.1",
"System.Reflection.Emit.Lightweight": "4.0.1",
"System.Security.AccessControl": "4.0.0",
"System.Security.Cryptography.Algorithms": "4.2.0",
"System.Security.Cryptography.X509Certificates": "4.1.0",
"System.Threading.Thread": "4.0.0",
"System.Threading.Tasks.Parallel": "4.0.1",
"System.Xml.XPath.XmlDocument": "4.0.1",
"System.Xml.XmlDocument": "4.0.1",
"System.Xml.XmlSerializer": "4.0.11"
}
},
"net451": {
src/System.Management.Automation/security/SecureStringHelper.cs
+1 -1
View File
@@ -94,7 +94,7 @@ namespace Microsoft.PowerShell
}
finally
{
ClrFacade.ZeroFreeCoTaskMemUnicode(ptr);
Marshal.ZeroFreeCoTaskMemUnicode(ptr);
}
}
src/System.Management.Automation/utils/ClrFacade.cs
+1 -14
View File
@@ -148,7 +148,7 @@ namespace System.Management.Automation
{
if (unmanagedMemory != IntPtr.Zero)
{
ZeroFreeCoTaskMemUnicode(unmanagedMemory);
Marshal.ZeroFreeCoTaskMemUnicode(unmanagedMemory);
}
}
return passwordInClearText;
@@ -213,19 +213,6 @@ namespace System.Management.Automation
#endif
}
/// <summary>
/// Needed to pair with the SecureStringToCoTaskMemUnicode method which is member of
/// 'SecureStringMarshal' on CORE CLR, and member of 'Marshal' on Full CLR.
/// </summary>
internal static void ZeroFreeCoTaskMemUnicode(IntPtr unmanagedStr)
{
#if CORECLR
SecureStringMarshal.ZeroFreeCoTaskMemUnicode(unmanagedStr);
#else
Marshal.ZeroFreeCoTaskMemUnicode(unmanagedStr);
#endif
}
/// <summary>
/// Facade for SecureStringToCoTaskMemUnicode
/// </summary>
src/System.Management.Automation/utils/CryptoUtils.cs
+1 -1
View File
@@ -1023,7 +1023,7 @@ namespace System.Management.Automation.Internal
{
data[i] = Marshal.ReadByte(ptr, i);
}
ClrFacade.ZeroFreeCoTaskMemUnicode(ptr);
Marshal.ZeroFreeCoTaskMemUnicode(ptr);
try
{