Fix VersionSuffix for the managed projects [master] #2637
Conversation
| <!-- Task from buildtools that uses lockfiles to validate that packages restored are exactly what were specified. --> | ||
| <UsingTask TaskName="ValidateExactRestore" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" /> | ||
|
|
||
| <Target Name="ValidateExactRestore" |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
src/managed/CommonManaged.props
Outdated
| @@ -17,6 +34,21 @@ | |||
| <PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile> | |||
| </PropertyGroup> | |||
|
|
|||
| <PropertyGroup Condition="'$(StabilizePackageVersion)' != 'true'"> | |||
| <!-- Dev builds get a minor version, by default, of '0'. Our tests restore packages with | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
src/managed/CommonManaged.props
Outdated
| @@ -5,7 +5,24 @@ | |||
|
|
|||
| <PropertyGroup> | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
eerhardt
force-pushed
the
FixVersionSuffixMaster
branch
from
4bd9859 to
53e8088
Compare
VersionSuffix is getting set before $(BuildNumberMajor) and $(BuildNumberMinor) are being set. When creating the DependencyModel nupkg, it is getting a bad version on its p2p reference to PlatformAbstractions. The fix is to ensure VersionSuffix is defined correctly in the projects themselves - after the obj\BuildVersion.props file is created. Workaround NuGet/Home#4337
Also remove the dev machine BuildNumberMinor workaround per PR feedback, as this is no longer necessary.
eerhardt
force-pushed
the
FixVersionSuffixMaster
branch
from
53e8088 to
b59facb
Compare
|
@weshaggard @chcosta - FYI I plan on merging this change today. Please let me know if you have remaining feedback. |
| <BuildVersionFile Condition="'$(BuildVersionFile)'==''">$(ObjDir)BuildVersion-$(TodayTimeStamp).props</BuildVersionFile> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Condition="Exists('$(BuildVersionFile)')" Project="$(BuildVersionFile)" /> |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
ghost
mentioned this pull request
VersionSuffix is getting set before$(BuildNumberMajor) and $ (BuildNumberMinor) are being set. When creating the DependencyModel nupkg, it is getting a bad version on its p2p reference to PlatformAbstractions.
The fix is to ensure VersionSuffix is defined correctly in the projects themselves - after the obj\BuildVersion.props file is created.
Workaround NuGet/Home#4337