Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Fix update versions logic #26768

Merged
merged 2 commits into from
Sep 18, 2019
Merged

Fix update versions logic #26768

merged 2 commits into from
Sep 18, 2019

Conversation

sbomer
Copy link
Member

@sbomer sbomer commented Sep 18, 2019

After #26108, this was broken
because the Tools.proj was never restored on the agent running the
finalize-publish job. This fixes the script to do a restore, and adds
a missing import.

@dotnet/coreclr-infra PTAL

After dotnet#26108, this was broken
because the Tools.proj was never restored on the agent running the
finalize-publish job. This fixes the script to do a restore, and adds
a missing import.
/p:UsePartialNGENOptimization=false `
/maxcpucount `
"$PSScriptRoot\eng\updateversions.proj" /t:UpdatePublishedVersions `
& "$PSScriptRoot\eng\common\build.ps1" -restore -build `
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this script doesn't have to do build tools initialization now, is there a reason for us to still have a separate script instead of just having the step in yml call build.ps1 directly?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also pass -ci? Considering this is mean only for use in the pipeline?

@@ -6,6 +6,10 @@

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<Import Project="$(NuGetPackageRoot)\microsoft.dotnet.versiontools.tasks\$(MicrosoftDotNetVersionToolsTasksPackageVersion)\build\Microsoft.DotNet.VersionTools.Tasks.props" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need to add Microsoft.DotNet.VersionTools.Tasks as a repo dependency for auto-updates? (I don't see it in Version.Details.xml)

/p:UsePartialNGENOptimization=false `
/maxcpucount `
"$PSScriptRoot\eng\updateversions.proj" /t:UpdatePublishedVersions `
& "$PSScriptRoot\eng\common\build.ps1" -restore -build `
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also pass -ci? Considering this is mean only for use in the pipeline?

@sbomer sbomer merged commit 9be00be into dotnet:master Sep 18, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants