Skip to content

Commit 17ba50c

Browse files
authored
[release/2.1] Fixup NPM package versioning (#30164)
- `_Pack` target failing in ProdCon builds - fortunately problem is specific to non-`IsFinalBuild` builds - don't add the version metadata because that's not written into package.lock - e.g. looking for aspnet-signalr-protocol-msgpack-1.0.26-servicing-20210212.12+pb-20210212-02.tgz - but `npm pack` actually wrote aspnet-signalr-protocol-msgpack-1.0.26-servicing-20210212.12.tgz - see https://dnceng.visualstudio.com/internal/_build/results?buildId=992921&view=logs&j=f31c9f97-4411-58e7-49ac-fc73f645e6b6&t=2bcaa12b-2f4b-5b1f-c519-10308f653190&l=3190
1 parent cea1fe3 commit 17ba50c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

version.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
<ExperimentalPackageVersion Condition=" '$(IncludePreReleaseLabelInPackageVersion)' == 'true' ">$(ExperimentalVersionPrefix)-$(VersionSuffix)</ExperimentalPackageVersion>
4040

4141
<VersionMetadata Condition=" '$(DotNetProductBuildId)' != '' ">pb-$(DotNetProductBuildId)</VersionMetadata>
42-
<VersionSuffix Condition=" '$(VersionMetadata)' != '' ">$(VersionSuffix)+$(VersionMetadata)</VersionSuffix>
42+
43+
<!-- `npm` will truncate the '+' and everything after when updating project.json. Condition avoids _Pack failures. -->
44+
<VersionSuffix Condition=" '$(VersionMetadata)' != '' AND '$(MSBuildProjectExtension)' != '.npmproj' ">$(VersionSuffix)+$(VersionMetadata)</VersionSuffix>
4345

4446
<SharedFxCliBlobChannel>release/$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</SharedFxCliBlobChannel>
4547

0 commit comments

Comments
 (0)