From d1eed5a4fe86ea6ee3063b0356e4e315f5cac66c Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 2 Nov 2017 17:59:17 -0700
Subject: [PATCH] Separate Install-PowerShellRemoting.ps1 from psrp.windows
 nuget package

---
 build.psm1                                         | 4 ----
 docs/building/internals.md                         | 7 -------
 src/powershell-win-core/.gitignore                 | 1 -
 src/powershell-win-core/powershell-win-core.csproj | 2 +-
 4 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 src/powershell-win-core/.gitignore

diff --git a/build.psm1 b/build.psm1
index 2e0439f5309..13afb79cbc2 100644
--- a/build.psm1
+++ b/build.psm1
@@ -257,10 +257,6 @@ cmd.exe /C cd /d "$location" "&" "$($vcPath)\vcvarsall.bat" "$Arch" "&" cmake "$
             log "  Copying $srcPath to $dstPath"
             Copy-Item $srcPath $dstPath
         }
-
-        # Place the remoting configuration script in the same directory
-        # as the binary so it will get published.
-        Copy-Item .\Install-PowerShellRemoting.ps1 $dstPath
     } finally {
         Pop-Location
     }
diff --git a/docs/building/internals.md b/docs/building/internals.md
index 8c80654e89c..5c4fea938d4 100644
--- a/docs/building/internals.md
+++ b/docs/building/internals.md
@@ -124,8 +124,6 @@ Start-BuildNativeWindowsBinaries -Configuration Release -Arch x64
 ```
 
 After that, the binary `pwrshplugin.dll` and its PDB file will be placed under 'src/powershell-win-core'.
-The script file `Install-PowerShellRemoting.ps1` will also be placed in the same folder,
-which is supposed to be used to set up remoting configurations for PowerShell Core.
 
 To create a new NuGet package for `pwrshplugin.dll`, first you need to get the `psrp.windows.nuspec` from an existing `psrp.windows` package.
 You can find it at `~/.nuget/packages/psrp.windows` on your windows machine if you have recently built PowerShell on it.
@@ -138,11 +136,6 @@ and create the same layout of files as in the existing package.
 The layout of files should look like this:
 
 ```none
-+---contentFiles
-|   \---any
-|       \---any
-|               Install-PowerShellRemoting.ps1
-|
 \---runtimes
     +---win-x64
     |   \---native
diff --git a/src/powershell-win-core/.gitignore b/src/powershell-win-core/.gitignore
deleted file mode 100644
index 8aa2b4e4425..00000000000
--- a/src/powershell-win-core/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Install-PowerShellRemoting.ps1
diff --git a/src/powershell-win-core/powershell-win-core.csproj b/src/powershell-win-core/powershell-win-core.csproj
index 049d0531b6d..0d50de03323 100644
--- a/src/powershell-win-core/powershell-win-core.csproj
+++ b/src/powershell-win-core/powershell-win-core.csproj
@@ -19,7 +19,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
-    <Content Include="..\..\license_thirdparty_proprietary.txt;..\..\DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY">
+    <Content Include="..\..\license_thirdparty_proprietary.txt;..\..\DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY;..\powershell-native\Install-PowerShellRemoting.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>