From fd75d29628fa473e4455b8bee01ced87565f8750 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Tue, 11 Aug 2015 16:03:00 -0700
Subject: [PATCH 01/40] changed ParsePathCommand.cs to get Split-Path unit
 tests to pass

---
 src/monad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/monad b/src/monad
index df562ce7ec..1b1329dfaa 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit df562ce7ecd60fb42e30702116123c8a58bf04d4
+Subproject commit 1b1329dfaa038799d0a9de5f17b6d3737abd2319

From 5968e97eaa1015424a72bb2cfbc344f5698b77b2 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Thu, 13 Aug 2015 11:40:07 -0700
Subject: [PATCH 02/40] changed PowerShell code to get Split-Path -Qualifier
 working in linux

---
 src/monad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/monad b/src/monad
index 1b1329dfaa..9d5fa55fce 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit 1b1329dfaa038799d0a9de5f17b6d3737abd2319
+Subproject commit 9d5fa55fceaff9514c5ffa26a0e1af01df05b7f3

From 4862e6cfd8cb77c6cb1440eb72431d8a729c453a Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Mon, 17 Aug 2015 15:03:14 -0700
Subject: [PATCH 03/40] added more tests to more thoroughly test split-path

---
 src/pester-tests/Test-Split-Path.Tests.ps1 | 48 ++++++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/pester-tests/Test-Split-Path.Tests.ps1 b/src/pester-tests/Test-Split-Path.Tests.ps1
index c599b2382d..f4965bd0fe 100644
--- a/src/pester-tests/Test-Split-Path.Tests.ps1
+++ b/src/pester-tests/Test-Split-Path.Tests.ps1
@@ -1,36 +1,66 @@
 Describe "Test-Split-Path" {
 <#
     Dependencies:
+
     1. Split-Path - FUT
     2. ForEach
     3. Object piping
     4. ls/Get-ChildItem - filter output of ls
 
+    parent and Literal 
+
 #>
     It "Should return a string object when invoked" {
-        (Split-Path .).GetType().Name          | Should Be "String"
-        (Split-Path . -Leaf).GetType().Name    | Should Be "String"
-        (Split-Path . -Resolve).GetType().Name | Should Be "String"
+        ( Split-Path . ).GetType().Name          | Should Be "String"
+        ( Split-Path . -Leaf ).GetType().Name    | Should Be "String"
+        ( Split-Path . -Resolve ).GetType().Name | Should Be "String"
     }
 
     It "Should return the name of the drive when the qualifier switch is used" {
-        Split-Path / -Qualifier | Should Be "/"
+        Split-Path / -Qualifier        | Should Be "/"
+        Split-Path /usr/bin -Qualifier | Should Be "/"
+    }
+
+    It "Should error when using the qualifier switch for a windows path while on a nonwindows machine" {
+         Split-Path "C:\Users" -Qualifier -ErrorAction SilentlyContinue  | Should Throw
+    }
+
+    It "Should error when no directory separator characters are used with a qualifier" {
+         Split-Path "abadTest" -Qualifier -ErrorAction SilentlyContinue  | Should Throw
+    }
+
+    It "Should return the path minus the drive when the noqualifier switch is used" { 
+        { Split-Path /usr/bin -NoQualifier } | Should Not Throw
+        Split-Path /usr/bin -NoQualifier | Should Be "usr/bin"
     }
 
     It "Should return the parent folder name when the leaf switch is used" {
-        Split-Path . -Leaf | Should be "pester-tests"
+        Split-Path /usr/bin -Leaf | Should be "bin"
     }
 
     It "Should be able to accept regular expression input and output an array for multiple objects" {
-        (Split-Path *Get*.ps1 -Leaf -Resolve).GetType().BaseType.Name | Should Be "Array"
+        ( Split-Path *Get*.ps1 -Leaf -Resolve ).GetType().BaseType.Name | Should Be "Array"
     }
 
     It "Should be able to tell if a given path is an absolute path" {
-        (Split-Path /usr/bin -IsAbsolute) | Should be $true
-        (Split-Path . -IsAbsolute)        | Should be $false
+        ( Split-Path /usr/bin -IsAbsolute ) | Should be $true
+        ( Split-Path . -IsAbsolute )        | Should be $false
     }
 
     It "Should support piping" {
-        ("." | Split-Path -leaf) | Should Be "pester-tests"
+        ( "/usr/bin" | Split-Path ) | Should Be "/usr"
     }
+
+    It "Should return the path up to the parent of the directory when Parent switch is used" {
+        Split-Path "/usr/bin" | Should Be ( Split-Path "/usr/bin" -Parent )
+    }
+
+    It "Should not throw if a parameterSetName is correct" {
+        { Split-Path "/usr/bin/" -Parent } | Should Not Throw
+    }
+
+    It "Should throw if a parameterSetName is incorrect" {
+        { Split-Path "/usr/bin/" -Parentaoeu } | Should Throw
+    }
+
 }

From 2689741ddc6a3fe4bea7a20ae4c64f505e9adfb0 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Mon, 17 Aug 2015 15:07:00 -0700
Subject: [PATCH 04/40] added support for PSL to remove qualifiers correctly

---
 src/monad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/monad b/src/monad
index 9d5fa55fce..0a5744c8da 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit 9d5fa55fceaff9514c5ffa26a0e1af01df05b7f3
+Subproject commit 0a5744c8da185fdde71fe7df7424978875476fb9

From 4f4cbbac2e072bf85d263a0829e6caa2fe96597c Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Thu, 20 Aug 2015 11:49:01 -0700
Subject: [PATCH 05/40] added tests to get working in linux

---
 src/pester-tests/Test-Remove-Item.Tests.ps1 | 152 ++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 src/pester-tests/Test-Remove-Item.Tests.ps1

diff --git a/src/pester-tests/Test-Remove-Item.Tests.ps1 b/src/pester-tests/Test-Remove-Item.Tests.ps1
new file mode 100644
index 0000000000..ef8244fd50
--- /dev/null
+++ b/src/pester-tests/Test-Remove-Item.Tests.ps1
@@ -0,0 +1,152 @@
+Describe "Test-Remove-Item" {
+    $testpath = "/tmp/"
+    $testfile = "testfile.txt"
+    $testfilepath = $testpath + $testfile
+    Context "File removal Tests" {
+        BeforeEach {
+            # redundant code in case the AfterEach fails
+            if (Test-Path $testfilepath)
+            {
+                Remove-Item $testfilepath -Force
+            }
+
+            New-Item -Name $testfile -Path $testpath -ItemType "file" -Value "lorem ipsum"
+
+            Test-path $testfilepath | Should Be $true
+        }
+
+        AfterEach {
+            if (Test-Path $testfilepath)
+            {
+                Remove-Item $testfilepath -Force
+            }
+
+            Test-Path $testfilepath | Should Be $false
+        }
+
+        It "Should be able to be called on a regular file without error using the Path switch" {
+            { Remove-Item -Path $testfilepath } | Should Not Throw
+        }
+
+        It "Should be able to be called on a file without the Path switch" {
+            { Remove-Item $testfilepath } | Should Not Throw
+        }
+
+        It "Should be able to call the rm alias" {
+            { rm $testfilepath } | Should Not Throw
+        }
+
+        It "Should be able to call the del alias" {
+            { del $testfilepath } | Should Not Throw
+        }
+
+        It "Should be able to call the erase alias" {
+            { erase $testfilepath } | Should Not Throw
+        }
+
+        It "Should be able to call the ri alias" {
+            { ri $testfilepath } | Should Not Throw
+        }
+
+        It "Should not be able to remove a read-only document without using the force switch" {
+        # Set to read only
+        Set-ItemProperty -Path $testfilepath -Name IsReadOnly -Value $true
+        # attempt to remove the file
+        { Remove-Item $testfilepath -ErrorAction SilentlyContinue } | Should Not Throw
+        # validate
+        Test-Path $testfilepath | Should Be $true
+
+        # set to not be read only
+        Set-ItemProperty -Path $testfilepath -Name IsReadOnly -Value $false
+        # remove
+        Remove-Item  $testfilepath -Force
+        # Validate 
+        Test-Path $testfilepath | Should Be $false
+    }
+
+        It "Should be able to remove all files matching a regular expression with the include switch" {
+         # Create multiple files with specific string
+         New-Item -Name file1.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
+         New-Item -Name file2.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
+         New-Item -Name file3.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
+         # Create a single file that does not match that string - already done in BeforeEach
+
+         # Delete the specific string
+         Remove-Item /tmp/* -Include file*.txt
+         # validate that the string under test was deleted, and the nonmatching strings still exist
+         Test-path /tmp/file1.txt | Should Be $false
+         Test-path /tmp/file2.txt | Should Be $false
+         Test-path /tmp/file3.txt | Should Be $false
+         Test-Path $testfilepath   | Should Be $true
+
+         # Delete the non-matching strings
+         Remove-Item $testfilepath
+        }
+
+        It "Should be able to not remove any files matching a regular expression with the exclude switch" {
+         # Create multiple files with specific string
+         New-Item -Name file1.wav -Path $testpath -ItemType "file" -Value "lorem ipsum"
+         New-Item -Name file2.wav -Path $testpath -ItemType "file" -Value "lorem ipsum"
+
+         # Create a single file that does not match that string
+         New-Item -Name file1.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
+         New-Item -Name file2.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
+
+         # Delete the specific string
+         Remove-Item /tmp/file* -Exclude *.wav -Include *.txt
+
+         # validate that the string under test was deleted, and the nonmatching strings still exist
+         Test-Path /tmp/file1.wav | Should Be $true
+         Test-Path /tmp/file2.wav | Should Be $true
+         Test-Path /tmp/file1.txt | Should Be $false
+         Test-path /tmp/file2.txt | Should Be $false
+
+         # Delete the non-matching strings
+         Remove-Item /tmp/file1.wav
+         Remove-Item /tmp/file2.wav
+
+         Test-Path /tmp/file1.wav | Should Be $false
+         Test-Path /tmp/file2.wav | Should Be $false
+        }
+    }
+
+    Context "Directory Removal Tests" {
+        $testdirectory = "/tmp/testdir"
+        $testsubdirectory = $testdirectory + "/subd"
+        BeforeEach{
+            if (Test-Path $testdirectory)
+            {
+                Remove-Item $testdirectory -Force
+            }
+
+            test-path $testdirectory | Should Be $false
+
+            New-Item -Name "testdir" -Path "/tmp/" -ItemType "directory"
+
+            test-path $testdirectory | Should Be $true
+        }
+
+        AfterEach {
+            if (Test-Path $testdirectory)
+            {
+                Remove-Item $testdirectory -Recurse -Force
+            }
+
+            Test-Path $testdirectory | Should Be $false
+        }
+
+        It "Should be able to remove a directory" {
+            { Remove-Item $testdirectory } | Should Not Throw
+        }
+
+        It "Should be able to recursively delete subfolders" {
+            New-Item -Name "subd" -Path $testdirectory -ItemType "directory"
+            New-Item -Name $testfile -Path $testsubdirectory -ItemType "file" -Value "lorem ipsum"
+
+            $complexDirectory = $testsubdirectory + "/" + $testfile
+            test-path $complexDirectory | Should Be $true
+
+            { Remove-Item $testdirectory -Recurse} | Should Not Throw
+        }
+    }
+}

From 8458e5779e84ce5c1299b6e02cb3ffd5f8e6ab01 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Fri, 21 Aug 2015 14:34:00 -0700
Subject: [PATCH 06/40] brought in submodule changes and modded test to not
 expect the / to be removed in the path

---
 src/monad                                  | 2 +-
 src/pester-tests/Test-Split-Path.Tests.ps1 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/monad b/src/monad
index 0a5744c8da..4e2140b943 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit 0a5744c8da185fdde71fe7df7424978875476fb9
+Subproject commit 4e2140b9436b5e5978752539ad06dbb0828f9b7e
diff --git a/src/pester-tests/Test-Split-Path.Tests.ps1 b/src/pester-tests/Test-Split-Path.Tests.ps1
index f4965bd0fe..33c1f5a96c 100644
--- a/src/pester-tests/Test-Split-Path.Tests.ps1
+++ b/src/pester-tests/Test-Split-Path.Tests.ps1
@@ -29,9 +29,9 @@
          Split-Path "abadTest" -Qualifier -ErrorAction SilentlyContinue  | Should Throw
     }
 
-    It "Should return the path minus the drive when the noqualifier switch is used" { 
+    It "Should return the path when the noqualifier switch is used on a linux system" { 
         { Split-Path /usr/bin -NoQualifier } | Should Not Throw
-        Split-Path /usr/bin -NoQualifier | Should Be "usr/bin"
+        Split-Path /usr/bin -NoQualifier | Should Be "/usr/bin"
     }
 
     It "Should return the parent folder name when the leaf switch is used" {

From 632a11a6c653393a83797aa517bb8ea372485ac2 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Fri, 21 Aug 2015 14:58:34 -0700
Subject: [PATCH 07/40] fixed typo using parent switch

---
 src/pester-tests/Test-Split-Path.Tests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pester-tests/Test-Split-Path.Tests.ps1 b/src/pester-tests/Test-Split-Path.Tests.ps1
index 33c1f5a96c..c200f35d5a 100644
--- a/src/pester-tests/Test-Split-Path.Tests.ps1
+++ b/src/pester-tests/Test-Split-Path.Tests.ps1
@@ -52,7 +52,7 @@
     }
 
     It "Should return the path up to the parent of the directory when Parent switch is used" {
-        Split-Path "/usr/bin" | Should Be ( Split-Path "/usr/bin" -Parent )
+        Split-Path "/usr/bin" -Parent | Should Be ( Split-Path "/usr/bin" -Parent )
     }
 
     It "Should not throw if a parameterSetName is correct" {

From 95e932d6d0a55d7283450edf737cffc241b1a39d Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Fri, 21 Aug 2015 15:51:27 -0700
Subject: [PATCH 08/40] removed AfterEach block because it's not required

---
 src/pester-tests/Test-Remove-Item.Tests.ps1 | 27 ++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/pester-tests/Test-Remove-Item.Tests.ps1 b/src/pester-tests/Test-Remove-Item.Tests.ps1
index ef8244fd50..fb21fbd58c 100644
--- a/src/pester-tests/Test-Remove-Item.Tests.ps1
+++ b/src/pester-tests/Test-Remove-Item.Tests.ps1
@@ -11,55 +11,60 @@
             }
 
             New-Item -Name $testfile -Path $testpath -ItemType "file" -Value "lorem ipsum"
-
-            Test-path $testfilepath | Should Be $true
-        }
-
-        AfterEach {
-            if (Test-Path $testfilepath)
-            {
-                Remove-Item $testfilepath -Force
-            }
-
-            Test-Path $testfilepath | Should Be $false
         }
 
         It "Should be able to be called on a regular file without error using the Path switch" {
             { Remove-Item -Path $testfilepath } | Should Not Throw
+
+            Test-Path $testfilepath | Should Be $false
         }
 
         It "Should be able to be called on a file without the Path switch" {
             { Remove-Item $testfilepath } | Should Not Throw
+
+            Test-Path $testfilepath | Should Be $false
         }
 
         It "Should be able to call the rm alias" {
             { rm $testfilepath } | Should Not Throw
+
+            Test-Path $testfilepath | Should Be $false
         }
 
         It "Should be able to call the del alias" {
             { del $testfilepath } | Should Not Throw
+
+            Test-Path $testfilepath | Should Be $false
         }
 
         It "Should be able to call the erase alias" {
             { erase $testfilepath } | Should Not Throw
+
+            Test-Path $testfilepath | Should Be $false
         }
 
         It "Should be able to call the ri alias" {
             { ri $testfilepath } | Should Not Throw
+
+            Test-Path $testfilepath | Should Be $false
         }
 
         It "Should not be able to remove a read-only document without using the force switch" {
         # Set to read only
         Set-ItemProperty -Path $testfilepath -Name IsReadOnly -Value $true
+
         # attempt to remove the file
         { Remove-Item $testfilepath -ErrorAction SilentlyContinue } | Should Not Throw
+
         # validate
         Test-Path $testfilepath | Should Be $true
 
         # set to not be read only
         Set-ItemProperty -Path $testfilepath -Name IsReadOnly -Value $false
+
         # remove
         Remove-Item  $testfilepath -Force
+
         # Validate 
         Test-Path $testfilepath | Should Be $false
     }

From 8091785240a61948441a666a8af9a56aae54f01f Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Fri, 21 Aug 2015 15:57:34 -0700
Subject: [PATCH 09/40] Fixed whitespace and directory test assertions

---
 src/pester-tests/Test-Remove-Item.Tests.ps1 | 105 ++++++++++----------
 1 file changed, 50 insertions(+), 55 deletions(-)

diff --git a/src/pester-tests/Test-Remove-Item.Tests.ps1 b/src/pester-tests/Test-Remove-Item.Tests.ps1
index fb21fbd58c..754ed84b0d 100644
--- a/src/pester-tests/Test-Remove-Item.Tests.ps1
+++ b/src/pester-tests/Test-Remove-Item.Tests.ps1
@@ -50,68 +50,68 @@
         }
 
         It "Should not be able to remove a read-only document without using the force switch" {
-        # Set to read only
-        Set-ItemProperty -Path $testfilepath -Name IsReadOnly -Value $true
+            # Set to read only
+            Set-ItemProperty -Path $testfilepath -Name IsReadOnly -Value $true
 
-        # attempt to remove the file
-        { Remove-Item $testfilepath -ErrorAction SilentlyContinue } | Should Not Throw
+            # attempt to remove the file
+            { Remove-Item $testfilepath -ErrorAction SilentlyContinue } | Should Not Throw
 
-        # validate
-        Test-Path $testfilepath | Should Be $true
+            # validate
+            Test-Path $testfilepath | Should Be $true
 
-        # set to not be read only
-        Set-ItemProperty -Path $testfilepath -Name IsReadOnly -Value $false
+            # set to not be read only
+            Set-ItemProperty -Path $testfilepath -Name IsReadOnly -Value $false
 
-        # remove
-        Remove-Item  $testfilepath -Force
+            # remove
+            Remove-Item  $testfilepath -Force
 
-        # Validate 
-        Test-Path $testfilepath | Should Be $false
-    }
+            # Validate 
+            Test-Path $testfilepath | Should Be $false
+        }
 
         It "Should be able to remove all files matching a regular expression with the include switch" {
-         # Create multiple files with specific string
-         New-Item -Name file1.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
-         New-Item -Name file2.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
-         New-Item -Name file3.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
-         # Create a single file that does not match that string - already done in BeforeEach
+            # Create multiple files with specific string
+            New-Item -Name file1.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
+            New-Item -Name file2.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
+            New-Item -Name file3.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
+            # Create a single file that does not match that string - already done in BeforeEach
 
-         # Delete the specific string
-         Remove-Item /tmp/* -Include file*.txt
-         # validate that the string under test was deleted, and the nonmatching strings still exist
-         Test-path /tmp/file1.txt | Should Be $false
-         Test-path /tmp/file2.txt | Should Be $false
-         Test-path /tmp/file3.txt | Should Be $false
-         Test-Path $testfilepath   | Should Be $true
+            # Delete the specific string
+            Remove-Item /tmp/* -Include file*.txt
+            # validate that the string under test was deleted, and the nonmatching strings still exist
+            Test-path /tmp/file1.txt | Should Be $false
+            Test-path /tmp/file2.txt | Should Be $false
+            Test-path /tmp/file3.txt | Should Be $false
+            Test-Path $testfilepath   | Should Be $true
 
-         # Delete the non-matching strings
-         Remove-Item $testfilepath
+            # Delete the non-matching strings
+            Remove-Item $testfilepath
         }
 
         It "Should be able to not remove any files matching a regular expression with the exclude switch" {
-         # Create multiple files with specific string
-         New-Item -Name file1.wav -Path $testpath -ItemType "file" -Value "lorem ipsum"
-         New-Item -Name file2.wav -Path $testpath -ItemType "file" -Value "lorem ipsum"
+            # Create multiple files with specific string
+            New-Item -Name file1.wav -Path $testpath -ItemType "file" -Value "lorem ipsum"
+            New-Item -Name file2.wav -Path $testpath -ItemType "file" -Value "lorem ipsum"
 
-         # Create a single file that does not match that string
-         New-Item -Name file1.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
-         New-Item -Name file2.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
+            # Create a single file that does not match that string
+            New-Item -Name file1.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
+            New-Item -Name file2.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
 
-         # Delete the specific string
-         Remove-Item /tmp/file* -Exclude *.wav -Include *.txt
+            # Delete the specific string
+            Remove-Item /tmp/file* -Exclude *.wav -Include *.txt
 
-         # validate that the string under test was deleted, and the nonmatching strings still exist
-         Test-Path /tmp/file1.wav | Should Be $true
-         Test-Path /tmp/file2.wav | Should Be $true
-         Test-Path /tmp/file1.txt | Should Be $false
-         Test-path /tmp/file2.txt | Should Be $false
+            # validate that the string under test was deleted, and the nonmatching strings still exist
+            Test-Path /tmp/file1.wav | Should Be $true
+            Test-Path /tmp/file2.wav | Should Be $true
+            Test-Path /tmp/file1.txt | Should Be $false
+            Test-path /tmp/file2.txt | Should Be $false
 
-         # Delete the non-matching strings
-         Remove-Item /tmp/file1.wav
-         Remove-Item /tmp/file2.wav
+            # Delete the non-matching strings
+            Remove-Item /tmp/file1.wav
+            Remove-Item /tmp/file2.wav
 
-         Test-Path /tmp/file1.wav | Should Be $false
-         Test-Path /tmp/file2.wav | Should Be $false
+            Test-Path /tmp/file1.wav | Should Be $false
+            Test-Path /tmp/file2.wav | Should Be $false
         }
     }
 
@@ -131,17 +131,10 @@
             test-path $testdirectory | Should Be $true
         }
 
-        AfterEach {
-            if (Test-Path $testdirectory)
-            {
-                Remove-Item $testdirectory -Recurse -Force
-            }
-
-            Test-Path $testdirectory | Should Be $false
-        }
-
         It "Should be able to remove a directory" {
             { Remove-Item $testdirectory } | Should Not Throw
+
+            Test-Path $testdirectory | Should Be $false
         }
 
         It "Should be able to recursively delete subfolders" {
@@ -152,6 +145,8 @@
             test-path $complexDirectory | Should Be $true
 
             { Remove-Item $testdirectory -Recurse} | Should Not Throw
+
+            Test-Path $testdirectory | Should Be $false
         }
     }
-}
+}

From df2a4939ed374ee19cd22982842553e0f9c433fb Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Wed, 26 Aug 2015 10:53:36 -0700
Subject: [PATCH 10/40] added code review changes

---
 src/pester-tests/Test-Split-Path.Tests.ps1 | 48 ++++++++++++++--------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/pester-tests/Test-Split-Path.Tests.ps1 b/src/pester-tests/Test-Split-Path.Tests.ps1
index c200f35d5a..ec3283057b 100644
--- a/src/pester-tests/Test-Split-Path.Tests.ps1
+++ b/src/pester-tests/Test-Split-Path.Tests.ps1
@@ -1,15 +1,8 @@
 Describe "Test-Split-Path" {
-<#
-    Dependencies:
+    $testDir                = "/tmp"
+    $testfile               = "testfile.ps1"
+    $FullyQualifiedTestFile = $testDir + "/" + $testFile
 
-    1. Split-Path - FUT
-    2. ForEach
-    3. Object piping
-    4. ls/Get-ChildItem - filter output of ls
-
-    parent and Literal 
-
-#>
     It "Should return a string object when invoked" {
         ( Split-Path . ).GetType().Name          | Should Be "String"
         ( Split-Path . -Leaf ).GetType().Name    | Should Be "String"
@@ -22,6 +15,9 @@
     }
 
     It "Should error when using the qualifier switch for a windows path while on a nonwindows machine" {
+        # ErrorAction SilentlyContinue merely suppresses the error from the console.
+        # Throwing exceptions still seen by Pester.
+
          Split-Path "C:\Users" -Qualifier -ErrorAction SilentlyContinue  | Should Throw
     }
 
@@ -31,7 +27,7 @@
 
     It "Should return the path when the noqualifier switch is used on a linux system" { 
         { Split-Path /usr/bin -NoQualifier } | Should Not Throw
-        Split-Path /usr/bin -NoQualifier | Should Be "/usr/bin"
+        Split-Path /usr/bin -NoQualifier     | Should Be "/usr/bin"
     }
 
     It "Should return the parent folder name when the leaf switch is used" {
@@ -39,12 +35,32 @@
     }
 
     It "Should be able to accept regular expression input and output an array for multiple objects" {
-        ( Split-Path *Get*.ps1 -Leaf -Resolve ).GetType().BaseType.Name | Should Be "Array"
+        $testfile2               = "testfilenumber2.ps1"
+        $FullyQualifiedTestFile2 = $testDir + "/" + $testfile2
+
+        New-Item -ItemType file -Path $FullyQualifiedTestFile, $FullyQualifiedTestFile2
+
+        Test-Path $FullyQualifiedTestFile  | Should Be $true
+        Test-Path $FullyQualifiedTestFile2 | Should Be $true
+
+        ( Split-Path /tmp/*estf*.ps1 -Leaf -Resolve ).GetType().BaseType.Name | Should Be "Array"
+        ( Split-path /tmp/*estf*.ps1 -Leaf -Resolve )[0]                      | Should Be $testfile
+        ( Split-path /tmp/*estf*.ps1 -Leaf -Resolve )[1]                      | Should Be $testfile2
+
+        Remove-Item $FullyQualifiedTestFile, $FullyQualifiedTestFile2
     }
 
     It "Should be able to tell if a given path is an absolute path" {
         ( Split-Path /usr/bin -IsAbsolute ) | Should be $true
+        ( Split-Path .. -IsAbsolute )       | Should be $false
+        ( Split-Path /usr/.. -IsAbsolute )  | Should be $true
+        ( Split-Path /usr/../ -IsAbsolute ) | Should be $true
+        ( Split-Path ../ -IsAbsolute )      | Should be $false
         ( Split-Path . -IsAbsolute )        | Should be $false
+        ( Split-Path ~/ -IsAbsolute )       | Should be $false
+        ( Split-Path ~/.. -IsAbsolute )     | Should be $false
+        ( Split-Path ~/../.. -IsAbsolute )  | Should be $false
+
     }
 
     It "Should support piping" {
@@ -52,15 +68,11 @@
     }
 
     It "Should return the path up to the parent of the directory when Parent switch is used" {
-        Split-Path "/usr/bin" -Parent | Should Be ( Split-Path "/usr/bin" -Parent )
-    }
-
-    It "Should not throw if a parameterSetName is correct" {
-        { Split-Path "/usr/bin/" -Parent } | Should Not Throw
+        Split-Path "/usr/bin" -Parent | Should Be "/usr"
     }
 
     It "Should throw if a parameterSetName is incorrect" {
-        { Split-Path "/usr/bin/" -Parentaoeu } | Should Throw
+        { Split-Path "/usr/bin/" -Parentaoeu } | Should Throw "A parameter cannot be found that matches parameter name"
     }
 
 }

From f4ea2ba4f844157a0f43a4398264b3391c324770 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Wed, 26 Aug 2015 11:17:52 -0700
Subject: [PATCH 11/40] added tests from CR

---
 src/pester-tests/Test-Split-Path.Tests.ps1 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pester-tests/Test-Split-Path.Tests.ps1 b/src/pester-tests/Test-Split-Path.Tests.ps1
index ec3283057b..cfd7ada3ed 100644
--- a/src/pester-tests/Test-Split-Path.Tests.ps1
+++ b/src/pester-tests/Test-Split-Path.Tests.ps1
@@ -31,7 +31,9 @@
     }
 
     It "Should return the parent folder name when the leaf switch is used" {
-        Split-Path /usr/bin -Leaf | Should be "bin"
+        Split-Path /usr/bin -Leaf       | Should be "bin"
+        Split-Path /usr/local/bin -Leaf | Should be "bin"
+        Split-Path usr/bin -Leaf        | Should be "bin"
     }
 
     It "Should be able to accept regular expression input and output an array for multiple objects" {
@@ -68,7 +70,9 @@
     }
 
     It "Should return the path up to the parent of the directory when Parent switch is used" {
-        Split-Path "/usr/bin" -Parent | Should Be "/usr"
+        Split-Path "/usr/bin" -Parent       | Should Be "/usr"
+        Split-Path "/usr/local/bin" -Parent | Should Be "/usr/local"
+        Split-Path "usr/local/bin" -Parent  | Should Be "usr/local"
     }
 
     It "Should throw if a parameterSetName is incorrect" {

From 38c1047ebaf265c562171257e1e7f19dc49dafef Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Wed, 26 Aug 2015 12:56:38 -0700
Subject: [PATCH 12/40] Added logic to handle failing jenkins test

---
 src/pester-tests/Test-Split-Path.Tests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pester-tests/Test-Split-Path.Tests.ps1 b/src/pester-tests/Test-Split-Path.Tests.ps1
index cfd7ada3ed..e0c69c83c7 100644
--- a/src/pester-tests/Test-Split-Path.Tests.ps1
+++ b/src/pester-tests/Test-Split-Path.Tests.ps1
@@ -40,7 +40,7 @@
         $testfile2               = "testfilenumber2.ps1"
         $FullyQualifiedTestFile2 = $testDir + "/" + $testfile2
 
-        New-Item -ItemType file -Path $FullyQualifiedTestFile, $FullyQualifiedTestFile2
+        New-Item -ItemType file -Path $FullyQualifiedTestFile, $FullyQualifiedTestFile2 -Force
 
         Test-Path $FullyQualifiedTestFile  | Should Be $true
         Test-Path $FullyQualifiedTestFile2 | Should Be $true

From f475db96cb5653dd0462a2598428538b8c8c4889 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Wed, 26 Aug 2015 14:30:02 -0700
Subject: [PATCH 13/40] using a created temp directory instead of the root temp
 directory.

---
 src/pester-tests/Test-Split-Path.Tests.ps1 | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pester-tests/Test-Split-Path.Tests.ps1 b/src/pester-tests/Test-Split-Path.Tests.ps1
index e0c69c83c7..5a50791b75 100644
--- a/src/pester-tests/Test-Split-Path.Tests.ps1
+++ b/src/pester-tests/Test-Split-Path.Tests.ps1
@@ -1,8 +1,9 @@
 Describe "Test-Split-Path" {
-    $testDir                = "/tmp"
+    # Use the local directory because it's renewed each time with the correct privileges
+    $testDir                = "./tmp"
     $testfile               = "testfile.ps1"
     $FullyQualifiedTestFile = $testDir + "/" + $testFile
-
+ls
     It "Should return a string object when invoked" {
         ( Split-Path . ).GetType().Name          | Should Be "String"
         ( Split-Path . -Leaf ).GetType().Name    | Should Be "String"
@@ -45,11 +46,14 @@
         Test-Path $FullyQualifiedTestFile  | Should Be $true
         Test-Path $FullyQualifiedTestFile2 | Should Be $true
 
-        ( Split-Path /tmp/*estf*.ps1 -Leaf -Resolve ).GetType().BaseType.Name | Should Be "Array"
-        ( Split-path /tmp/*estf*.ps1 -Leaf -Resolve )[0]                      | Should Be $testfile
-        ( Split-path /tmp/*estf*.ps1 -Leaf -Resolve )[1]                      | Should Be $testfile2
+        ( Split-Path ./tmp/*estf*.ps1 -Leaf -Resolve ).GetType().BaseType.Name | Should Be "Array"
+        ( Split-path ./tmp/*estf*.ps1 -Leaf -Resolve )[0]                      | Should Be $testfile
+        ( Split-path ./tmp/*estf*.ps1 -Leaf -Resolve )[1]                      | Should Be $testfile2
 
         Remove-Item $FullyQualifiedTestFile, $FullyQualifiedTestFile2
+
+        Test-Path $FullyQualifiedTestFile  | Should Be $false
+        Test-Path $FullyQualifiedTestFile2 | Should Be $false
     }
 
     It "Should be able to tell if a given path is an absolute path" {
@@ -78,5 +82,4 @@
     It "Should throw if a parameterSetName is incorrect" {
         { Split-Path "/usr/bin/" -Parentaoeu } | Should Throw "A parameter cannot be found that matches parameter name"
     }
-
 }

From f8179859b154d006c1b15a91c2b062b907e983d5 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Wed, 26 Aug 2015 14:34:44 -0700
Subject: [PATCH 14/40] bringing submodules up to date

---
 src/monad        | 2 +-
 src/monad-ext    | 2 +-
 src/monad-native | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/monad b/src/monad
index df562ce7ec..2793b76e2d 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit df562ce7ecd60fb42e30702116123c8a58bf04d4
+Subproject commit 2793b76e2d48f012a82b8e9106b9e9f496d3b785
diff --git a/src/monad-ext b/src/monad-ext
index 20468e65da..ea31eca622 160000
--- a/src/monad-ext
+++ b/src/monad-ext
@@ -1 +1 @@
-Subproject commit 20468e65dac6fa5a1b4cf6971ff490e548531822
+Subproject commit ea31eca6223992fa9729af67518930b6b45829d3
diff --git a/src/monad-native b/src/monad-native
index a99c56eea3..440cf6a236 160000
--- a/src/monad-native
+++ b/src/monad-native
@@ -1 +1 @@
-Subproject commit a99c56eea3264b8c492bc0edf5e3a65102397af9
+Subproject commit 440cf6a236067eba2d5dcfd5e3707a36295cee97

From 8456bf9d4d1450c413a7a0c66890795688079096 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Wed, 26 Aug 2015 15:13:12 -0700
Subject: [PATCH 15/40] added modifications from code review.

---
 src/pester-tests/Test-Remove-Item.Tests.ps1 | 37 +++++++--------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/pester-tests/Test-Remove-Item.Tests.ps1 b/src/pester-tests/Test-Remove-Item.Tests.ps1
index 754ed84b0d..2c1c0d9947 100644
--- a/src/pester-tests/Test-Remove-Item.Tests.ps1
+++ b/src/pester-tests/Test-Remove-Item.Tests.ps1
@@ -4,13 +4,10 @@
     $testfilepath = $testpath + $testfile
     Context "File removal Tests" {
         BeforeEach {
-            # redundant code in case the AfterEach fails
-            if (Test-Path $testfilepath)
-            {
-                Remove-Item $testfilepath -Force
-            }
+            New-Item -Name $testfile -Path $testpath -ItemType "file" -Value "lorem ipsum" -Force
+
+            Test-Path $testfilepath | Should Be $true
 
-            New-Item -Name $testfile -Path $testpath -ItemType "file" -Value "lorem ipsum"
         }
 
         It "Should be able to be called on a regular file without error using the Path switch" {
@@ -54,18 +51,15 @@
             Set-ItemProperty -Path $testfilepath -Name IsReadOnly -Value $true
 
             # attempt to remove the file
-            { Remove-Item $testfilepath -ErrorAction SilentlyContinue } | Should Not Throw
+            { Remove-Item $testfilepath  } | Should Not Throw
 
             # validate
             Test-Path $testfilepath | Should Be $true
 
-            # set to not be read only
-            Set-ItemProperty -Path $testfilepath -Name IsReadOnly -Value $false
-
-            # remove
+            # remove using the -force switch on the readonly object
             Remove-Item  $testfilepath -Force
 
-            # Validate 
+            # Validate
             Test-Path $testfilepath | Should Be $false
         }
 
@@ -82,10 +76,12 @@
             Test-path /tmp/file1.txt | Should Be $false
             Test-path /tmp/file2.txt | Should Be $false
             Test-path /tmp/file3.txt | Should Be $false
-            Test-Path $testfilepath   | Should Be $true
+            Test-Path $testfilepath  | Should Be $true
 
             # Delete the non-matching strings
             Remove-Item $testfilepath
+
+            Test-Path $testfilepath  | Should Be $false
         }
 
         It "Should be able to not remove any files matching a regular expression with the exclude switch" {
@@ -95,7 +91,6 @@
 
             # Create a single file that does not match that string
             New-Item -Name file1.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
-            New-Item -Name file2.txt -Path $testpath -ItemType "file" -Value "lorem ipsum"
 
             # Delete the specific string
             Remove-Item /tmp/file* -Exclude *.wav -Include *.txt
@@ -104,7 +99,6 @@
             Test-Path /tmp/file1.wav | Should Be $true
             Test-Path /tmp/file2.wav | Should Be $true
             Test-Path /tmp/file1.txt | Should Be $false
-            Test-path /tmp/file2.txt | Should Be $false
 
             # Delete the non-matching strings
             Remove-Item /tmp/file1.wav
@@ -118,17 +112,10 @@
     Context "Directory Removal Tests" {
         $testdirectory = "/tmp/testdir"
         $testsubdirectory = $testdirectory + "/subd"
-        BeforeEach{
-            if (Test-Path $testdirectory)
-            {
-                Remove-Item $testdirectory -Force
-            }
+        BeforeEach {
+            New-Item -Name "testdir" -Path "/tmp/" -ItemType "directory" -Force
 
-            test-path $testdirectory | Should Be $false
-
-            New-Item -Name "testdir" -Path "/tmp/" -ItemType "directory"
-
-            test-path $testdirectory | Should Be $true
+            Test-Path $testdirectory | Should Be $true
         }
 
         It "Should be able to remove a directory" {

From 8501e6e4abb63081a0ff2e3c2d1ab1866fc79f82 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Wed, 26 Aug 2015 15:55:44 -0700
Subject: [PATCH 16/40] fixing issue with errorAction not suppressed- produces
 false positives on the test logs

---
 src/pester-tests/Test-Remove-Item.Tests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pester-tests/Test-Remove-Item.Tests.ps1 b/src/pester-tests/Test-Remove-Item.Tests.ps1
index 2c1c0d9947..017a461d7e 100644
--- a/src/pester-tests/Test-Remove-Item.Tests.ps1
+++ b/src/pester-tests/Test-Remove-Item.Tests.ps1
@@ -51,7 +51,7 @@
             Set-ItemProperty -Path $testfilepath -Name IsReadOnly -Value $true
 
             # attempt to remove the file
-            { Remove-Item $testfilepath  } | Should Not Throw
+            { Remove-Item $testfilepath -ErrorAction SilentlyContinue } | Should Not Throw
 
             # validate
             Test-Path $testfilepath | Should Be $true

From 913b5a97d09d18104b934d24a2897cb38d207a44 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Fri, 28 Aug 2015 10:12:27 -0700
Subject: [PATCH 17/40] Pin src/monad to develop-2015-08-28

Build files updated. Patches squashed and rebased.
---
 scripts/gen/SYS_AUTO/ParserStrings.cs         |  72 ++++++++++++++
 scripts/gen/SYS_AUTO/ParserStrings.resources  | Bin 58579 -> 59889 bytes
 .../gen/SYS_AUTO/RemotingErrorIdStrings.cs    |  90 ++++++++++++++++++
 .../SYS_AUTO/RemotingErrorIdStrings.resources | Bin 71102 -> 73027 bytes
 src/monad                                     |   2 +-
 5 files changed, 163 insertions(+), 1 deletion(-)

diff --git a/scripts/gen/SYS_AUTO/ParserStrings.cs b/scripts/gen/SYS_AUTO/ParserStrings.cs
index 5735d3e3c8..b8fe6662bc 100644
--- a/scripts/gen/SYS_AUTO/ParserStrings.cs
+++ b/scripts/gen/SYS_AUTO/ParserStrings.cs
@@ -595,6 +595,15 @@ internal class ParserStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Failed to convert the value of CimProperty {0} to the property value of class {1}..
+    /// </summary>
+    internal static string ConvertCimPropertyToObjectPropertyFailed {
+        get {
+            return ResourceManager.GetString("ConvertCimPropertyToObjectPropertyFailed", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to Could not get dispatch ID for {0} (error: {1})..
     /// </summary>
@@ -838,6 +847,15 @@ internal class ParserStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Keyword &apos;{0}&apos; already defined in the configuration..
+    /// </summary>
+    internal static string DuplicateKeywordDefinition {
+        get {
+            return ResourceManager.GetString("DuplicateKeywordDefinition", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to Duplicate named arguments &apos;{0}&apos; are not allowed..
     /// </summary>
@@ -1090,6 +1108,15 @@ internal class ParserStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Property {0} of PowerShell class {1} is not declared as array type, but defined in its configuration instance as instance array type..
+    /// </summary>
+    internal static string ExpectArrayTypeOfPropertyInPSClass {
+        get {
+            return ResourceManager.GetString("ExpectArrayTypeOfPropertyInPSClass", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to An expression was expected after &apos;(&apos;..
     /// </summary>
@@ -1430,6 +1457,15 @@ internal class ParserStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Failed to create an object of PowerShell class {0}..
+    /// </summary>
+    internal static string InstantiatePSClassObjectFailed {
+        get {
+            return ResourceManager.GetString("InstantiatePSClassObjectFailed", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to &apos;{0}&apos;: Interface name expected..
     /// </summary>
@@ -1538,6 +1574,15 @@ internal class ParserStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to The hashtable supplied to the Desired State Configuration resource {0} is not valid. The key or value cannot be null or empty..
+    /// </summary>
+    internal static string InvalidHashtable {
+        get {
+            return ResourceManager.GetString("InvalidHashtable", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to The member &apos;{0}&apos; is not valid. Valid members are
     ///&apos;{1}&apos;..
@@ -1602,6 +1647,15 @@ internal class ParserStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to The username supplied to the Desired State Configuration resource {0} is not valid. The username cannot be null or empty..
+    /// </summary>
+    internal static string InvalidPassword {
+        get {
+            return ResourceManager.GetString("InvalidPassword", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to The PowerShell data file &apos;{0}&apos; is invalid since it cannot be evaluated into a Hashtable object..
     /// </summary>
@@ -1665,6 +1719,15 @@ internal class ParserStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to The username supplied to the Desired State Configuration resource {0} is not valid. The username cannot be null or empty..
+    /// </summary>
+    internal static string InvalidUserName {
+        get {
+            return ResourceManager.GetString("InvalidUserName", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to Expression is not allowed in a Using expression..
     /// </summary>
@@ -2925,6 +2988,15 @@ internal class ParserStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Property {0} is not declared in PowerShell class {1}, but defined in its configuration instance..
+    /// </summary>
+    internal static string PropertyNotDeclaredInPSClass {
+        get {
+            return ResourceManager.GetString("PropertyNotDeclaredInPSClass", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to The property &apos;{0}&apos; cannot be found on this object. Verify that the property exists and can be set..
     /// </summary>
diff --git a/scripts/gen/SYS_AUTO/ParserStrings.resources b/scripts/gen/SYS_AUTO/ParserStrings.resources
index c0d703f77c91016be0c87e99811acff3dcb526b7..7efbef9ebfe374931e2a06132779e97807e587ca 100644
GIT binary patch
delta 6170
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
VF3RP{TpMS9LZ0Ufe}84<{{o_rng;*?

delta 5261
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

diff --git a/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.cs b/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.cs
index 114fdf01b4..c8eb48f795 100644
--- a/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.cs
+++ b/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.cs
@@ -250,6 +250,15 @@ internal class RemotingErrorIdStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Failed to find vmcompute.dll. The Hyper-V role may not be enabled on this machine..
+    /// </summary>
+    internal static string CannotFindVmComputeDll {
+        get {
+            return ResourceManager.GetString("CannotFindVmComputeDll", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to The call to Windows API GetStdHandle to get the Standard Error handle resulted in an error code: {0}..
     /// </summary>
@@ -538,6 +547,15 @@ internal class RemotingErrorIdStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Could not find the toolkit, &apos;{0}&apos;. The toolkit must be a file named &apos;{1}&apos; within a &apos;Toolkits&apos; directory in a module in the current module path..
+    /// </summary>
+    internal static string CouldNotFindToolkit {
+        get {
+            return ResourceManager.GetString("CouldNotFindToolkit", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to {0} is not a valid value for the parameter {1}. The value must be greater than or equal to 0..
     /// </summary>
@@ -767,6 +785,15 @@ internal class RemotingErrorIdStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Could not parse visible command defintion for &apos;{0}&apos;. The visible command definition must be a hashtable with the keys of &apos;Name&apos; and &apos;Parameters&apos;. The value of the &apos;Parameters&apos; key must be a collection of hashtables with the keys &apos;Name&apos;, and optionally either &apos;ValidateSet&apos; or &apos;ValidatePattern&apos;..
+    /// </summary>
+    internal static string DISCCommandModificationSyntax {
+        get {
+            return ResourceManager.GetString("DISCCommandModificationSyntax", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to Company associated with this session configuration.
     /// </summary>
@@ -956,6 +983,15 @@ internal class RemotingErrorIdStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to User roles (security groups), and the additional configuration settings that should be applied to them.
+    /// </summary>
+    internal static string DISCRoleDefinitionsComment {
+        get {
+            return ResourceManager.GetString("DISCRoleDefinitionsComment", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to Version number of the schema used for this configuration file.
     /// </summary>
@@ -974,6 +1010,15 @@ internal class RemotingErrorIdStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Toolkits to apply to this session configuration. This toolkit must be defined as a session configuration file named after that toolkit within a &apos;Toolkits&apos; directory in a module in the current module path..
+    /// </summary>
+    internal static string DISCToolkitsToLoadComment {
+        get {
+            return ResourceManager.GetString("DISCToolkitsToLoadComment", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to Specifies the transport options for this session configuration.
     /// </summary>
@@ -1629,6 +1674,33 @@ internal class RemotingErrorIdStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to The &apos;Roles&apos; entry must be a hashtable, but was a {0}..
+    /// </summary>
+    internal static string InvalidRoleEntry {
+        get {
+            return ResourceManager.GetString("InvalidRoleEntry", resourceCulture);
+        }
+    }
+    
+    /// <summary>
+    ///   Looks up a localized string similar to The key &apos;{0}&apos; is not valid in a toolkit or role definition..
+    /// </summary>
+    internal static string InvalidRoleToolkitKey {
+        get {
+            return ResourceManager.GetString("InvalidRoleToolkitKey", resourceCulture);
+        }
+    }
+    
+    /// <summary>
+    ///   Looks up a localized string similar to Could not convert the value of the &apos;{0}&apos; role entry to a hashtable. The &apos;Roles&apos; entry must be a hashtable with group names for keys, where the value associated with each key is another hashtable of session configuration properties for that role..
+    /// </summary>
+    internal static string InvalidRoleValue {
+        get {
+            return ResourceManager.GetString("InvalidRoleValue", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to {0} is not a valid schema value. Valid values are &quot;http&quot; and &quot;https&quot;..
     /// </summary>
@@ -3053,6 +3125,15 @@ internal class RemotingErrorIdStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Failed to create an instance of RemoteSessionHyperVSocketServer..
+    /// </summary>
+    internal static string RemoteSessionHyperVSocketServerConstructorFailure {
+        get {
+            return ResourceManager.GetString("RemoteSessionHyperVSocketServerConstructorFailure", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to Remote transport error: {0}.
     /// </summary>
@@ -3837,6 +3918,15 @@ internal class RemotingErrorIdStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to WSMan Initialization failed with error code: {0}..
+    /// </summary>
+    internal static string WSManInitFailed {
+        get {
+            return ResourceManager.GetString("WSManInitFailed", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to The maximum number of WS-Man URI redirections to allow while connecting to a remote computer.
     /// </summary>
diff --git a/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.resources b/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.resources
index 7b771f8a5ad583b68e91c923db4e95fa57879e73..f3a113e04ac1b72a6186e7e803699fe47e4d7c54 100644
GIT binary patch
delta 7701
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

delta 5870
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

diff --git a/src/monad b/src/monad
index 2793b76e2d..44427ec1f3 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit 2793b76e2d48f012a82b8e9106b9e9f496d3b785
+Subproject commit 44427ec1f38f443a8b90a48e50a4d40beed0fa05

From 93199735d83449ef50303fb580bdb56625e8b140 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Thu, 27 Aug 2015 16:16:13 -0700
Subject: [PATCH 18/40] added unit test for getting the machine name from the
 p/invoke

---
 src/ps_test/test_CorePsPlatform.cs | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/ps_test/test_CorePsPlatform.cs b/src/ps_test/test_CorePsPlatform.cs
index 99a3d8f3f2..0f937df3b2 100644
--- a/src/ps_test/test_CorePsPlatform.cs
+++ b/src/ps_test/test_CorePsPlatform.cs
@@ -65,5 +65,29 @@ namespace PSTests
                 Assert.Equal(username, Platform.NonWindowsGetUserName());
             }
         }
+
+        [Fact]
+        public static void TestGetMachineName()
+        {
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = @"/usr/hostname",
+                RedirectStandardOutput = true,
+                UseShellExecute = false
+            };
+            using (Process process = Process.Start(startInfo))
+            {
+                 // Get output of call to hostname without trailing newline
+                string hostname = 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(hostname, Platform.NonWindowsGetMachineName());
+            }
+
+
+        }
     }
 }

From 6a88fe52aa81709656b40e18173c09e0271aa929 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Fri, 28 Aug 2015 14:45:56 -0700
Subject: [PATCH 19/40] Fix GetComputerName xUnit test and repin monad

---
 src/monad                          | 2 +-
 src/ps_test/test_CorePsPlatform.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/monad b/src/monad
index 44427ec1f3..8e014f44d7 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit 44427ec1f38f443a8b90a48e50a4d40beed0fa05
+Subproject commit 8e014f44d72765f086fe516e870602d5a476076e
diff --git a/src/ps_test/test_CorePsPlatform.cs b/src/ps_test/test_CorePsPlatform.cs
index 0f937df3b2..57e58bc32f 100644
--- a/src/ps_test/test_CorePsPlatform.cs
+++ b/src/ps_test/test_CorePsPlatform.cs
@@ -71,7 +71,8 @@ namespace PSTests
         {
             var startInfo = new ProcessStartInfo
             {
-                FileName = @"/usr/hostname",
+                FileName = @"/usr/bin/env",
+                Arguments = "hostname",
                 RedirectStandardOutput = true,
                 UseShellExecute = false
             };

From 10c772829dc7415de36f6c0971e55e4327d52532 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Fri, 28 Aug 2015 16:06:27 -0700
Subject: [PATCH 20/40] fixed unordering of files created during test

---
 src/monad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/monad b/src/monad
index 2793b76e2d..a1a05637eb 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit 2793b76e2d48f012a82b8e9106b9e9f496d3b785
+Subproject commit a1a05637ebc40bdbfef51f8435e8592587a4eb5d

From 534de9d15ffe3e1f3c48715f2871432fabfda2a4 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Fri, 28 Aug 2015 16:07:11 -0700
Subject: [PATCH 21/40] Match array instead of testing elements

So that we can ignore the ordering from the regexp
---
 src/pester-tests/Test-Split-Path.Tests.ps1 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pester-tests/Test-Split-Path.Tests.ps1 b/src/pester-tests/Test-Split-Path.Tests.ps1
index 5a50791b75..64aae88114 100644
--- a/src/pester-tests/Test-Split-Path.Tests.ps1
+++ b/src/pester-tests/Test-Split-Path.Tests.ps1
@@ -46,9 +46,10 @@ ls
         Test-Path $FullyQualifiedTestFile  | Should Be $true
         Test-Path $FullyQualifiedTestFile2 | Should Be $true
 
-        ( Split-Path ./tmp/*estf*.ps1 -Leaf -Resolve ).GetType().BaseType.Name | Should Be "Array"
-        ( Split-path ./tmp/*estf*.ps1 -Leaf -Resolve )[0]                      | Should Be $testfile
-        ( Split-path ./tmp/*estf*.ps1 -Leaf -Resolve )[1]                      | Should Be $testfile2
+        $actual = ( Split-Path ./tmp/*estf*.ps1 -Leaf -Resolve )
+        $actual.GetType().BaseType.Name | Should Be "Array"
+        $actual                         | Should Match $testfile
+        $actual                         | Should Match $testfile2
 
         Remove-Item $FullyQualifiedTestFile, $FullyQualifiedTestFile2
 

From 7b1280eb2e44912640e823f3dd14c9e3407bed7c Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Fri, 28 Aug 2015 17:22:51 -0700
Subject: [PATCH 22/40] Refactor Split-Path regexp test

Fix issues with ordering etc.
---
 src/pester-tests/Test-Split-Path.Tests.ps1 | 32 ++++++++++------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/pester-tests/Test-Split-Path.Tests.ps1 b/src/pester-tests/Test-Split-Path.Tests.ps1
index 64aae88114..6d33571913 100644
--- a/src/pester-tests/Test-Split-Path.Tests.ps1
+++ b/src/pester-tests/Test-Split-Path.Tests.ps1
@@ -1,9 +1,4 @@
 Describe "Test-Split-Path" {
-    # Use the local directory because it's renewed each time with the correct privileges
-    $testDir                = "./tmp"
-    $testfile               = "testfile.ps1"
-    $FullyQualifiedTestFile = $testDir + "/" + $testFile
-ls
     It "Should return a string object when invoked" {
         ( Split-Path . ).GetType().Name          | Should Be "String"
         ( Split-Path . -Leaf ).GetType().Name    | Should Be "String"
@@ -38,23 +33,26 @@ ls
     }
 
     It "Should be able to accept regular expression input and output an array for multiple objects" {
-        $testfile2               = "testfilenumber2.ps1"
-        $FullyQualifiedTestFile2 = $testDir + "/" + $testfile2
+        $testDir = "./tmp"
+        Remove-Item $testDir -Recurse -Force
 
-        New-Item -ItemType file -Path $FullyQualifiedTestFile, $FullyQualifiedTestFile2 -Force
+	$testFile1     = "testfile1.ps1"
+	$testFile2     = "testfile2.ps1"
+        $testFilePath1 = $testDir + "/" + $testFile1
+        $testFilePath2 = $testDir + "/" + $testFile2
 
-        Test-Path $FullyQualifiedTestFile  | Should Be $true
-        Test-Path $FullyQualifiedTestFile2 | Should Be $true
+        New-Item -ItemType file -Path $testFilePath1, $testFilePath2 -Force
 
-        $actual = ( Split-Path ./tmp/*estf*.ps1 -Leaf -Resolve )
+        Test-Path $testFilePath1 | Should Be $true
+        Test-Path $testFilePath2 | Should Be $true
+
+        $actual = ( Split-Path $testDir/*file*.ps1 -Leaf -Resolve ) | Sort-Object
         $actual.GetType().BaseType.Name | Should Be "Array"
-        $actual                         | Should Match $testfile
-        $actual                         | Should Match $testfile2
+        $actual[0]                      | Should Be $testFile1
+        $actual[1]                      | Should Be $testFile2
 
-        Remove-Item $FullyQualifiedTestFile, $FullyQualifiedTestFile2
-
-        Test-Path $FullyQualifiedTestFile  | Should Be $false
-        Test-Path $FullyQualifiedTestFile2 | Should Be $false
+        Remove-Item $testDir -Recurse -Force
+        Test-Path $testDir | Should Be $false
     }
 
     It "Should be able to tell if a given path is an absolute path" {

From 92cd86d3f205cf80c0ac3fc2ca7b552c1ae46a83 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Fri, 28 Aug 2015 20:13:10 -0700
Subject: [PATCH 23/40] Ignore Remove-Item errors in Split-Path setup

---
 src/pester-tests/Test-Split-Path.Tests.ps1 | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pester-tests/Test-Split-Path.Tests.ps1 b/src/pester-tests/Test-Split-Path.Tests.ps1
index 6d33571913..47dc536a0d 100644
--- a/src/pester-tests/Test-Split-Path.Tests.ps1
+++ b/src/pester-tests/Test-Split-Path.Tests.ps1
@@ -14,27 +14,29 @@
         # ErrorAction SilentlyContinue merely suppresses the error from the console.
         # Throwing exceptions still seen by Pester.
 
-         Split-Path "C:\Users" -Qualifier -ErrorAction SilentlyContinue  | Should Throw
+        Split-Path "C:\Users" -Qualifier -ErrorAction SilentlyContinue  | Should Throw
     }
 
     It "Should error when no directory separator characters are used with a qualifier" {
-         Split-Path "abadTest" -Qualifier -ErrorAction SilentlyContinue  | Should Throw
+        Split-Path "abadTest" -Qualifier -ErrorAction SilentlyContinue  | Should Throw
     }
 
-    It "Should return the path when the noqualifier switch is used on a linux system" { 
+    It "Should return the path when the noqualifier switch is used on a Linux system" {
         { Split-Path /usr/bin -NoQualifier } | Should Not Throw
         Split-Path /usr/bin -NoQualifier     | Should Be "/usr/bin"
     }
 
-    It "Should return the parent folder name when the leaf switch is used" {
+    It "Should return the base name when the leaf switch is used" {
         Split-Path /usr/bin -Leaf       | Should be "bin"
         Split-Path /usr/local/bin -Leaf | Should be "bin"
         Split-Path usr/bin -Leaf        | Should be "bin"
+        Split-Path ./bin -Leaf          | Should be "bin"
+        Split-Path bin -Leaf            | Should be "bin"
     }
 
     It "Should be able to accept regular expression input and output an array for multiple objects" {
         $testDir = "./tmp"
-        Remove-Item $testDir -Recurse -Force
+        Remove-Item $testDir -Recurse -Force -ErrorAction Ignore
 
 	$testFile1     = "testfile1.ps1"
 	$testFile2     = "testfile2.ps1"
@@ -51,7 +53,7 @@
         $actual[0]                      | Should Be $testFile1
         $actual[1]                      | Should Be $testFile2
 
-        Remove-Item $testDir -Recurse -Force
+        Remove-Item $testDir -Recurse -Force -ErrorAction Ignore
         Test-Path $testDir | Should Be $false
     }
 

From f648656cc12e270e8ac350ebe2036161f91481c7 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Fri, 28 Aug 2015 21:18:58 -0700
Subject: [PATCH 24/40] Refactor test targets

---
 scripts/Makefile | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/scripts/Makefile b/scripts/Makefile
index 1f49d7d91b..723e453f30 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -181,20 +181,27 @@ run-interactive: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-relea
 run-file: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
 	exec_env/app_base/runps.sh --file $(PSSCRIPT)
 
-pester-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
-	# execute the pester tests, pester needs a TEMP environment variable to be set
-	exec_env/app_base/runps-simple.sh 'cd ../../../src/pester-tests; $$env:TEMP="/tmp"; invoke-pester'
-
-test: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr $(addprefix $(TESTRUN_FOLDER)/, ps_test.dll xunit.console.netcore.exe xunit.runner.utility.dll xunit.abstractions.dll xunit.execution.dll) pester-tests dotnetlibs/monad_native
-	cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=../coreclr:. ../coreclr/corerun xunit.console.netcore.exe ps_test.dll -xml ../../xunittests.xml
-	# run the c++ tests
-	cd dotnetlibs && ./monad_native
-	# test the 3rdparty/hashbang sample
-	PATH=$(PATH):$(shell pwd)/exec_env/app_base $(shell pwd)/3rdparty/hashbang/script.ps1
-
 run-debugclr: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-debug-clr
 	PAL_DBG_CHANNELS="+LOADER.TRACE" exec_env/app_base/runps-simple.sh get-location
 
+native-tests: dotnetlibs/monad_native
+	# execute the native C++ tests
+	cd dotnetlibs && ./monad_native
+
+xunit-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr $(addprefix $(TESTRUN_FOLDER)/, ps_test.dll xunit.console.netcore.exe xunit.runner.utility.dll xunit.abstractions.dll xunit.execution.dll)
+	# execute the xUnit runner, with XML output
+	cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=../coreclr:. ../coreclr/corerun xunit.console.netcore.exe ps_test.dll -xml ../../xunittests.xml
+
+pester-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
+	# execute the Pester tests, which needs a TEMP environment variable to be set
+	exec_env/app_base/runps-simple.sh 'cd ../../../src/pester-tests; $$env:TEMP="/tmp"; invoke-pester'
+
+hashbang-tests:
+	# execute the 3rdparty/hashbang example
+	PATH=$(PATH):$(shell pwd)/exec_env/app_base $(shell pwd)/3rdparty/hashbang/script.ps1
+
+test: native-tests xunit-tests pester-tests hashbang-tests
+
 trace: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
 	exec_env/app_base/runps-simple-trace.sh get-location
 

From 70466f963c95ba7e1da79178a16e512685890831 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Mon, 31 Aug 2015 12:55:43 -0700
Subject: [PATCH 25/40] Repin monad and monad-native

- GetCpInfo fixes monad-native compiler warning
- monad has more fixes
---
 src/monad        | 2 +-
 src/monad-native | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/monad b/src/monad
index 8e014f44d7..d541b07343 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit 8e014f44d72765f086fe516e870602d5a476076e
+Subproject commit d541b073435e55fd96771697e5549cc9a188fa54
diff --git a/src/monad-native b/src/monad-native
index 440cf6a236..5693da6a46 160000
--- a/src/monad-native
+++ b/src/monad-native
@@ -1 +1 @@
-Subproject commit 440cf6a236067eba2d5dcfd5e3707a36295cee97
+Subproject commit 5693da6a46e8c4d63a49a6dbc6be3081ce7d0d08

From a7010cd742b7cc49f2cd6db8bb1d5b4d57b47c61 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Tue, 1 Sep 2015 13:55:54 -0700
Subject: [PATCH 26/40] Add `make script.ps1` target for easy testing

Use like `make src/pester-tests/Test-Split-Path.Tests.ps1`
---
 scripts/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/Makefile b/scripts/Makefile
index 723e453f30..a92147ba97 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -181,6 +181,10 @@ run-interactive: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-relea
 run-file: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
 	exec_env/app_base/runps.sh --file $(PSSCRIPT)
 
+# easy way to run individual PowerShell scripts, `make script.ps1` where the path is relative from monad-linux
+%.ps1: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
+	TEMP=/tmp exec_env/app_base/runps.sh --file ../../../$@
+
 run-debugclr: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-debug-clr
 	PAL_DBG_CHANNELS="+LOADER.TRACE" exec_env/app_base/runps-simple.sh get-location
 

From 8c80840d69cfdd693b425e397b7179c220a5fdf8 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Tue, 1 Sep 2015 14:08:04 -0700
Subject: [PATCH 27/40] Make path relative to monad-linux/scripts

Since that's where the Makefile lives
---
 scripts/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/Makefile b/scripts/Makefile
index a92147ba97..174a68bd0e 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -181,9 +181,9 @@ run-interactive: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-relea
 run-file: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
 	exec_env/app_base/runps.sh --file $(PSSCRIPT)
 
-# easy way to run individual PowerShell scripts, `make script.ps1` where the path is relative from monad-linux
+# easy way to run individual PowerShell scripts, `make script.ps1` where the path is relative to monad-linux/scripts (with TEMP set for Pester)
 %.ps1: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
-	TEMP=/tmp exec_env/app_base/runps.sh --file ../../../$@
+	TEMP=/tmp exec_env/app_base/runps.sh --file ../../$@
 
 run-debugclr: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-debug-clr
 	PAL_DBG_CHANNELS="+LOADER.TRACE" exec_env/app_base/runps-simple.sh get-location

From 4ff63410342634e9153c24b79d7f78d70a32a1f6 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Tue, 1 Sep 2015 16:57:16 -0700
Subject: [PATCH 28/40] implemented xunit tests for testing isHardLink using a
 fileSystem object

---
 src/ps_test/test_CorePsPlatform.cs | 34 ++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/ps_test/test_CorePsPlatform.cs b/src/ps_test/test_CorePsPlatform.cs
index 57e58bc32f..b761c234b9 100644
--- a/src/ps_test/test_CorePsPlatform.cs
+++ b/src/ps_test/test_CorePsPlatform.cs
@@ -1,5 +1,6 @@
 using Xunit;
 using System;
+using System.IO;
 using System.Diagnostics;
 using System.Management.Automation;
 
@@ -90,5 +91,38 @@ namespace PSTests
 
 
         }
+
+        [Fact]
+        public static void TestIsHardLink()
+        {
+            // a file that should exist on every *nix distro
+
+            string path = @"/tmp/MyTest";
+            if (!File.Exists(path))
+            {
+                File.Create(path);
+            }
+
+            // Create a file to write to using StreamWriter. 
+            // convert string to stream.  On Windows, this appears to be handled, but on *nix, we apparently need to convert to UTF8.
+            byte[] byteArray    = System.Text.Encoding.UTF8.GetBytes(path);
+            MemoryStream stream = new MemoryStream(byteArray);
+
+            using (StreamWriter sw = new StreamWriter(stream))
+            {
+                sw.Write("Hello");
+            }
+
+            // Convert `path` string to FileSystemInfo data type. And now, it should return true
+            FileSystemInfo fd = new FileInfo(path);
+            Assert.True(Platform.NonWindowsIsHardLink(fd));
+        }
+
+        [Fact]
+        public static void TestIsHardLinkFailsWithDirectory()
+        {
+             
+        }
+
     }
 }

From 73b1a714208e03eacba185dda2bfc25c33d50d7b Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Tue, 1 Sep 2015 16:58:16 -0700
Subject: [PATCH 29/40] bringing implementation code up-to-date with the test
 code

---
 src/monad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/monad b/src/monad
index d541b07343..01ff8a3f79 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit d541b073435e55fd96771697e5549cc9a188fa54
+Subproject commit 01ff8a3f7967503f805933d17b90ddb23402b866

From 080c734dfb93c0aa2cfd3b765b26d1affb245137 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Wed, 2 Sep 2015 11:02:09 -0700
Subject: [PATCH 30/40] added fail under directory as input unit test

---
 src/ps_test/test_CorePsPlatform.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/ps_test/test_CorePsPlatform.cs b/src/ps_test/test_CorePsPlatform.cs
index b761c234b9..bc62134ca0 100644
--- a/src/ps_test/test_CorePsPlatform.cs
+++ b/src/ps_test/test_CorePsPlatform.cs
@@ -93,7 +93,7 @@ namespace PSTests
         }
 
         [Fact]
-        public static void TestIsHardLink()
+        public static void TestIsHardLinkWithFileSystemInfo()
         {
             // a file that should exist on every *nix distro
 
@@ -102,7 +102,6 @@ namespace PSTests
             {
                 File.Create(path);
             }
-
             // Create a file to write to using StreamWriter. 
             // convert string to stream.  On Windows, this appears to be handled, but on *nix, we apparently need to convert to UTF8.
             byte[] byteArray    = System.Text.Encoding.UTF8.GetBytes(path);
@@ -119,9 +118,20 @@ namespace PSTests
         }
 
         [Fact]
-        public static void TestIsHardLinkFailsWithDirectory()
+        public static void TestIsHardLinkFailsWithDirectoryWithFileSystemInfo()
         {
-             
+            // A folder that should exist on every *nix system
+            string path = @"/tmp";
+
+            // Create a file to write to using StreamWriter. 
+            // convert string to stream.  On Windows, this appears to be handled, but on *nix, we apparently need to convert to UTF8.
+            byte[] byteArray    = System.Text.Encoding.UTF8.GetBytes(path);
+            MemoryStream stream = new MemoryStream(byteArray);
+
+            // Convert `path` string to FileSystemInfo data type. And now, it should return true
+            FileSystemInfo fd = new FileInfo(path);
+            Assert.False(Platform.NonWindowsIsHardLink(fd));
+
         }
 
     }

From 9b02eea58dca19af87ac117b3840ab27f4a01157 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Wed, 2 Sep 2015 11:15:31 -0700
Subject: [PATCH 31/40] added unit test for additional failure cases and
 removed unneeded code from existing unit tests

---
 src/ps_test/test_CorePsPlatform.cs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/ps_test/test_CorePsPlatform.cs b/src/ps_test/test_CorePsPlatform.cs
index bc62134ca0..a8bf60eb91 100644
--- a/src/ps_test/test_CorePsPlatform.cs
+++ b/src/ps_test/test_CorePsPlatform.cs
@@ -102,6 +102,7 @@ namespace PSTests
             {
                 File.Create(path);
             }
+
             // Create a file to write to using StreamWriter. 
             // convert string to stream.  On Windows, this appears to be handled, but on *nix, we apparently need to convert to UTF8.
             byte[] byteArray    = System.Text.Encoding.UTF8.GetBytes(path);
@@ -123,16 +124,23 @@ namespace PSTests
             // A folder that should exist on every *nix system
             string path = @"/tmp";
 
-            // Create a file to write to using StreamWriter. 
-            // convert string to stream.  On Windows, this appears to be handled, but on *nix, we apparently need to convert to UTF8.
-            byte[] byteArray    = System.Text.Encoding.UTF8.GetBytes(path);
-            MemoryStream stream = new MemoryStream(byteArray);
+            // Convert `path` string to FileSystemInfo data type. And now, it should return true
+            FileSystemInfo fd = new FileInfo(path);
+            Assert.False(Platform.NonWindowsIsHardLink(fd));
+        }
+
+        [Fact]
+        public static void TestIsHardLinkFailsWithNonexistantFileWithFileSystemInfo()
+        {
+            // A file that should *never* exist on a test machine:
+            string path = @"/tmp/ThisFileShouldNotExistOnTestMachines";
+
+            // If the file exists, then there's a larger issue that needs to be looked at
+            Assert.False(File.Exists(path));
 
             // Convert `path` string to FileSystemInfo data type. And now, it should return true
             FileSystemInfo fd = new FileInfo(path);
             Assert.False(Platform.NonWindowsIsHardLink(fd));
-
         }
-
     }
 }

From 74f0a893c1dda04f2cccdcdb52968e19525baeb7 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Wed, 2 Sep 2015 15:17:35 -0700
Subject: [PATCH 32/40] Repin monad

---
 src/monad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/monad b/src/monad
index 01ff8a3f79..d0697c432c 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit 01ff8a3f7967503f805933d17b90ddb23402b866
+Subproject commit d0697c432c1d678e59af3ebd6320e5bc3a432b2f

From 94be33afe14b3fc67a52de997365a9db4acbc11e Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Thu, 3 Sep 2015 11:10:49 -0700
Subject: [PATCH 33/40] Generate $COREREF in Makefile automatically

Previously generated by hand and saved. Now will update itself
automatically when monad-ext/coreclr is updated.
---
 scripts/coreref.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/coreref.mk b/scripts/coreref.mk
index 042499f06a..775b928220 100644
--- a/scripts/coreref.mk
+++ b/scripts/coreref.mk
@@ -2,9 +2,9 @@
 # this depends on the MONAD_EXT variable to be correctly set
 TARGETING_PACK=$(MONAD_EXT)/coreclr/TargetingPack
 
-COREREF=-r:$(TARGETING_PACK)/Microsoft.CSharp.dll -r:$(TARGETING_PACK)/Microsoft.VisualBasic.dll -r:$(TARGETING_PACK)/Microsoft.Win32.Primitives.dll -r:$(TARGETING_PACK)/Microsoft.Win32.Registry.AccessControl.dll -r:$(TARGETING_PACK)/Microsoft.Win32.Registry.dll -r:$(TARGETING_PACK)/System.AppContext.dll -r:$(TARGETING_PACK)/System.Collections.Concurrent.dll -r:$(TARGETING_PACK)/System.Collections.dll -r:$(TARGETING_PACK)/System.Collections.NonGeneric.dll -r:$(TARGETING_PACK)/System.Collections.Specialized.dll -r:$(TARGETING_PACK)/System.ComponentModel.Annotations.dll -r:$(TARGETING_PACK)/System.ComponentModel.dll -r:$(TARGETING_PACK)/System.ComponentModel.EventBasedAsync.dll -r:$(TARGETING_PACK)/System.ComponentModel.Primitives.dll -r:$(TARGETING_PACK)/System.ComponentModel.TypeConverter.dll -r:$(TARGETING_PACK)/System.Console.dll -r:$(TARGETING_PACK)/System.Data.Common.dll -r:$(TARGETING_PACK)/System.Data.SqlClient.dll -r:$(TARGETING_PACK)/System.Diagnostics.Contracts.dll -r:$(TARGETING_PACK)/System.Diagnostics.Debug.dll -r:$(TARGETING_PACK)/System.Diagnostics.FileVersionInfo.dll -r:$(TARGETING_PACK)/System.Diagnostics.Process.dll -r:$(TARGETING_PACK)/System.Diagnostics.TextWriterTraceListener.dll -r:$(TARGETING_PACK)/System.Diagnostics.Tools.dll -r:$(TARGETING_PACK)/System.Diagnostics.TraceSource.dll -r:$(TARGETING_PACK)/System.Diagnostics.Tracing.dll -r:$(TARGETING_PACK)/System.Dynamic.Runtime.dll -r:$(TARGETING_PACK)/System.Globalization.Calendars.dll -r:$(TARGETING_PACK)/System.Globalization.dll -r:$(TARGETING_PACK)/System.Globalization.Extensions.dll -r:$(TARGETING_PACK)/System.IO.Compression.dll -r:$(TARGETING_PACK)/System.IO.Compression.ZipFile.dll -r:$(TARGETING_PACK)/System.IO.dll -r:$(TARGETING_PACK)/System.IO.FileSystem.AccessControl.dll -r:$(TARGETING_PACK)/System.IO.FileSystem.dll -r:$(TARGETING_PACK)/System.IO.FileSystem.DriveInfo.dll -r:$(TARGETING_PACK)/System.IO.FileSystem.Primitives.dll -r:$(TARGETING_PACK)/System.IO.FileSystem.Watcher.dll -r:$(TARGETING_PACK)/System.IO.MemoryMappedFiles.dll -r:$(TARGETING_PACK)/System.IO.Pipes.dll -r:$(TARGETING_PACK)/System.IO.UnmanagedMemoryStream.dll -r:$(TARGETING_PACK)/System.Linq.dll -r:$(TARGETING_PACK)/System.Linq.Expressions.dll -r:$(TARGETING_PACK)/System.Linq.Parallel.dll -r:$(TARGETING_PACK)/System.Linq.Queryable.dll -r:$(TARGETING_PACK)/System.Net.Http.dll -r:$(TARGETING_PACK)/System.Net.Http.WinHttpHandler.dll -r:$(TARGETING_PACK)/System.Net.NameResolution.dll -r:$(TARGETING_PACK)/System.Net.NetworkInformation.dll -r:$(TARGETING_PACK)/System.Net.Primitives.dll -r:$(TARGETING_PACK)/System.Net.Security.dll -r:$(TARGETING_PACK)/System.Net.Sockets.dll -r:$(TARGETING_PACK)/System.Net.Utilities.dll -r:$(TARGETING_PACK)/System.Net.WebHeaderCollection.dll -r:$(TARGETING_PACK)/System.Net.WebSockets.Client.dll -r:$(TARGETING_PACK)/System.Net.WebSockets.dll -r:$(TARGETING_PACK)/System.ObjectModel.dll -r:$(TARGETING_PACK)/System.Reflection.DispatchProxy.dll -r:$(TARGETING_PACK)/System.Reflection.dll -r:$(TARGETING_PACK)/System.Reflection.Emit.dll -r:$(TARGETING_PACK)/System.Reflection.Emit.ILGeneration.dll -r:$(TARGETING_PACK)/System.Reflection.Emit.Lightweight.dll -r:$(TARGETING_PACK)/System.Reflection.Extensions.dll -r:$(TARGETING_PACK)/System.Reflection.Primitives.dll -r:$(TARGETING_PACK)/System.Reflection.TypeExtensions.dll -r:$(TARGETING_PACK)/System.Resources.ReaderWriter.dll -r:$(TARGETING_PACK)/System.Resources.ResourceManager.dll -r:$(TARGETING_PACK)/System.Runtime.CompilerServices.VisualC.dll -r:$(TARGETING_PACK)/System.Runtime.dll -r:$(TARGETING_PACK)/System.Runtime.Extensions.dll -r:$(TARGETING_PACK)/System.Runtime.Handles.dll -r:$(TARGETING_PACK)/System.Runtime.InteropServices.dll -r:$(TARGETING_PACK)/System.Runtime.InteropServices.WindowsRuntime.dll -r:$(TARGETING_PACK)/System.Runtime.Loader.dll -r:$(TARGETING_PACK)/System.Runtime.Numerics.dll -r:$(TARGETING_PACK)/System.Runtime.Serialization.Json.dll -r:$(TARGETING_PACK)/System.Runtime.Serialization.Primitives.dll -r:$(TARGETING_PACK)/System.Runtime.Serialization.Xml.dll -r:$(TARGETING_PACK)/System.Security.AccessControl.dll -r:$(TARGETING_PACK)/System.Security.Claims.dll -r:$(TARGETING_PACK)/System.Security.Cryptography.DeriveBytes.dll -r:$(TARGETING_PACK)/System.Security.Cryptography.Encoding.dll -r:$(TARGETING_PACK)/System.Security.Cryptography.Encryption.Aes.dll -r:$(TARGETING_PACK)/System.Security.Cryptography.Encryption.dll -r:$(TARGETING_PACK)/System.Security.Cryptography.Hashing.Algorithms.dll -r:$(TARGETING_PACK)/System.Security.Cryptography.Hashing.dll -r:$(TARGETING_PACK)/System.Security.Cryptography.RandomNumberGenerator.dll -r:$(TARGETING_PACK)/System.Security.Cryptography.RSA.dll -r:$(TARGETING_PACK)/System.Security.Cryptography.X509Certificates.dll -r:$(TARGETING_PACK)/System.Security.Principal.dll -r:$(TARGETING_PACK)/System.Security.Principal.Windows.dll -r:$(TARGETING_PACK)/System.Security.SecureString.dll -r:$(TARGETING_PACK)/System.ServiceModel.Duplex.dll -r:$(TARGETING_PACK)/System.ServiceModel.Http.dll -r:$(TARGETING_PACK)/System.ServiceModel.NetTcp.dll -r:$(TARGETING_PACK)/System.ServiceModel.Primitives.dll -r:$(TARGETING_PACK)/System.ServiceModel.Security.dll -r:$(TARGETING_PACK)/System.ServiceProcess.ServiceController.dll -r:$(TARGETING_PACK)/System.Text.Encoding.CodePages.dll -r:$(TARGETING_PACK)/System.Text.Encoding.dll -r:$(TARGETING_PACK)/System.Text.Encoding.Extensions.dll -r:$(TARGETING_PACK)/System.Text.RegularExpressions.dll -r:$(TARGETING_PACK)/System.Threading.AccessControl.dll -r:$(TARGETING_PACK)/System.Threading.dll -r:$(TARGETING_PACK)/System.Threading.Overlapped.dll -r:$(TARGETING_PACK)/System.Threading.Tasks.dll -r:$(TARGETING_PACK)/System.Threading.Tasks.Parallel.dll -r:$(TARGETING_PACK)/System.Threading.Thread.dll -r:$(TARGETING_PACK)/System.Threading.ThreadPool.dll -r:$(TARGETING_PACK)/System.Threading.Timer.dll -r:$(TARGETING_PACK)/System.Xml.ReaderWriter.dll -r:$(TARGETING_PACK)/System.Xml.XDocument.dll -r:$(TARGETING_PACK)/System.Xml.XmlDocument.dll -r:$(TARGETING_PACK)/System.Xml.XmlSerializer.dll -r:$(TARGETING_PACK)/System.Xml.XPath.dll -r:$(TARGETING_PACK)/System.Xml.XPath.XDocument.dll -r:$(TARGETING_PACK)/System.Xml.XPath.XmlDocument.dll
+COREREF=$(addprefix -r:, $(shell ls $(TARGETING_PACK)/*.dll))
 
 # COREREF_2 is here for dev/testing purposes, it should not be used anywhere (instead use the reference assemblies stored in COREREF)
 CORECLR_ASSEMBLY_BASE=$(MONAD_EXT)/coreclr/Release
 
-COREREF_2= -r:$(CORECLR_ASSEMBLY_BASE)/Microsoft.CSharp.dll -r:$(CORECLR_ASSEMBLY_BASE)/Microsoft.VisualBasic.dll -r:$(CORECLR_ASSEMBLY_BASE)/Microsoft.Win32.Primitives.dll -r:$(CORECLR_ASSEMBLY_BASE)/Microsoft.Win32.Registry.AccessControl.dll -r:$(CORECLR_ASSEMBLY_BASE)/Microsoft.Win32.Registry.dll -r:$(CORECLR_ASSEMBLY_BASE)/mscorlib.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.AppContext.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Collections.Concurrent.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Collections.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Collections.NonGeneric.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Collections.Specialized.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ComponentModel.Annotations.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ComponentModel.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ComponentModel.EventBasedAsync.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ComponentModel.Primitives.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ComponentModel.TypeConverter.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Console.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Core.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Data.Common.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Data.SqlClient.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Diagnostics.Contracts.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Diagnostics.Debug.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Diagnostics.FileVersionInfo.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Diagnostics.Process.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Diagnostics.StackTrace.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Diagnostics.TextWriterTraceListener.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Diagnostics.Tools.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Diagnostics.TraceSource.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Diagnostics.Tracing.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Dynamic.Runtime.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Globalization.Calendars.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Globalization.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Globalization.Extensions.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.IO.Compression.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.IO.Compression.ZipFile.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.IO.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.IO.FileSystem.AccessControl.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.IO.FileSystem.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.IO.FileSystem.DriveInfo.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.IO.FileSystem.Primitives.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.IO.FileSystem.Watcher.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.IO.MemoryMappedFiles.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.IO.Pipes.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.IO.UnmanagedMemoryStream.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Linq.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Linq.Expressions.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Linq.Parallel.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Linq.Queryable.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.Http.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.Http.WinHttpHandler.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.NameResolution.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.NetworkInformation.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.Primitives.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.Requests.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.Security.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.Sockets.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.Utilities.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.WebHeaderCollection.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.WebSockets.Client.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Net.WebSockets.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ObjectModel.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Private.CompilerServices.ICastable.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Private.CoreLib.InteropServices.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Private.DataContractSerialization.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Private.Interop.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Private.Networking.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Private.ServiceModel.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Private.Uri.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Reflection.DispatchProxy.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Reflection.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Reflection.Emit.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Reflection.Emit.ILGeneration.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Reflection.Emit.Lightweight.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Reflection.Extensions.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Reflection.Primitives.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Reflection.TypeExtensions.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Resources.ReaderWriter.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Resources.ResourceManager.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Runtime.CompilerServices.VisualC.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Runtime.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Runtime.Extensions.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Runtime.Handles.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Runtime.InteropServices.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Runtime.InteropServices.WindowsRuntime.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Runtime.Loader.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Runtime.Numerics.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Runtime.Serialization.Json.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Runtime.Serialization.Primitives.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Runtime.Serialization.Xml.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.AccessControl.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Claims.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Cryptography.DeriveBytes.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Cryptography.Encoding.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Cryptography.Encryption.Aes.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Cryptography.Encryption.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Cryptography.Hashing.Algorithms.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Cryptography.Hashing.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Cryptography.RandomNumberGenerator.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Cryptography.RSA.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Cryptography.X509Certificates.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Principal.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.Principal.Windows.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Security.SecureString.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ServiceModel.Duplex.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ServiceModel.Http.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ServiceModel.NetTcp.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ServiceModel.Primitives.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ServiceModel.Security.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.ServiceProcess.ServiceController.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Text.Encoding.CodePages.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Text.Encoding.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Text.Encoding.Extensions.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Text.RegularExpressions.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Threading.AccessControl.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Threading.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Threading.Overlapped.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Threading.Tasks.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Threading.Tasks.Parallel.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Threading.Thread.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Threading.ThreadPool.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Threading.Timer.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Xml.ReaderWriter.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Xml.XDocument.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Xml.XmlDocument.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Xml.XmlSerializer.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Xml.XPath.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Xml.XPath.XDocument.dll -r:$(CORECLR_ASSEMBLY_BASE)/System.Xml.XPath.XmlDocument.dll 
+COREREF_2=$(addprefix -r:, $(shell ls $(CORECLR_ASSEMBLY_BASE)/*.dll))

From 84d58714fc2afdb3bf3c2475887f38206ecc0c11 Mon Sep 17 00:00:00 2001
From: Peter Honeder <peterhon@microsoft.com>
Date: Thu, 3 Sep 2015 21:43:17 +0200
Subject: [PATCH 34/40] added a simple test that creates a full PS Runspace and
 executes a script

---
 scripts/Makefile             |  2 +-
 scripts/runps-test.sh        |  7 ++++++
 src/ps_test/test_Runspace.cs | 48 ++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100755 scripts/runps-test.sh
 create mode 100644 src/ps_test/test_Runspace.cs

diff --git a/scripts/Makefile b/scripts/Makefile
index 174a68bd0e..1bd25a0994 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -194,7 +194,7 @@ native-tests: dotnetlibs/monad_native
 
 xunit-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr $(addprefix $(TESTRUN_FOLDER)/, ps_test.dll xunit.console.netcore.exe xunit.runner.utility.dll xunit.abstractions.dll xunit.execution.dll)
 	# execute the xUnit runner, with XML output
-	cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=../coreclr:. ../coreclr/corerun xunit.console.netcore.exe ps_test.dll -xml ../../xunittests.xml
+	exec_env/app_base/runps-test.sh ps_test.dll -xml ../../xunittests.xml
 
 pester-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
 	# execute the Pester tests, which needs a TEMP environment variable to be set
diff --git a/scripts/runps-test.sh b/scripts/runps-test.sh
new file mode 100755
index 0000000000..5196f708be
--- /dev/null
+++ b/scripts/runps-test.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+CWD=$(pwd)
+SCRIPTDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+
+cd "$SCRIPTDIR"
+PSMODULEPATH="$SCRIPTDIR/Modules" LD_LIBRARY_PATH="$SCRIPTDIR" ./host_cmdline -c ../coreclr -alc Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.dll -tpa xunit.console.netcore.exe xunit.console.netcore.exe "$@"
diff --git a/src/ps_test/test_Runspace.cs b/src/ps_test/test_Runspace.cs
new file mode 100644
index 0000000000..f9b4745eb9
--- /dev/null
+++ b/src/ps_test/test_Runspace.cs
@@ -0,0 +1,48 @@
+using Xunit;
+using System;
+using System.Management.Automation;
+using System.Management.Automation.Runspaces;
+
+namespace PSTests
+{
+    public static class RunspaceTests
+    {
+        [Fact]
+        public static void TestMethod()
+        {
+            InitialSessionState iss = InitialSessionState.CreateDefault2();
+
+            // NOTE: instantiate custom host myHost for the next line to capture stdout and stderr output
+            //       in addition to just the PSObjects
+            using (Runspace rs = RunspaceFactory.CreateRunspace(/*myHost,*/iss))
+            {
+                rs.Open();
+                using (PowerShell ps = PowerShell.Create())
+                {
+                    ps.Runspace = rs;
+
+                    string script = "get-process | select-object -first 3";
+                    ps.AddScript(script);
+
+                    // IMPORTANT NOTE: do not call AddCommand("out-host") here or
+                    // MergeMyResults, otherwise Invoke will not return any objects
+                    
+                    var results = ps.Invoke();
+
+                    // check that there are 3 captured objects
+                    int objCount = 0;
+                    foreach (var result in results)
+                    {
+                        // this is how an object would be captured here and looked at,
+                        // each result is a PSObject with the data from the pipeline
+                        ++objCount;
+                        Assert.NotNull(result);
+                    }
+                    Assert.Equal(3,objCount);
+                    ps.Dispose();
+                }
+            }
+        }
+    }
+}
+

From 562a9bb35b3467af8803812806ea3a019165ea7b Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Thu, 3 Sep 2015 14:31:46 -0700
Subject: [PATCH 35/40] Add Security.dll reference for Commands.Management.dll

While enabling previously disabled code in `cimConverter.cs`, it was
revealed that `Microsoft.PowerShell.Commands.Management.dll` has a
dependency on `Microsoft.PowerShell.Security.dll` for the type
`SecurityDescriptorCommandsBase`.
---
 scripts/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/Makefile b/scripts/Makefile
index 174a68bd0e..7882c64579 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -72,13 +72,13 @@ dotnetlibs/Microsoft.Management.Infrastructure.dll: ${MAN_INFRA_SRCS} dotnetlibs
 
 # Commands
 
-dotnetlibs/Microsoft.PowerShell.Commands.Management.dll: ${COMMANDS_MANAGEMENT_SRCS} dotnetlibs/System.Management.Automation.dll ${COMMANDS_MANAGEMENT_RES_SRCS} ${COMMANDS_MANAGEMENT_RES_CS_SRCS} $(MI_ASSEMBLY)
-	$(CSC) -out:$@ ${MCSOPTS_LIB} ${PRODUCT_COMMANDS_REFS} ${COMMANDS_MANAGEMENT_SRCS} ${COMMANDS_MANAGEMENT_RES_CS_SRCS} $(COMMANDS_MANAGEMENT_RES_REF) $(MI_REF)
+dotnetlibs/Microsoft.PowerShell.Commands.Management.dll: ${COMMANDS_MANAGEMENT_SRCS} dotnetlibs/System.Management.Automation.dll dotnetlibs/Microsoft.PowerShell.Security.dll ${COMMANDS_MANAGEMENT_RES_SRCS} ${COMMANDS_MANAGEMENT_RES_CS_SRCS} $(MI_ASSEMBLY)
+	$(CSC) -out:$@ ${MCSOPTS_LIB} ${PRODUCT_COMMANDS_REFS} ${COMMANDS_MANAGEMENT_SRCS} ${COMMANDS_MANAGEMENT_RES_CS_SRCS} $(COMMANDS_MANAGEMENT_RES_REF) $(MI_REF) -r:dotnetlibs/Microsoft.PowerShell.Security.dll
 
 dotnetlibs/Microsoft.PowerShell.Commands.Utility.dll: ${COMMANDS_UTILITY_SRCS} dotnetlibs/System.Management.Automation.dll ${COMMANDS_UTILITY_RES_SRCS} ${COMMANDS_UTILITY_RES_CS_SRCS}
 	$(CSC) -out:$@ ${MCSOPTS_LIB} ${PRODUCT_COMMANDS_REFS} ${COMMANDS_UTILITY_SRCS} ${COMMANDS_UTILITY_RES_CS_SRCS} $(COMMANDS_UTILITY_RES_REF)
 
-dotnetlibs/Microsoft.PowerShell.Security.dll: ${SECURITY_SRCS} dotnetlibs/System.Management.Automation.dll ${SECURITY_RES_SRCS} ${SECURITY_RES_CS_SRCS}
+dotnetlibs/Microsoft.PowerShell.Security.dll: ${SECURITY_SRCS} ${SECURITY_RES_SRCS} ${SECURITY_RES_CS_SRCS}
 	$(CSC) -out:$@ ${MCSOPTS_LIB} ${PRODUCT_COMMANDS_REFS} ${SECURITY_SRCS} ${SECURITY_RES_CS_SRCS} $(SECURITY_RES_REF)
 
 # assembly load context

From f163808eac8c6dfee5be7fd42a02962225aef050 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Thu, 3 Sep 2015 14:55:21 -0700
Subject: [PATCH 36/40] Swap {} for () in Makefile

Parentheses are more portable. There was an inconsistent mix of
parentheses and curly braces.
---
 scripts/Makefile | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/scripts/Makefile b/scripts/Makefile
index 3e4d51e148..00d0874c3d 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -41,16 +41,16 @@ MI_REF_ASSEMBLY=-r:$(MONAD_EXT)/PS/PS_refs_modil/microsoft.management.infrastruc
 MI_ASSEMBLY=dotnetlibs/Microsoft.Management.Infrastructure.dll
 MI_REF=-r:$(MI_ASSEMBLY)
 
-PRODUCT_BASE_REFS=${COREREF}
-PRODUCT_MI_REFS=${COREREF} ${MI_NATIVE_REF}
-PRODUCT_PS_REFS=${COREREF} ${MI_REF} -r:dotnetlibs/$(ASSEMBLY_LOAD_CONTEXT_TARGET)
-PRODUCT_COMMANDS_REFS=${COREREF} -r:dotnetlibs/System.Management.Automation.dll
+PRODUCT_BASE_REFS=$(COREREF)
+PRODUCT_MI_REFS=$(COREREF) $(MI_NATIVE_REF)
+PRODUCT_PS_REFS=$(COREREF) $(MI_REF) -r:dotnetlibs/$(ASSEMBLY_LOAD_CONTEXT_TARGET)
+PRODUCT_COMMANDS_REFS=$(COREREF) -r:dotnetlibs/System.Management.Automation.dll
 
 MCSOPTS_BASE=-unsafe -nostdlib -noconfig -define:CORECLR -define:_CORECLR
-MCSOPTS_MI=${MCSOPTS_BASE} -target:library
-MCSOPTS_LIB=${MCSOPTS_BASE} -target:library
-MCSOPTS_PS=${STRING_RESOURCES_ORIG} ${MCSOPTS_BASE} -target:library
-SRCS_ALL=${STRING_RESOURCES} ${SRCS}
+MCSOPTS_MI=$(MCSOPTS_BASE) -target:library
+MCSOPTS_LIB=$(MCSOPTS_BASE) -target:library
+MCSOPTS_PS=$(STRING_RESOURCES_ORIG) $(MCSOPTS_BASE) -target:library
+SRCS_ALL=$(STRING_RESOURCES) $(SRCS)
 
 # compilers
 # - Roslyn's csc is used for all the PS code
@@ -63,28 +63,28 @@ RUN_TARGETS=$(POWERSHELL_RUN_TARGETS) dotnetlibs/Microsoft.PowerShell.Commands.M
 all: dotnetlibs/System.Management.Automation.dll $(RUN_TARGETS) dotnetlibs/$(ASSEMBLY_LOAD_CONTEXT_TARGET)
 
 # this is the build rule for SMA.dll
-dotnetlibs/System.Management.Automation.dll: ${SYS_AUTO_SRCS} dotnetlibs/Microsoft.Management.Infrastructure.dll ../src/assembly-info/System.Management.Automation.assembly-info.cs dotnetlibs/$(ASSEMBLY_LOAD_CONTEXT_TARGET) $(PLATFORM_SRCS) ${SYS_AUTO_RES_SRCS} ${SYS_AUTO_RES_CS_SRCS}
-	$(CSC) -out:$@ ${MCSOPTS_LIB} ${PRODUCT_PS_REFS} ${SYS_AUTO_SRCS} ${SYS_AUTO_RES_REF} ${SYS_AUTO_RES_CS_SRCS} $(PLATFORM_SRCS) ../src/assembly-info/System.Management.Automation.assembly-info.cs
+dotnetlibs/System.Management.Automation.dll: $(SYS_AUTO_SRCS) dotnetlibs/Microsoft.Management.Infrastructure.dll ../src/assembly-info/System.Management.Automation.assembly-info.cs dotnetlibs/$(ASSEMBLY_LOAD_CONTEXT_TARGET) $(PLATFORM_SRCS) $(SYS_AUTO_RES_SRCS) $(SYS_AUTO_RES_CS_SRCS)
+	$(CSC) -out:$@ $(MCSOPTS_LIB) $(PRODUCT_PS_REFS) $(SYS_AUTO_SRCS) $(SYS_AUTO_RES_REF) $(SYS_AUTO_RES_CS_SRCS) $(PLATFORM_SRCS) ../src/assembly-info/System.Management.Automation.assembly-info.cs
 
 # this is the build rule for MMI.dll
-dotnetlibs/Microsoft.Management.Infrastructure.dll: ${MAN_INFRA_SRCS} dotnetlibs/Microsoft.Management.Infrastructure.Native.dll ../src/assembly-info/Microsoft.Management.Infrastructure.assembly-info.cs $(MAN_INFRA_RES_SRCS) $(MAN_INFRA_RES_CS_SRCS)
+dotnetlibs/Microsoft.Management.Infrastructure.dll: $(MAN_INFRA_SRCS) dotnetlibs/Microsoft.Management.Infrastructure.Native.dll ../src/assembly-info/Microsoft.Management.Infrastructure.assembly-info.cs $(MAN_INFRA_RES_SRCS) $(MAN_INFRA_RES_CS_SRCS)
 	$(CSC) -out:$@ $(MCSOPTS_MI) $(PRODUCT_MI_REFS) $(MAN_INFRA_SRCS) $(MAN_INFRA_RES_REF) $(MAN_INFRA_RES_CS_SRCS) ../src/assembly-info/Microsoft.Management.Infrastructure.assembly-info.cs
 
 # Commands
 
-dotnetlibs/Microsoft.PowerShell.Commands.Management.dll: ${COMMANDS_MANAGEMENT_SRCS} dotnetlibs/System.Management.Automation.dll dotnetlibs/Microsoft.PowerShell.Security.dll ${COMMANDS_MANAGEMENT_RES_SRCS} ${COMMANDS_MANAGEMENT_RES_CS_SRCS} $(MI_ASSEMBLY)
-	$(CSC) -out:$@ ${MCSOPTS_LIB} ${PRODUCT_COMMANDS_REFS} ${COMMANDS_MANAGEMENT_SRCS} ${COMMANDS_MANAGEMENT_RES_CS_SRCS} $(COMMANDS_MANAGEMENT_RES_REF) $(MI_REF) -r:dotnetlibs/Microsoft.PowerShell.Security.dll
+dotnetlibs/Microsoft.PowerShell.Commands.Management.dll: $(COMMANDS_MANAGEMENT_SRCS) dotnetlibs/System.Management.Automation.dll dotnetlibs/Microsoft.PowerShell.Security.dll $(COMMANDS_MANAGEMENT_RES_SRCS) $(COMMANDS_MANAGEMENT_RES_CS_SRCS) $(MI_ASSEMBLY)
+	$(CSC) -out:$@ $(MCSOPTS_LIB) $(PRODUCT_COMMANDS_REFS) $(COMMANDS_MANAGEMENT_SRCS) $(COMMANDS_MANAGEMENT_RES_CS_SRCS) $(COMMANDS_MANAGEMENT_RES_REF) $(MI_REF) -r:dotnetlibs/Microsoft.PowerShell.Security.dll
 
-dotnetlibs/Microsoft.PowerShell.Commands.Utility.dll: ${COMMANDS_UTILITY_SRCS} dotnetlibs/System.Management.Automation.dll ${COMMANDS_UTILITY_RES_SRCS} ${COMMANDS_UTILITY_RES_CS_SRCS}
-	$(CSC) -out:$@ ${MCSOPTS_LIB} ${PRODUCT_COMMANDS_REFS} ${COMMANDS_UTILITY_SRCS} ${COMMANDS_UTILITY_RES_CS_SRCS} $(COMMANDS_UTILITY_RES_REF)
+dotnetlibs/Microsoft.PowerShell.Commands.Utility.dll: $(COMMANDS_UTILITY_SRCS) dotnetlibs/System.Management.Automation.dll $(COMMANDS_UTILITY_RES_SRCS) $(COMMANDS_UTILITY_RES_CS_SRCS)
+	$(CSC) -out:$@ $(MCSOPTS_LIB) $(PRODUCT_COMMANDS_REFS) $(COMMANDS_UTILITY_SRCS) $(COMMANDS_UTILITY_RES_CS_SRCS) $(COMMANDS_UTILITY_RES_REF)
 
-dotnetlibs/Microsoft.PowerShell.Security.dll: ${SECURITY_SRCS} ${SECURITY_RES_SRCS} ${SECURITY_RES_CS_SRCS}
-	$(CSC) -out:$@ ${MCSOPTS_LIB} ${PRODUCT_COMMANDS_REFS} ${SECURITY_SRCS} ${SECURITY_RES_CS_SRCS} $(SECURITY_RES_REF)
+dotnetlibs/Microsoft.PowerShell.Security.dll: $(SECURITY_SRCS) $(SECURITY_RES_SRCS) $(SECURITY_RES_CS_SRCS)
+	$(CSC) -out:$@ $(MCSOPTS_LIB) $(PRODUCT_COMMANDS_REFS) $(SECURITY_SRCS) $(SECURITY_RES_CS_SRCS) $(SECURITY_RES_REF)
 
 # assembly load context
 
 dotnetlibs/$(ASSEMBLY_LOAD_CONTEXT_TARGET): $(ASSEMBLY_LOAD_CONTEXT_SRCS)
-	$(CSC) -out:$@ ${MCSOPTS_LIB} ${PRODUCT_BASE_REFS} $(ASSEMBLY_LOAD_CONTEXT_SRCS)
+	$(CSC) -out:$@ $(MCSOPTS_LIB) $(PRODUCT_BASE_REFS) $(ASSEMBLY_LOAD_CONTEXT_SRCS)
 
 # this will copy whatever the first version of the dll in the globber is
 buildtemp/System.Reflection.Metadata.dll: buildtemp/System.Reflection.Metadata.*/lib/portable-net45+win8/System.Reflection.Metadata.dll
@@ -101,7 +101,7 @@ dotnetlibs/Microsoft.Management.Infrastructure.Native.dll: ../src/stubs/Microsof
 MPATH=/usr/lib/mono/4.5/Facades
 
 buildtemp/TypeCatalogGen.exe: ../src/monad/monad/nttargets/assemblies/core/PSAssemblyLoadContext/TypeCatalogGen/TypeCatalogGen.cs buildtemp/System.Reflection.Metadata.dll buildtemp/System.Collections.Immutable.dll
-	$(MCS) -out:$@ -target:exe ${NUGETREF} -pkg:dotnet -r:${MPATH}/System.Runtime.dll -r:${MPATH}/System.Reflection.Primitives.dll -r:${MPATH}/System.IO.dll $<
+	$(MCS) -out:$@ -target:exe $(NUGETREF) -pkg:dotnet -r:$(MPATH)/System.Runtime.dll -r:$(MPATH)/System.Reflection.Primitives.dll -r:$(MPATH)/System.IO.dll $<
 
 # generate the Core PS type catalog
 # this comes from: ../src/monad/monad/nttargets/assemblies/core/PSAssemblyLoadContext/makefile.inc

From f70f004238eff0612cee175001fb80b6b27eca02 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Thu, 3 Sep 2015 15:23:16 -0700
Subject: [PATCH 37/40] Missed a pair

---
 scripts/tests.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/tests.mk b/scripts/tests.mk
index 8a7c312a2a..4f9963828a 100644
--- a/scripts/tests.mk
+++ b/scripts/tests.mk
@@ -6,4 +6,4 @@ $(TESTRUN_FOLDER)/xunit%: $(MONAD_EXT)/xunit/xunit%
 	cp -f $^ $@
 
 $(TESTRUN_FOLDER)/ps_test.dll: $(TEST_SRCS) $(addprefix $(TESTRUN_FOLDER)/, xunit.core.dll xunit.assert.dll) $(addprefix dotnetlibs/, System.Management.Automation.dll Microsoft.PowerShell.Commands.Management.dll $(ASSEMBLY_LOAD_CONTEXT_TARGET))
-	$(CSC) -out:$@ -noconfig -nostdlib -target:library $(addprefix -r:$(TESTRUN_FOLDER)/, xunit.core.dll xunit.assert.dll) $(addprefix -r:dotnetlibs/, System.Management.Automation.dll $(ASSEMBLY_LOAD_CONTEXT_TARGET)) ${COREREF} $(TEST_SRCS)
+	$(CSC) -out:$@ -noconfig -nostdlib -target:library $(addprefix -r:$(TESTRUN_FOLDER)/, xunit.core.dll xunit.assert.dll) $(addprefix -r:dotnetlibs/, System.Management.Automation.dll $(ASSEMBLY_LOAD_CONTEXT_TARGET)) $(COREREF) $(TEST_SRCS)

From f6e255310b3765ce4f15b13837bd59678bc58e2a Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Thu, 3 Sep 2015 16:40:30 -0700
Subject: [PATCH 38/40] merged upstream changes inside monad

---
 src/monad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/monad b/src/monad
index 01ff8a3f79..d0697c432c 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit 01ff8a3f7967503f805933d17b90ddb23402b866
+Subproject commit d0697c432c1d678e59af3ebd6320e5bc3a432b2f

From d4f08a971d1822c64f266c3ddccbcdb1e66044df Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Thu, 3 Sep 2015 16:41:14 -0700
Subject: [PATCH 39/40] changed according to code review

---
 src/ps_test/test_CorePsPlatform.cs | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/ps_test/test_CorePsPlatform.cs b/src/ps_test/test_CorePsPlatform.cs
index a8bf60eb91..f2fcef4560 100644
--- a/src/ps_test/test_CorePsPlatform.cs
+++ b/src/ps_test/test_CorePsPlatform.cs
@@ -93,35 +93,26 @@ namespace PSTests
         }
 
         [Fact]
-        public static void TestIsHardLinkWithFileSystemInfo()
+        public static void TestExistantFileIsHardLink()
         {
-            // a file that should exist on every *nix distro
-
             string path = @"/tmp/MyTest";
             if (!File.Exists(path))
             {
                 File.Create(path);
             }
-
             // Create a file to write to using StreamWriter. 
             // convert string to stream.  On Windows, this appears to be handled, but on *nix, we apparently need to convert to UTF8.
             byte[] byteArray    = System.Text.Encoding.UTF8.GetBytes(path);
             MemoryStream stream = new MemoryStream(byteArray);
 
-            using (StreamWriter sw = new StreamWriter(stream))
-            {
-                sw.Write("Hello");
-            }
-
             // Convert `path` string to FileSystemInfo data type. And now, it should return true
             FileSystemInfo fd = new FileInfo(path);
             Assert.True(Platform.NonWindowsIsHardLink(fd));
         }
 
         [Fact]
-        public static void TestIsHardLinkFailsWithDirectoryWithFileSystemInfo()
+        public static void TestDirectoryIsHardLink()
         {
-            // A folder that should exist on every *nix system
             string path = @"/tmp";
 
             // Convert `path` string to FileSystemInfo data type. And now, it should return true
@@ -130,7 +121,7 @@ namespace PSTests
         }
 
         [Fact]
-        public static void TestIsHardLinkFailsWithNonexistantFileWithFileSystemInfo()
+        public static void TestNonExistantIsHardLink()
         {
             // A file that should *never* exist on a test machine:
             string path = @"/tmp/ThisFileShouldNotExistOnTestMachines";

From bd6e4ef88511b80ae1860460bed2a3234aef7ea5 Mon Sep 17 00:00:00 2001
From: Zachary Folwick <v-zafolw@microsoft.com>
Date: Thu, 3 Sep 2015 16:42:28 -0700
Subject: [PATCH 40/40] fixed typo

---
 src/ps_test/test_CorePsPlatform.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ps_test/test_CorePsPlatform.cs b/src/ps_test/test_CorePsPlatform.cs
index f2fcef4560..e11826091e 100644
--- a/src/ps_test/test_CorePsPlatform.cs
+++ b/src/ps_test/test_CorePsPlatform.cs
@@ -101,7 +101,8 @@ namespace PSTests
                 File.Create(path);
             }
             // Create a file to write to using StreamWriter. 
-            // convert string to stream.  On Windows, this appears to be handled, but on *nix, we apparently need to convert to UTF8.
+            // convert string to stream.  On Windows, this appears to be handled, but on *nix, 
+            // we apparently need to convert to UTF8.
             byte[] byteArray    = System.Text.Encoding.UTF8.GetBytes(path);
             MemoryStream stream = new MemoryStream(byteArray);