Skip to content

Commit c68bd26

Browse files
Updated the courtesy push PR changes AB#2256850 (#20901)
1 parent fa63835 commit c68bd26

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ci/courtesy-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ steps:
3838
git checkout -b $releaseBranch
3939
git config --global user.email "$(username)@microsoft.com"
4040
git config --global user.name "$(username)"
41-
git add .nuget\externals\UnifiedDependencies.xml
41+
git add Directory.Packages.props
4242
git add Tfs\Service\Deploy\components\*
4343
git commit -m "Courtesy bump of tasks"
4444
git push origin $releaseBranch --force

ci/courtesy-push/courtesy-push.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const xml2js = require('xml2js');
44

55
const azureSourceFolder = process.argv[2];
66
const newDeps = process.argv[3];
7-
const unifiedDepsPath = path.join(azureSourceFolder, '.nuget', 'externals', 'UnifiedDependencies.xml');
7+
const unifiedDepsPath = path.join(azureSourceFolder, 'Directory.Packages.props');
88
const tfsServerPath = path.join(azureSourceFolder, 'Tfs', 'Service', 'Deploy', 'components', 'TfsServer.hosted.xml');
99
const msPrefix = 'Mseng.MS.TF.DistributedTask.Tasks.';
1010

@@ -40,7 +40,7 @@ function formDirectoryTag(nugetTaskName) {
4040
async function extractDependency(xmlDependencyString) {
4141
try {
4242
var details = await xml2js.parseStringPromise(xmlDependencyString);
43-
return [ details.package.$.id, details.package.$.version ];
43+
return [ details.PackageVersion.$.Include, details.PackageVersion.$.Version ];
4444
} catch {
4545
return [ null, null ];
4646
}

make-util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,7 @@ var createNugetPackagePerTask = function (packagePath, /*nonAggregatedLayoutPath
13791379
}
13801380
}
13811381
// Create xml entry for UnifiedDependencies
1382-
unifiedDepsContent.push(` <package id="${fullTaskName}" version="${taskVersion}" availableAtDeployTime="true" />`);
1382+
unifiedDepsContent.push(` <PackageVersion Include="${fullTaskName}" Version="${taskVersion}" AvailableAtDeployTime="true" />`);
13831383

13841384
// Create xml entry that we need to configure servicing file
13851385
servicingXmlContent.push(getServicingXmlContent(taskFolderName, fullTaskName, taskVersion));

0 commit comments

Comments
 (0)