admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of mshttps://msostc.visualstudio.com/DefaultCollection/PS/_git/monad-linux into dev/112-split-path-pester

Browse Source 
Conflicts:
	src/monad
This commit is contained in:
Zachary Folwick
2015-08-24 11:48:22 -07:00
parent 632a11a6c6 1a3d4aa9a6
commit 972734cbc8
12 changed files with 20 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/monad
+1 -1
Submodule src/monad updated: 4e2140b943...2793b76e2d
src/monad-ext
+1 -1
Submodule src/monad-ext updated: 20468e65da...ea31eca622
src/monad-native
+1 -1
Submodule src/monad-native updated: a99c56eea3...440cf6a236
src/powershell-run/powershell-simple.cs
-61
View File
@@ -456,25 +456,6 @@ namespace ps_hello_world
}
}
public static void init()
{
//string psBasePath = System.IO.Directory.GetCurrentDirectory();
//PowerShellAssemblyLoadContextInitializer.SetPowerShellAssemblyLoadContext(psBasePath);
//Assembly a = Assembly.Load(new AssemblyName("System.Management.Automation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"));
//Console.WriteLine("##########################\nloaded assembly a=" + a + " during init\n#########################");
// PH: this debugging requires a change in the core PS stuff that was stashed away
// during source cleanup
/*
PowerShellAssemblyLoadContext asmLoadContext = PowerShellAssemblyLoadContextInitializer.AsmLoadContext;
IEnumerable<Assembly> assemblies = asmLoadContext.GetAssemblies("System.Management.Automation");
foreach (Assembly a in assemblies)
{
Console.WriteLine("a: " + a);
}*/
}
static void test1(string[] args)
{
InitialSessionState iss = InitialSessionState.CreateDefault2();
@@ -525,50 +506,8 @@ namespace ps_hello_world
}
}
public static int UnmanagedMain(int argc, [MarshalAs(UnmanagedType.LPArray,ArraySubType=UnmanagedType.LPStr,SizeParamIndex=0)] String[] argv)
{
init();
List<String> allArgs = new List<String>();
for (int i = 0; i < argc; ++i)
{
allArgs.Add(argv[i]);
}
List<string> filteredArgs = new List<string>();
if (allArgs.Count > 0)
{
for (int i = 0; i < allArgs.Count; ++i)
{
string arg = allArgs[i];
bool hasNext = (i+1)<allArgs.Count;
string nextArg = hasNext ? allArgs[i+1] : "";
if (hasNext && arg == "--working-dir")
{
Console.WriteLine("working dir set to: " + nextArg);
Directory.SetCurrentDirectory(nextArg);
++i;
}
else
filteredArgs.Add(arg);
}
}
test2(filteredArgs.ToArray());
return 0;
}
static void Main(string[] args)
{
// important:
// - this function must be called for the current version of PowerShell for Linux
// in order to load the assembly load context before anything else is loaded
// - this requirement will be removed through future updates to the native
// CLR hosting code (currently corerun)
init();
//test1(args);
test2(args);
}
src/ps_test/test_CorePsPlatform.cs
+11 -9
View File
@@ -53,15 +53,17 @@ namespace PSTests
RedirectStandardOutput = true,
UseShellExecute = false
};
Process process = Process.Start(startInfo);
// The process should always exit, but wait a set time just in case
process.WaitForExit(1000);
// The process should return an exit code of 0 on success
Assert.Equal(0, process.ExitCode);
// Get output of call to whoami without trailing newline
string username = process.StandardOutput.ReadToEnd().Trim();
// It should be the same as what our platform code returns
Assert.Equal(username, Platform.NonWindowsGetUserName());
using (Process process = Process.Start(startInfo))
{
// Get output of call to whoami without trailing newline
string username = process.StandardOutput.ReadToEnd().Trim();
process.WaitForExit();
// The process should return an exit code of 0 on success
Assert.Equal(0, process.ExitCode);
// It should be the same as what our platform code returns
Assert.Equal(username, Platform.NonWindowsGetUserName());
}
}
}
}