From fed6be7e3449dea02a9f2e31b6023f1820151b1c Mon Sep 17 00:00:00 2001 From: FriedrichWeinmann Date: Sun, 6 Oct 2024 19:35:22 +0200 Subject: [PATCH 1/4] changing temp path --- PSModuleDevelopment/tests/functions/Templates.Tests.ps1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 b/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 index 3e38b57..6c50d88 100644 --- a/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 +++ b/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 @@ -1,9 +1,12 @@ Describe "Verifying templating component" { BeforeAll { - $outPath = (Get-Item -Path 'TestDrive:\').FullName + $outPath = [System.IO.Path]::GetTempPath().Trim("\/") $resourcePath = Resolve-PSFPath -Path "$PSScriptRoot\..\resources" $templateName = 'TestTemplate-{0}' -f (Get-Random) } + AfterAll { + Remove-Item -Path "$outPath\Test.txt" -ErrorAction Ignore + } It "Should Record the template correctly" { { New-PSMDTemplate -TemplateName $templateName -FilePath "$resourcePath\þnameþ.txt" -OutPath $outPath -EnableException -ErrorAction Stop } | Should -Not -Throw @@ -27,7 +30,7 @@ It "Should Invoke the template correctly" { { Invoke-PSMDTemplate -TemplateName $templateName -Path $outPath -OutPath $outPath -Name Test -EnableException } | Should -Not -Throw - $content = Get-Content -Path "TestDrive:\Test.txt" -ErrorAction Stop + $content = Get-Content -Path "$outPath\Test.txt" -ErrorAction Stop $values = $content | ConvertFrom-StringData -ErrorAction Stop $values.Name | Should -Be Test $values.Value | Should -Be '123' From 4d12a6dce1eb18363e78c9c79541d2ec9582c39b Mon Sep 17 00:00:00 2001 From: FriedrichWeinmann Date: Sun, 6 Oct 2024 19:44:42 +0200 Subject: [PATCH 2/4] switching to artifacts directory if present --- PSModuleDevelopment/tests/functions/Templates.Tests.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 b/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 index 6c50d88..3b79e45 100644 --- a/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 +++ b/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 @@ -1,6 +1,7 @@ Describe "Verifying templating component" { BeforeAll { $outPath = [System.IO.Path]::GetTempPath().Trim("\/") + if ($env:System_ArtifactsDirectory) { $outPath = $env:System_ArtifactsDirectory.Trim("\/") } $resourcePath = Resolve-PSFPath -Path "$PSScriptRoot\..\resources" $templateName = 'TestTemplate-{0}' -f (Get-Random) } From 0c68dc05c5dd739bc06d5b400ecfbfbe764030af Mon Sep 17 00:00:00 2001 From: FriedrichWeinmann Date: Sun, 6 Oct 2024 19:51:41 +0200 Subject: [PATCH 3/4] next Azure DevOps Path update --- PSModuleDevelopment/tests/functions/Templates.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 b/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 index 3b79e45..4f71d83 100644 --- a/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 +++ b/PSModuleDevelopment/tests/functions/Templates.Tests.ps1 @@ -1,7 +1,7 @@ Describe "Verifying templating component" { BeforeAll { $outPath = [System.IO.Path]::GetTempPath().Trim("\/") - if ($env:System_ArtifactsDirectory) { $outPath = $env:System_ArtifactsDirectory.Trim("\/") } + if ($env:SYSTEM_DEFAULTWORKINGDIRECTORY) { $outPath = $env:SYSTEM_DEFAULTWORKINGDIRECTORY.Trim("\/") } $resourcePath = Resolve-PSFPath -Path "$PSScriptRoot\..\resources" $templateName = 'TestTemplate-{0}' -f (Get-Random) } From 8de6c17d20ca0e7bf7a76aea457ac50dfcb64320 Mon Sep 17 00:00:00 2001 From: FriedrichWeinmann Date: Sun, 6 Oct 2024 20:00:52 +0200 Subject: [PATCH 4/4] Fixing item-type detection in bad serialization situations --- .../functions/templating/Invoke-PSMDTemplate.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PSModuleDevelopment/functions/templating/Invoke-PSMDTemplate.ps1 b/PSModuleDevelopment/functions/templating/Invoke-PSMDTemplate.ps1 index fbb82cc..0b9223f 100644 --- a/PSModuleDevelopment/functions/templating/Invoke-PSMDTemplate.ps1 +++ b/PSModuleDevelopment/functions/templating/Invoke-PSMDTemplate.ps1 @@ -337,7 +337,7 @@ Write-PSFMessage -Level Verbose -Message "Creating Template-Item: $($Item.Name) ($($Item.RelativePath))" -FunctionName Invoke-PSMDTemplate -ModuleName PSModuleDevelopment -Tag 'create', 'template' $identifier = $Item.Identifier - $isFile = $Item.GetType().Name -eq 'TemplateItemFile' + $isFile = $Item.PSObject.Properties.Name -contains 'Value' #region File if ($isFile) {