diff --git a/lib/manager/nuget/extract.js b/lib/manager/nuget/extract.js index 0f7010bc38cfad79b8231a26f23b6f5d83b5958c..d3a7153644972c92aa70ae703a5b8d91d01cd04f 100644 --- a/lib/manager/nuget/extract.js +++ b/lib/manager/nuget/extract.js @@ -22,7 +22,7 @@ function extractPackageFile(content, packageFile, config = {}) { depType: 'nuget', depName, currentValue, - lineNumber, + managerData: { lineNumber }, datasource: 'nuget', }; if (!isVersion(currentValue)) { diff --git a/lib/manager/nuget/update.js b/lib/manager/nuget/update.js index e0dc2edbc0150ea793196d346da6514964c92ea7..121c52dc68f964da8c8feec2c6dd4694255394a1 100644 --- a/lib/manager/nuget/update.js +++ b/lib/manager/nuget/update.js @@ -8,14 +8,14 @@ function updateDependency(fileContent, upgrade) { try { logger.debug(`nuget.updateDependency(): ${upgrade.newFrom}`); const lines = fileContent.split('\n'); - const lineToChange = lines[upgrade.lineNumber]; + const lineToChange = lines[upgrade.managerData.lineNumber]; const regex = /(Version\s*=\s*")([^"]+)/; const newLine = lineToChange.replace(regex, `$1${upgrade.newVersion}`); if (newLine === lineToChange) { logger.debug('No changes necessary'); return fileContent; } - lines[upgrade.lineNumber] = newLine; + lines[upgrade.managerData.lineNumber] = newLine; return lines.join('\n'); } catch (err) { logger.info({ err }, 'Error setting new Dockerfile value'); diff --git a/test/manager/nuget/__snapshots__/extract.spec.js.snap b/test/manager/nuget/__snapshots__/extract.spec.js.snap index 8928e6a1f20bd3b551eb343f93d2863313aaebac..b32d16989a5551f1b2f3eb4a35735f5fae743cf8 100644 --- a/test/manager/nuget/__snapshots__/extract.spec.js.snap +++ b/test/manager/nuget/__snapshots__/extract.spec.js.snap @@ -7,84 +7,108 @@ Array [ "datasource": "nuget", "depName": "Autofac", "depType": "nuget", - "lineNumber": 12, + "managerData": Object { + "lineNumber": 12, + }, }, Object { "currentValue": "4.1.0", "datasource": "nuget", "depName": "Autofac.Extensions.DependencyInjection", "depType": "nuget", - "lineNumber": 13, + "managerData": Object { + "lineNumber": 13, + }, }, Object { "currentValue": "1.1.2", "datasource": "nuget", "depName": "Microsoft.AspNetCore.Hosting", "depType": "nuget", - "lineNumber": 14, + "managerData": Object { + "lineNumber": 14, + }, }, Object { "currentValue": "1.1.3", "datasource": "nuget", "depName": "Microsoft.AspNetCore.Mvc.Core", "depType": "nuget", - "lineNumber": 15, + "managerData": Object { + "lineNumber": 15, + }, }, Object { "currentValue": "1.1.2", "datasource": "nuget", "depName": "Microsoft.AspNetCore.Server.Kestrel", "depType": "nuget", - "lineNumber": 16, + "managerData": Object { + "lineNumber": 16, + }, }, Object { "currentValue": "1.1.2", "datasource": "nuget", "depName": "Microsoft.Extensions.Configuration.Json", "depType": "nuget", - "lineNumber": 17, + "managerData": Object { + "lineNumber": 17, + }, }, Object { "currentValue": "1.1.2", "datasource": "nuget", "depName": "Microsoft.Extensions.Logging.Debug", "depType": "nuget", - "lineNumber": 18, + "managerData": Object { + "lineNumber": 18, + }, }, Object { "currentValue": "10.0.2", "datasource": "nuget", "depName": "Newtonsoft.Json", "depType": "nuget", - "lineNumber": 19, + "managerData": Object { + "lineNumber": 19, + }, }, Object { "currentValue": "2.4.0", "datasource": "nuget", "depName": "Serilog", "depType": "nuget", - "lineNumber": 20, + "managerData": Object { + "lineNumber": 20, + }, }, Object { "currentValue": "1.4.0", "datasource": "nuget", "depName": "Serilog.Extensions.Logging", "depType": "nuget", - "lineNumber": 21, + "managerData": Object { + "lineNumber": 21, + }, }, Object { "currentValue": "2.1.0", "datasource": "nuget", "depName": "Serilog.Sinks.Literate", "depType": "nuget", - "lineNumber": 22, + "managerData": Object { + "lineNumber": 22, + }, }, Object { "currentValue": "3.1.0.5", "datasource": "nuget", "depName": "Stateless", "depType": "nuget", - "lineNumber": 23, + "managerData": Object { + "lineNumber": 23, + }, "skipReason": "not-version", }, ] diff --git a/test/manager/nuget/update.spec.js b/test/manager/nuget/update.spec.js index 0254686b2fa006eeea2571790ff43b21f02c0896..351a11da65bb2e24e98b1b9e9052e39d3e60274a 100644 --- a/test/manager/nuget/update.spec.js +++ b/test/manager/nuget/update.spec.js @@ -10,7 +10,7 @@ describe('manager/nuget/update', () => { describe('updateDependency', () => { it('replaces existing value', () => { const upgrade = { - lineNumber: 13, + managerData: { lineNumber: 13 }, newVersion: '5.0.0', }; const res = nugetUpdater.updateDependency(csProj, upgrade); @@ -18,7 +18,7 @@ describe('manager/nuget/update', () => { }); it('keeps intact when same version', () => { const upgrade = { - lineNumber: 13, + managerData: { lineNumber: 13 }, newVersion: '4.1.0', }; const res = nugetUpdater.updateDependency(csProj, upgrade);