From 5939b2bd5fe6af8ced8d70e2f4d37cabef6b642e Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Mon, 13 Aug 2018 16:36:11 -0700 Subject: [PATCH 1/3] save modules to un-versioned folder to enable servicing --- build.psm1 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/build.psm1 b/build.psm1 index 668e3beeb4a..ea6643f55d2 100644 --- a/build.psm1 +++ b/build.psm1 @@ -2460,16 +2460,9 @@ function Copy-PSGalleryModules $version } - # Remove semantic version in the destination directory - $destVer = if ($version -match "(\d+.\d+.\d+)-.+") { - $matches[1] - } else { - $version - } - # Nuget seems to always use lowercase in the cache $src = "$nugetCache/$($name.ToLower())/$srcVer" - $dest = "$Destination/$name/$destVer" + $dest = "$Destination/$name" Remove-Item -Force -ErrorAction Ignore -Recurse "$Destination/$name" New-Item -Path $dest -ItemType Directory -Force -ErrorAction Stop > $null From be7d5b42228bd57a44d728d23705dc2ebcac186f Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Mon, 13 Aug 2018 17:33:03 -0700 Subject: [PATCH 2/3] [package] fix PSReadLine test update files.wxs --- assets/files.wxs | 114 +++++++++--------- .../Modules/PSReadLine/PSReadLine.Tests.ps1 | 2 +- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/assets/files.wxs b/assets/files.wxs index 70b63631580..17ab216bb2e 100644 --- a/assets/files.wxs +++ b/assets/files.wxs @@ -1646,124 +1646,124 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1785,23 +1785,23 @@ - + - + - + - + - + - + @@ -1809,32 +1809,32 @@ - + - + - + - + - + - + - + - + - + @@ -1842,10 +1842,10 @@ - + - + @@ -1902,17 +1902,17 @@ - + - + - + - + diff --git a/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1 b/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1 index e66a1435075..4d7358e3061 100644 --- a/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1 +++ b/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1 @@ -13,7 +13,7 @@ Describe "PSReadLine" -tags "CI" { $module = Get-Module PSReadLine $module.Name | Should -BeExactly 'PSReadLine' $module.Version | Should -BeExactly '2.0.0' - $module.Path | Should -Be (Join-Path -Path $PSHOME -ChildPath "Modules/PSReadLine/2.0.0/PSReadLine.psm1") + $module.Path | Should -Be (Join-Path -Path $PSHOME -ChildPath "Modules/PSReadLine/PSReadLine.psm1") } It "Should use Emacs Bindings on Linux and macOS" -skip:$IsWindows { From 4455ed5b0173615af1e1c22267c2d0c4625d3669 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Mon, 13 Aug 2018 20:05:50 -0700 Subject: [PATCH 3/3] [package] update path for pkgmgmt and psreadline help tests --- .../engine/Help/UpdatableHelpSystem.Tests.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1 b/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1 index e976906be5d..eab542cd89d 100644 --- a/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1 +++ b/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1 @@ -132,24 +132,24 @@ $testCases = @{ HelpFiles = "Microsoft.PowerShell.PackageManagement.dll-help.xml" HelpInfoFiles = "PackageManagement_4ae9fd46-338a-459c-8186-07f910774cb8_HelpInfo.xml" CompressedFiles = "PackageManagement_4ae9fd46-338a-459c-8186-07f910774cb8_en-US_helpcontent$extension" - HelpInstallationPath = "$pshome\Modules\PackageManagement\*\en-US" - HelpInstallationPathHome = "$userHelpRoot\PackageManagement\*\en-US" + HelpInstallationPath = "$pshome\Modules\PackageManagement\en-US" + HelpInstallationPathHome = "$userHelpRoot\PackageManagement\en-US" } "PowershellGet" = @{ HelpFiles = "PSGet.psm1-help.xml" HelpInfoFiles = "PowershellGet_1d73a601-4a6c-43c5-ba3f-619b18bbb404_HelpInfo.xml" CompressedFiles = "PowershellGet_1d73a601-4a6c-43c5-ba3f-619b18bbb404_en-US_helpcontent$extension" - HelpInstallationPath = "$pshome\Modules\PowershellGet\*\en-US" - HelpInstallationPathHome = "$userHelpRoot\PackageManagement\*\en-US" + HelpInstallationPath = "$pshome\Modules\PowershellGet\en-US" + HelpInstallationPathHome = "$userHelpRoot\PackageManagement\en-US" } "PSReadline" = @{ HelpFiles = "Microsoft.PowerShell.PSReadLine.dll-help.xml" HelpInfoFiles = "PSReadline_5714753b-2afd-4492-a5fd-01d9e2cff8b5_HelpInfo.xml" CompressedFiles = "PSReadline_5714753b-2afd-4492-a5fd-01d9e2cff8b5_en-US_helpcontent$extension" - HelpInstallationPath = "$pshome\Modules\PSReadLine\2.0.0\en-US" - HelpInstallationPathHome = "$userHelpRoot\PSReadLine\2.0.0\en-US" + HelpInstallationPath = "$pshome\Modules\PSReadLine\en-US" + HelpInstallationPathHome = "$userHelpRoot\PSReadLine\en-US" } }