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

Fix GetArtifactInfo

This commit is contained in:
Ryan Brandenburg 2018-04-18 17:49:30 -07:00
parent 8c1064de1d
commit adccac3591
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/repo.targets
View File

@ -30,10 +30,16 @@
</Target> </Target>
<Target Name="ResolveRepoInfo" DependsOnTargets="_PrepareRepositories"> <Target Name="ResolveRepoInfo" DependsOnTargets="_PrepareRepositories">
<!-- We need to pass the NETCoreApp package versions to msbuild so that it doesn't complain about us using a different one than it was restored against. -->
<PropertyGroup>
<DesignTimeBuildProps>MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);</DesignTimeBuildProps>
<DesignTimeBuildProps>$(DesignTimeBuildProps);MicrosoftNETCoreApp21PackageVersion=$(MicrosoftNETCoreApp21PackageVersion);</DesignTimeBuildProps>
<DesignTimeBuildProps>$(DesignTimeBuildProps);MicrosoftNETCoreApp20PackageVersion=$(MicrosoftNETCoreApp20PackageVersion);</DesignTimeBuildProps>
</PropertyGroup>
<MSBuild Projects="$(MSBuildProjectFullPath)" <MSBuild Projects="$(MSBuildProjectFullPath)"
Targets="GetArtifactInfo" Targets="GetArtifactInfo"
Properties="RepositoryRoot=%(Repository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber);DesignTimeBuild=true" Properties="$(DesignTimeBuildProps);RepositoryRoot=%(Repository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber);DesignTimeBuild=true"
ContinueOnError="WarnAndContinue"> ContinueOnError="WarnAndContinue">
<Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" /> <Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
</MSBuild> </MSBuild>
@ -52,7 +58,7 @@
--> -->
<MSBuild Projects="$(MSBuildProjectFullPath)" <MSBuild Projects="$(MSBuildProjectFullPath)"
Targets="GetArtifactInfo" Targets="GetArtifactInfo"
Properties="RepositoryRoot=%(ShippedRepository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber);IsFinalBuild=true;DesignTimeBuild=true" Properties="$(DesignTimeBuildProps);RepositoryRoot=%(ShippedRepository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber);IsFinalBuild=true;DesignTimeBuild=true"
ContinueOnError="WarnAndContinue" ContinueOnError="WarnAndContinue"
Condition="'%(ShippedRepository.Identity)' != ''"> Condition="'%(ShippedRepository.Identity)' != ''">
<Output TaskParameter="TargetOutputs" ItemName="ShippedArtifactInfo" /> <Output TaskParameter="TargetOutputs" ItemName="ShippedArtifactInfo" />