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

Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-04-09 09:54:00 -07:00
parent 7575e60278 6c79085b10
commit 68a122b16c
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/Publish.targets
View File

@ -199,7 +199,6 @@
<Run FileName="npm" <Run FileName="npm"
Arguments="publish;--registry;$(PublishMyGetNpmRegistryUrl);%(NpmPackageToPublish.Identity)" Arguments="publish;--registry;$(PublishMyGetNpmRegistryUrl);%(NpmPackageToPublish.Identity)"
MaxRetries="5" MaxRetries="5"
UseShellExecute="true"
ContinueOnError="true"> ContinueOnError="true">
<Output TaskParameter="ExitCode" ItemName="_NpmExitCodes" /> <Output TaskParameter="ExitCode" ItemName="_NpmExitCodes" />
</Run> </Run>

6
build/repo.targets
View File

@ -77,10 +77,10 @@
<Target Name="GetLineupPackageInfo"> <Target Name="GetLineupPackageInfo">
<ItemGroup> <ItemGroup>
<ArtifactInfo Include="$(BuildDir)Internal.AspNetCore.Universe.Lineup.$(Version).nupkg"> <ArtifactInfo Include="$(BuildDir)Internal.AspNetCore.Universe.Lineup.$(PackageVersion).nupkg">
<ArtifactType>NuGetPackage</ArtifactType> <ArtifactType>NuGetPackage</ArtifactType>
<PackageId>Internal.AspNetCore.Universe.Lineup</PackageId> <PackageId>Internal.AspNetCore.Universe.Lineup</PackageId>
<Version>$(Version)</Version> <Version>$(PackageVersion)</Version>
<Category>noship</Category> <Category>noship</Category>
<IsLineup>true</IsLineup> <IsLineup>true</IsLineup>
</ArtifactInfo> </ArtifactInfo>
@ -110,7 +110,7 @@
<PackNuSpec NuSpecPath="$(MSBuildThisFileDirectory)lineups\Internal.AspNetCore.Universe.Lineup.nuspec" <PackNuSpec NuSpecPath="$(MSBuildThisFileDirectory)lineups\Internal.AspNetCore.Universe.Lineup.nuspec"
DestinationFolder="$(BuildDir)" DestinationFolder="$(BuildDir)"
Overwrite="true" Overwrite="true"
Properties="version=$(Version);dependenciesPropsFile=$(GeneratedPackageVersionPropsPath)"> Properties="version=$(PackageVersion);dependenciesPropsFile=$(GeneratedPackageVersionPropsPath)">
<Output TaskParameter="Packages" ItemName="LineupPackage" /> <Output TaskParameter="Packages" ItemName="LineupPackage" />
</PackNuSpec> </PackNuSpec>
</Target> </Target>