From 17a50a9f91f3107eeeae0592470f4af38b625543 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Wed, 3 Feb 2016 15:21:29 -0800 Subject: [PATCH] Remove temporary dotnet-publish workaround Latest dotnet-nightly packages have not required this. --- build.FullCLR.ps1 | 3 --- build.ps1 | 2 -- build.sh | 2 -- 3 files changed, 7 deletions(-) diff --git a/build.FullCLR.ps1 b/build.FullCLR.ps1 index 955603b76c..6ac41c3ad8 100644 --- a/build.FullCLR.ps1 +++ b/build.FullCLR.ps1 @@ -16,9 +16,6 @@ try cd ..\..\src\Microsoft.PowerShell.Commands.Management dotnet publish --framework dnx451 --output $BINFULL - # Temporary fix for dotnet publish - if (Test-Path $BINFULL/Debug/dnx451) { cp $BINFULL/Debug/dnx451/* $BINFULL } - # build native host mkdir $build -ErrorAction SilentlyContinue cd $build diff --git a/build.ps1 b/build.ps1 index cc1e3054fb..4eeffb1534 100644 --- a/build.ps1 +++ b/build.ps1 @@ -15,8 +15,6 @@ cd ../.. # Publish PowerShell cd src/Microsoft.PowerShell.Linux.Host dotnet publish --framework dnxcore50 --output $BIN -# Temporary fix for dotnet publish -if (Test-Path $BIN/Debug/dnxcore50) { cp $BIN/Debug/dnxcore50/* $BIN } # Copy files that dotnet-publish does not currently deploy cp *_profile.ps1 $BIN cd ../.. diff --git a/build.sh b/build.sh index bac1744f81..188db720ab 100755 --- a/build.sh +++ b/build.sh @@ -38,8 +38,6 @@ mkdir -p $BIN/Modules ( cd src/Microsoft.PowerShell.Linux.Host dotnet publish --framework dnxcore50 --output $BIN --configuration Linux - # Temporary fix for dotnet publish - [[ -d $BIN/Debug/dnxcore50 ]] && cp $BIN/Debug/dnxcore50/* $BIN # Copy files that dotnet-publish does not currently deploy cp *_profile.ps1 $BIN )