Skip to content

Fix Start-PSBuild on WSL if repository was already built on Windows #5346

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 7 commits into from
Nov 15, 2017
Merged

Fix Start-PSBuild on WSL if repository was already built on Windows #5346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e4fa4e8
Fix build on WSL if repository was already built on Windows.
bergmeister Nov 5, 2017
8d4a8af
Update .gitignore to match powershell**.inc instead of powershell.inc…
bergmeister Nov 5, 2017
af094e3
Put comment on single line as per style guide and add more comment de…
bergmeister Nov 6, 2017
e1fde8f
Include file extension in $incFileName variable to reduce '.inc' dupl…
bergmeister Nov 7, 2017
adcf857
Fix typo and do not trim the $Runtime string since this does not seem…
bergmeister Nov 13, 2017
a78e0c0
Use $Options.Runtime instead of $Runtime because the former gets dete…
bergmeister Nov 13, 2017
4625d83
Addressed minor suggestions made in PR 5346.
bergmeister Nov 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ function Start-PSBuild {

# These runtimes must match those in project.json
# We do not use ValidateScript since we want tab completion
# If this parameter is not provided it will get determined automatically.
[ValidateSet("win7-x64",
"win7-x86",
"osx.10.12-x64",
Expand Down Expand Up @@ -488,10 +489,12 @@ Fix steps:
Start-ResGen
}

# handle TypeGen
if ($TypeGen -or -not (Test-Path "$PSScriptRoot/src/System.Management.Automation/CoreCLR/CorePsTypeCatalog.cs")) {
# Handle TypeGen
# .inc file name must be different for Windows and Linux to allow build on Windows and WSL.
$incFileName = "powershell_$($Options.Runtime).inc"
if ($TypeGen -or -not (Test-Path "$PSScriptRoot/TypeCatalogGen/$incFileName")) {
log "Run TypeGen (generating CorePsTypeCatalog.cs)"
Start-TypeGen
Start-TypeGen -IncFileName $incFileName
}

# Get the folder path where pwsh.exe is located.
Expand All @@ -515,7 +518,7 @@ Fix steps:
# publish netcoreapp2.0 reference assemblies
try {
Push-Location "$PSScriptRoot/src/TypeCatalogGen"
$refAssemblies = Get-Content -Path "powershell.inc" | Where-Object { $_ -like "*microsoft.netcore.app*" } | ForEach-Object { $_.TrimEnd(';') }
$refAssemblies = Get-Content -Path $incFileName | Where-Object { $_ -like "*microsoft.netcore.app*" } | ForEach-Object { $_.TrimEnd(';') }
$refDestFolder = Join-Path -Path $publishPath -ChildPath "ref"

if (Test-Path $refDestFolder -PathType Container) {
Expand Down Expand Up @@ -1631,7 +1634,11 @@ function Start-DevPowerShell {
function Start-TypeGen
{
[CmdletBinding()]
param()
param
(
[ValidateNotNullOrEmpty()]
$IncFileName = 'powershell.inc'
)

# Add .NET CLI tools to PATH
Find-Dotnet
Expand All @@ -1652,15 +1659,15 @@ function Start-TypeGen

Push-Location "$PSScriptRoot/src/Microsoft.PowerShell.SDK"
try {
$ps_inc_file = "$PSScriptRoot/src/TypeCatalogGen/powershell.inc"
$ps_inc_file = "$PSScriptRoot/src/TypeCatalogGen/$IncFileName"
dotnet msbuild .\Microsoft.PowerShell.SDK.csproj /t:_GetDependencies "/property:DesignTimeBuild=true;_DependencyFile=$ps_inc_file" /nologo
} finally {
Pop-Location
}

Push-Location "$PSScriptRoot/src/TypeCatalogGen"
try {
dotnet run ../System.Management.Automation/CoreCLR/CorePsTypeCatalog.cs powershell.inc
dotnet run ../System.Management.Automation/CoreCLR/CorePsTypeCatalog.cs $IncFileName
} finally {
Pop-Location
}
Expand Down
2 changes: 1 addition & 1 deletion src/TypeCatalogGen/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
powershell.inc
powershell**.inc