Merge remote-tracking branch 'origin/development'

Author: alerickson

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.1.2
+
+New Feature
+
+- Added support for registering repositories with special characters
+
 ## 2.1.1
 - Fix DSC resource folder structure
 

SignConfig.xml

@@ -17,7 +17,8 @@
     <file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSRepository\MSFT_PSRepository.schema.mof" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSRepository\MSFT_PSRepository.schema.mof" />
     <file src="__INPATHROOT__\PowerShellGet\DSCResources\MSFT_PSRepository\en-US\MSFT_PSRepository.strings.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\DSCResources\MSFT_PSRepository\en-US\MSFT_PSRepository.strings.psd1" />
 
-    <file src="__INPATHROOT__\PowerShellGet\Modules\PowerShellGet.LocalizationHelper\PowerShellGet.LocalizationHelper.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PowerShellGet.LocalizationHelper\PowerShellGet.LocalizationHelper.psm1" />
+    <file src="__INPATHROOT__\PowerShellGet\Modules\PowerShellGet.ResourceHelper\en-US\PowerShellGet.ResourceHelper.strings.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PowerShellGet.ResourceHelper\en-US\PowerShellGet.ResourceHelper.strings.psd1" />
     <file src="__INPATHROOT__\PowerShellGet\Modules\PowerShellGet.ResourceHelper\PowerShellGet.ResourceHelper.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PowerShellGet.ResourceHelper\PowerShellGet.ResourceHelper.psm1" />
+    <file src="__INPATHROOT__\PowerShellGet\Modules\PowerShellGet.LocalizationHelper\PowerShellGet.LocalizationHelper.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PowerShellGet.LocalizationHelper\PowerShellGet.LocalizationHelper.psm1" />
   </job>
 </SignConfigXML>

Tests/Pester.PSRepository.Tests.ps1

@@ -60,6 +60,25 @@ Describe 'Test Register-PSRepository and Register-PackageSource for PSGallery re
         $repo.Trusted | should be $true
     }
 
+    It 'Register-PSRepository File system location with special chars' {
+        $tmpdir = Join-Path -Path ([System.IO.Path]::GetTempPath()) -ChildPath 'ps repo testing [$!@^&test(;)]'
+        if (-not (Test-Path -LiteralPath $tmpdir)) {
+            New-Item -Path $tmpdir -ItemType Directory > $null
+        }
+        try {
+            Register-PSRepository -Name 'Test Repo' -SourceLocation $tmpdir
+            try {
+                $repo = Get-PSRepository -Name 'Test Repo'
+                $repo.Name | should be 'Test Repo'
+                $repo.SourceLocation | should be $tmpdir
+            } finally {
+                Unregister-PSRepository -Name 'Test Repo' -ErrorAction SilentlyContinue
+            }
+        } finally {
+            Remove-Item -LiteralPath $tmpdir -Force -Recurse
+        }
+    }
+
     It 'Reregister PSGallery again: Should fail' {
         Register-PSRepository -Default
         Register-PSRepository -Default -ErrorVariable ev -ErrorAction SilentlyContinue

src/PowerShellGet/PowerShellGet.psd1

@@ -1,6 +1,6 @@
 @{
     RootModule        = 'PSModule.psm1'
-    ModuleVersion     = '2.1.1'
+    ModuleVersion     = '2.1.2'
     GUID              = '1d73a601-4a6c-43c5-ba3f-619b18bbb404'
     Author            = 'Microsoft Corporation'
     CompanyName       = 'Microsoft Corporation'
@@ -54,6 +54,12 @@
             ProjectUri   = 'https://go.microsoft.com/fwlink/?LinkId=828955'
             LicenseUri   = 'https://go.microsoft.com/fwlink/?LinkId=829061'
             ReleaseNotes = @'
+## 2.1.2
+
+New Feature
+
+- Added support for registering repositories with special characters
+
 ## 2.1.1
 
 - Fix DSC resource folder structure

src/PowerShellGet/private/functions/Resolve-Location.ps1

@@ -29,7 +29,7 @@ function Resolve-Location
     # Ping and resolve the specified location
     if(-not (Test-WebUri -uri $Location))
     {
-        if(Microsoft.PowerShell.Management\Test-Path -Path $Location)
+        if(Microsoft.PowerShell.Management\Test-Path -LiteralPath $Location)
         {
             return $Location
         }
@@ -77,4 +77,4 @@ function Resolve-Location
                        -ExceptionObject $Location
         }
     }
-}
+}

src/PowerShellGet/public/providerfunctions/Add-PackageSource.ps1

@@ -106,7 +106,7 @@ function Add-PackageSource
 
         $PublishLocation = $Options[$script:PublishLocation]
 
-        if(-not (Microsoft.PowerShell.Management\Test-Path $PublishLocation) -and
+        if(-not (Microsoft.PowerShell.Management\Test-Path -LiteralPath $PublishLocation) -and
            -not (Test-WebUri -uri $PublishLocation))
         {
             $PublishLocationUri = [Uri]$PublishLocation
@@ -149,7 +149,7 @@ function Add-PackageSource
 
         $ScriptSourceLocation = $Options[$script:ScriptSourceLocation]
 
-        if(-not (Microsoft.PowerShell.Management\Test-Path $ScriptSourceLocation) -and
+        if(-not (Microsoft.PowerShell.Management\Test-Path -LiteralPath $ScriptSourceLocation) -and
            -not (Test-WebUri -uri $ScriptSourceLocation))
         {
             $ScriptSourceLocationUri = [Uri]$ScriptSourceLocation
@@ -192,7 +192,7 @@ function Add-PackageSource
 
         $ScriptPublishLocation = $Options[$script:ScriptPublishLocation]
 
-        if(-not (Microsoft.PowerShell.Management\Test-Path $ScriptPublishLocation) -and
+        if(-not (Microsoft.PowerShell.Management\Test-Path -LiteralPath $ScriptPublishLocation) -and
            -not (Test-WebUri -uri $ScriptPublishLocation))
         {
             $ScriptPublishLocationUri = [Uri]$ScriptPublishLocation
@@ -275,7 +275,7 @@ function Add-PackageSource
         return
     }
 
-    if(-not (Microsoft.PowerShell.Management\Test-Path -Path $Location) -and
+    if(-not (Microsoft.PowerShell.Management\Test-Path -LiteralPath $Location) -and
        -not (Test-WebUri -uri $Location) )
     {
         $LocationUri = [Uri]$Location
@@ -498,7 +498,7 @@ function Add-PackageSource
 
         # ScriptPublishLocation and PublishLocation should be equal in case of SMB Share or Local directory paths
         if($Options.ContainsKey($script:ScriptPublishLocation) -and
-           (Microsoft.PowerShell.Management\Test-Path -Path $ScriptPublishLocation))
+           (Microsoft.PowerShell.Management\Test-Path -LiteralPath $ScriptPublishLocation))
         {
             if($ScriptPublishLocation -ne $PublishLocation)
             {
@@ -521,7 +521,7 @@ function Add-PackageSource
     {
         # ScriptSourceLocation and SourceLocation cannot be same for they are URLs
         # Both should be equal in case of SMB Share or Local directory paths
-        if(Microsoft.PowerShell.Management\Test-Path -Path $ScriptSourceLocation)
+        if(Microsoft.PowerShell.Management\Test-Path -LiteralPath $ScriptSourceLocation)
         {
             if($ScriptSourceLocation -ne $LocationString)
             {
@@ -609,4 +609,4 @@ function Add-PackageSource
 
     # return the package source object.
     Write-Output -InputObject (New-PackageSourceFromModuleSource -ModuleSource $moduleSource)
-}
+}