Rename Microsoft.PowerShell.PSReadline.dll

To work around PowerShell Core not loading the dll from the same
directory as PSReadLine.psd1, I've renamed the dll.

Author: lzybkr

CheckHelp.ps1

@@ -1,6 +1,6 @@
 param($Configuration = 'Release')
 
-$ourAssembly = "$PSScriptRoot\PSReadLine\bin\$Configuration\Microsoft.PowerShell.PSReadLine.dll"
+$ourAssembly = "$PSScriptRoot\PSReadLine\bin\$Configuration\Microsoft.PowerShell.PSReadLine2.dll"
 
 $t ='Microsoft.PowerShell.PSConsoleReadLine' -as [type]
 if ($null -ne $t -and $t.Assembly.Location -ne $ourAssembly)

GenerateFunctionHelp.ps1

@@ -8,7 +8,7 @@ param(
 
 $errorActionPreference = "Stop"
 
-$ourAssembly = "$PSScriptRoot\PSReadLine\bin\$Configuration\Microsoft.PowerShell.PSReadLine.dll"
+$ourAssembly = "$PSScriptRoot\PSReadLine\bin\$Configuration\Microsoft.PowerShell.PSReadLine2.dll"
 
 $t ='Microsoft.PowerShell.PSConsoleReadLine' -as [type]
 if ($null -ne $t -and $t.Assembly.Location -ne $ourAssembly)

PSReadLine.build.ps1

@@ -69,20 +69,20 @@ task RestoreNugetPackages @restoreNugetParameters CheckNugetInstalled,{
 
 $buildMamlParams = @{
     Inputs  = { Get-ChildItem docs/*.md }
-    Outputs = "$targetDir/en-US/Microsoft.PowerShell.PSReadLine.dll-help.xml"
+    Outputs = "$targetDir/en-US/Microsoft.PowerShell.PSReadLine2.dll-help.xml"
 }
 
 <#
 Synopsis: Generate maml help from markdown
 #>
 task BuildMamlHelp @buildMamlParams {
-    platyPS\New-ExternalHelp docs -Force -OutputPath $targetDir/en-US/Microsoft.PowerShell.PSReadLine.dll-help.xml
+    platyPS\New-ExternalHelp docs -Force -OutputPath $targetDir/en-US/Microsoft.PowerShell.PSReadLine2.dll-help.xml
 }
 
 $buildAboutTopicParams = @{
     Inputs = {
          Get-ChildItem docs/about_PSReadLine.help.txt
-         "PSReadLine/bin/$Configuration/Microsoft.PowerShell.PSReadLine.dll"
+         "PSReadLine/bin/$Configuration/Microsoft.PowerShell.PSReadLine2.dll"
          "$PSScriptRoot/GenerateFunctionHelp.ps1"
          "$PSScriptRoot/CheckHelp.ps1"
     }
@@ -112,7 +112,7 @@ task BuildAboutTopic @buildAboutTopicParams {
 
 $binaryModuleParams = @{
     Inputs  = { Get-ChildItem PSReadLine/*.cs, PSReadLine/PSReadLine.csproj, PSReadLine/PSReadLineResources.resx }
-    Outputs = "PSReadLine/bin/$Configuration/Microsoft.PowerShell.PSReadLine.dll"
+    Outputs = "PSReadLine/bin/$Configuration/Microsoft.PowerShell.PSReadLine2.dll"
 }
 
 <#
@@ -185,11 +185,11 @@ task LayoutModule BuildMainModule, BuildMamlHelp, {
     }
 
 
-    Copy-Item PSReadLine/bin/$Configuration/Microsoft.PowerShell.PSReadLine.dll $targetDir
+    Copy-Item PSReadLine/bin/$Configuration/Microsoft.PowerShell.PSReadLine2.dll $targetDir
     Copy-Item PSReadLine/bin/$Configuration/System.Runtime.InteropServices.RuntimeInformation.dll $targetDir
 
     # Copy module manifest, but fix the version to match what we've specified in the binary module.
-    $version = (Get-ChildItem -Path $targetDir/Microsoft.PowerShell.PSReadLine.dll).VersionInfo.FileVersion
+    $version = (Get-ChildItem -Path $targetDir/Microsoft.PowerShell.PSReadLine2.dll).VersionInfo.FileVersion
     $moduleManifestContent = Get-Content -Path 'PSReadLine/PSReadLine.psd1' -Raw
     [regex]::Replace($moduleManifestContent, "ModuleVersion = '.*'", "ModuleVersion = '$version'") | Set-Content -Path $targetDir/PSReadLine.psd1
 

PSReadLine/PSReadLine.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{615788CB-1B9A-4B34-97B3-4608686E59CA}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.PowerShell.PSReadLine</RootNamespace>
-    <AssemblyName>Microsoft.PowerShell.PSReadLine</AssemblyName>
+    <AssemblyName>Microsoft.PowerShell.PSReadLine2</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>

PSReadLine/PSReadLine.psd1

@@ -1,6 +1,6 @@
 @{
 RootModule = 'PSReadLine.psm1'
-NestedModules = @("Microsoft.PowerShell.PSReadLine.dll")
+NestedModules = @("Microsoft.PowerShell.PSReadLine2.dll")
 ModuleVersion = '2.0'
 GUID = '5714753b-2afd-4492-a5fd-01d9e2cff8b5'
 Author = 'Microsoft Corporation'

appveyor.yml

@@ -11,7 +11,7 @@ before_build:
 build_script:
   - ps: |
       Invoke-Build -Task ZipRelease -Configuration Release
-      platyPS\Get-HelpPreview .\bin\Release\PSReadLine\en-US\Microsoft.PowerShell.PSReadLine.dll-help.xml > .\bin\Release\PSReadLine.txt
+      platyPS\Get-HelpPreview .\bin\Release\PSReadLine\en-US\Microsoft.PowerShell.PSReadLine2.dll-help.xml > .\bin\Release\PSReadLine.txt
 
 artifacts:
   - path: .\bin\Release\PSReadLine.zip

docs/Get-PSReadLineKeyHandler.md

@@ -1,6 +1,6 @@
 ---
 schema: 2.0.0
-external help file: Microsoft.PowerShell.PSReadLine.dll-help.xml
+external help file: Microsoft.PowerShell.PSReadLine2.dll-help.xml
 ---
 
 # Get-PSReadLineKeyHandler

docs/Get-PSReadLineOption.md

@@ -1,6 +1,6 @@
 ---
 schema: 2.0.0
-external help file: Microsoft.PowerShell.PSReadLine.dll-help.xml
+external help file: Microsoft.PowerShell.PSReadLine2.dll-help.xml
 ---
 
 # Get-PSReadLineOption

docs/Set-PSReadLineKeyHandler.md

@@ -1,6 +1,6 @@
 ---
 schema: 2.0.0
-external help file: Microsoft.PowerShell.PSReadLine.dll-help.xml
+external help file: Microsoft.PowerShell.PSReadLine2.dll-help.xml
 ---
 
 # Set-PSReadLineKeyHandler

docs/Set-PSReadLineOption.md

@@ -1,6 +1,6 @@
 ---
 schema: 2.0.0
-external help file: Microsoft.PowerShell.PSReadLine.dll-help.xml
+external help file: Microsoft.PowerShell.PSReadLine2.dll-help.xml
 ---
 
 # Set-PSReadLineOption