huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix publishing targets to correctly reference the right item group: NpmPackageToPublish

This commit is contained in:
Nate McMaster 2018-08-17 15:18:18 -07:00
parent 74cba2ff5f
commit 5bae8c768d
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/Publish.targets
View File

@ -193,7 +193,7 @@
<Error Text="Missing required property: PublishMyGetNpmRegistryUrl" Condition=" '$(PublishMyGetNpmRegistryUrl)' == '' "/> <Error Text="Missing required property: PublishMyGetNpmRegistryUrl" Condition=" '$(PublishMyGetNpmRegistryUrl)' == '' "/>
<Error Text="Missing required property: PublishMyGetFeedKey" Condition=" '$(PublishMyGetFeedKey)' == '' "/> <Error Text="Missing required property: PublishMyGetFeedKey" Condition=" '$(PublishMyGetFeedKey)' == '' "/>
<Error Message="No packages found to publish" Condition="@(PackageToPublish->Count()) == 0" /> <Error Text="No packages found to publish" Condition="@(PackageToPublish->Count()) == 0" />
<PushNuGetPackages Condition="'%(PackageToPublish.IsSymbolsPackage)' != 'true' AND @(PackageToPublish->Count()) != 0" <PushNuGetPackages Condition="'%(PackageToPublish.IsSymbolsPackage)' != 'true' AND @(PackageToPublish->Count()) != 0"
Packages="@(PackageToPublish)" Packages="@(PackageToPublish)"
@ -209,12 +209,16 @@
<AuthTokenSetting>$(PublishMyGetNpmRegistryUrl.Replace("https:", "")):_authToken</AuthTokenSetting> <AuthTokenSetting>$(PublishMyGetNpmRegistryUrl.Replace("https:", "")):_authToken</AuthTokenSetting>
</PropertyGroup> </PropertyGroup>
<Exec Condition=" '$(ContainsNpmPackageToPublish)' == 'true' " <Message Condition=" @(NpmPackageToPublish->Count()) != 0 "
Text="Skipping NPM publish because there are no npm packages to publish."
Importance="high" />
<Exec Condition=" @(NpmPackageToPublish->Count()) != 0 "
Command="npm config set &quot;$(AuthTokenSetting)&quot; $(PublishMyGetFeedKey)" Command="npm config set &quot;$(AuthTokenSetting)&quot; $(PublishMyGetFeedKey)"
StandardOutputImportance="Normal" /> StandardOutputImportance="Normal" />
<!-- When you UseCommandProcessor FileName is ignored --> <!-- When you UseCommandProcessor FileName is ignored -->
<Run Condition=" @(PackageToPublish->Count()) != 0 " <Run Condition=" @(NpmPackageToPublish->Count()) != 0 "
FileName="cmd" FileName="cmd"
Arguments="npm;publish;--registry;$(PublishMyGetNpmRegistryUrl);%(NpmPackageToPublish.Identity)" Arguments="npm;publish;--registry;$(PublishMyGetNpmRegistryUrl);%(NpmPackageToPublish.Identity)"
MaxRetries="5" MaxRetries="5"
@ -223,11 +227,11 @@
<Output TaskParameter="ExitCode" ItemName="_NpmExitCodes" /> <Output TaskParameter="ExitCode" ItemName="_NpmExitCodes" />
</Run> </Run>
<Exec Condition=" @(PackageToPublish->Count()) != 0 " <Exec Condition=" @(NpmPackageToPublish->Count()) != 0 "
Command="npm config delete $(AuthTokenSetting)" Command="npm config delete $(AuthTokenSetting)"
StandardOutputImportance="Normal" /> StandardOutputImportance="Normal" />
<Error Text="Publishing npm modules failed" Condition=" @(PackageToPublish->Count()) != 0 AND %(_NpmExitCodes.Identity) != 0" /> <Error Text="Publishing npm modules failed" Condition=" @(NpmPackageToPublish->Count()) != 0 AND %(_NpmExitCodes.Identity) != 0" />
</Target> </Target>
<Target Name="PublishToAzureFeed" <Target Name="PublishToAzureFeed"