Revert simple Join-Path syntax (#2459)

microsoft · Feb 18, 2022 · 525a250 · 525a250
1 parent 92cb8e0
commit 525a250
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/ado-build.yml b/ado-build.yml
@@ -23,7 +23,6 @@ jobs:
     inputs:
       targetType: filePath
       filePath: ./scripts/BuildAndTest.ps1
-      pwsh: true
 
   - task: PublishBuildArtifacts@1
     inputs:
@@ -42,4 +41,3 @@ jobs:
     inputs:
       targetType: filePath
       filePath: ./scripts/BuildMultitoolForNpm.ps1
-      pwsh: true
diff --git a/scripts/NuGetUtilities.psm1 b/scripts/NuGetUtilities.psm1
@@ -18,11 +18,11 @@ if ($ENV:OS) {
     $NugetExePath = "$RepoRoot\.nuget\NuGet.exe"
 }
 $NuGetPackageRoot = Join-Path $SourceRoot "packages"
-$NuGetSamplesPackageRoot = Join-Path $SourceRoot "Samples" "packages"
+$NuGetSamplesPackageRoot = Join-Path (Join-Path $SourceRoot "Samples") "packages"
 $NuGetConfigFile = Join-Path $RepoRoot "NuGet.Config"
 
 $PackageSource = "https://nuget.org"
-$PackageOutputDirectoryRoot = Join-Path $BuildRoot "Publish" "NuGet"
+$PackageOutputDirectoryRoot = Join-Path (Join-Path $BuildRoot "Publish") "NuGet"
 
 function Get-PackageVersion([switch]$previous) {
     $versionPrefix, $schemaVersion, $stableSarifVersion = & $PSScriptRoot\Get-VersionConstants.ps1 -Previous:$previous

diff --git a/scripts/ScriptUtilities.psm1 b/scripts/ScriptUtilities.psm1
@@ -13,7 +13,7 @@ $InformationPreference = "Continue"
 $RepoRoot = $(Resolve-Path $PSScriptRoot\..).Path
 $Platform = "AnyCPU"
 $SourceRoot = Join-Path $RepoRoot "src"
-$JsonSchemaPath = Join-Path $SourceRoot "Sarif" "Schemata" "sarif-schema.json"
+$JsonSchemaPath = Join-Path (Join-Path (Join-Path $SourceRoot "Sarif") "Schemata") "sarif-schema.json"
 $BuildPropsPath = Join-Path $SourceRoot "build.props"
 $BuildRoot = Join-Path $RepoRoot "bld"
 $BinRoot = Join-Path $BuildRoot "bin"