Merge pull request #15086 from dependabot/dev/brettfo/nuget-global-json-whitespace

handle errant whitespace in global.json

Author: brettfo

nuget/updater/common.ps1

@@ -17,7 +17,7 @@ function Get-SdkVersionsToInstall([string] $repoRoot, [string[]] $updateDirector
     foreach ($globalJsonPath in $globalJsonPaths) {
         $resolvedGlobalJsonPath = Convert-Path "$repoRoot/$globalJsonPath"
         Write-LogMessage "  Processing $globalJsonPath (resolved to $resolvedGlobalJsonPath) for SDK version information"
-        $globalJson = Get-Content $resolvedGlobalJsonPath | ConvertFrom-Json
+        $globalJson = Get-Content $resolvedGlobalJsonPath -Raw | ConvertFrom-Json
         if (@($globalJson.PSobject.Properties).Count -eq 0) {
             Write-LogMessage "    No properties found in $globalJsonPath, skipping"
             continue

nuget/updater/test-data/global-json-whitespace/leading-comment/global.json

@@ -0,0 +1,6 @@
+// this is a leading comment
+{
+    "sdk": {
+        "version": "1.2.3-leading-comment"
+    }
+}

nuget/updater/test-data/global-json-whitespace/leading-newline/global.json

@@ -0,0 +1,6 @@
+
+{
+    "sdk": {
+        "version": "1.2.3-leading-newline"
+    }
+}

nuget/updater/test-data/global-json-whitespace/leading-whitespace/global.json

@@ -0,0 +1,5 @@
+        {
+    "sdk": {
+        "version": "1.2.3-leading-whitespace"
+    }
+}

nuget/updater/test.ps1

@@ -3,6 +3,9 @@ $ErrorActionPreference = "Stop"
 
 . $PSScriptRoot\common.ps1
 
+# uncomment line to enable detailed test logging
+#$env:DEPENDABOT_LOG_MESSAGES = "true"
+
 function Assert-ArraysEqual([string[]]$expected, [string[]]$actual) {
     $expectedText = $expected -join ", "
     $actualText = $actual -join ", "
@@ -102,6 +105,12 @@ try {
         -installedSdks @("8.0.404") `
         -expectedSdksToInstall @("9.0")
 
+    Test-GlobalJsonVersions `
+        -testDirectory "global-json-whitespace" `
+        -directories @("/leading-comment", "/leading-newline", "/leading-whitespace") `
+        -installedSdks @("8.0.404") `
+        -expectedSdksToInstall @("1.2.3-leading-comment", "1.2.3-leading-newline", "1.2.3-leading-whitespace")
+
     Test-RequiredTargetingPacks `
         -testDirectory "targeting-packs" `
         -expectedTargetingPacks @("Some.Targeting.Pack.Ref/1.0.1", "Some.Other.Targeting.Pack.Ref/1.0.2", "Some.Targeting.Pack.Ref/4.0.1", "Some.Other.Targeting.Pack.Ref/4.0.2")