From e5e287b31d4f29dc375cbdc62124a1662e643d1c Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Mon, 4 Apr 2016 18:43:18 -0700 Subject: [PATCH 1/2] Update .gitignore to include work on windows - Add files produced by cmake in powershell-native to it's own gitignore - Add files that VS creates to the root-level gitignore - Add .exe files that are content to the root-level gitignore --- .gitignore | 12 ++++++++++-- src/powershell-native/.gitignore | 12 ++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/powershell-native/.gitignore diff --git a/.gitignore b/.gitignore index 0654d1e0b..c8259cf33 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,14 @@ bin/ -binFull/ -build/ obj/ project.lock.json *-tests.xml + +# dotnet cli install.ps1 script +install.ps1 + +# VS auto-generated solution files for project.json solutions +*.xproj +*.xproj.user + +# We copy powershell.exe as a content in host dotnet cli projects +*.exe diff --git a/src/powershell-native/.gitignore b/src/powershell-native/.gitignore new file mode 100644 index 000000000..62f5f82d5 --- /dev/null +++ b/src/powershell-native/.gitignore @@ -0,0 +1,12 @@ +ALL_BUILD.vcxproj +ALL_BUILD.vcxproj.filters +CMakeCache.txt +CMakeFiles/ +PowerShell.sln +Win32/ +ZERO_CHECK.vcxproj +ZERO_CHECK.vcxproj.filters +cmake_install.cmake +powershell.dir/ +powershell.vcxproj +powershell.vcxproj.filters From 4cb0ef5a75e03796ba6177d43eb86533d83ddf90 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Mon, 4 Apr 2016 18:58:53 -0700 Subject: [PATCH 2/2] Update default for Start-DevPSGitHub -binDir parameter --- PowerShellGitHubDev.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PowerShellGitHubDev.psm1 b/PowerShellGitHubDev.psm1 index 02fbfb3e5..f584da953 100644 --- a/PowerShellGitHubDev.psm1 +++ b/PowerShellGitHubDev.psm1 @@ -319,7 +319,7 @@ function Start-DevPSGitHub { [switch]$ZapDisable, [string[]]$ArgumentList = '', [switch]$LoadProfile, - [string]$binDir = "$PSScriptRoot\binFull", + [string]$binDir = "$PSScriptRoot\src\Microsoft.PowerShell.ConsoleHost\bin\Debug\net451", [switch]$NoNewWindow )