diff --git a/eng/config/PublishData.json b/eng/config/PublishData.json index 29cdd9c2330..f87ed636cce 100644 --- a/eng/config/PublishData.json +++ b/eng/config/PublishData.json @@ -21,15 +21,13 @@ "Microsoft.VisualStudioCode.RazorExtension": "vs-impl" } }, - "branches": { - "main": { - "nugetKind": [ - "Shipping", - "NonShipping" - ], - "vsBranch": "main", - "insertionCreateDraftPR": false, - "insertionTitlePrefix": "[InsidersVNext]" - } + "branchInfo": { + "nugetKind": [ + "Shipping", + "NonShipping" + ], + "vsBranch": "main", + "insertionCreateDraftPR": false, + "insertionTitlePrefix": "[InsidersVNext]" } } diff --git a/eng/pipelines/insert.yml b/eng/pipelines/insert.yml index 7e7c6bd3178..d1f47a9449f 100644 --- a/eng/pipelines/insert.yml +++ b/eng/pipelines/insert.yml @@ -57,14 +57,7 @@ steps: $authorization = if ("" -ne $Env:PublishDataAccessToken) { "Bearer $Env:PublishDataAccessToken" } else { "" } $response = Invoke-RestMethod -Headers @{Authorization = $authorization} "${{ parameters.publishDataURI }}" $branchName = "${{ parameters.sourceBranch }}" - $branchData = $response.branches.$branchName - if (!$branchData) - { - Write-Host "No PublishData found for branch '$branchName'. Using PublishData for branch 'main' with draft PR status." - $branchData = $response.branches.main - $branchData.insertionCreateDraftPR = 'true' - $branchData.insertionTitlePrefix = '[PR Validation]' - } + $branchData = $response.branchInfo # Set our template variables to reasonable defaults Write-Host "##vso[task.setvariable variable=Template.CreateDraftPR]$($true)"