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

Include rid-specific runtime packages in the list of artifacts

This commit is contained in:
Nate McMaster 2018-10-25 14:42:00 -07:00
parent 77a3089c8d
commit ae122d9bc0
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/SharedFx.props
View File

@ -1,5 +1,9 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<SharedFxRid Condition=" '$(SharedFxRid)' == '' AND $([MSBuild]::IsOSPlatform('Windows'))">win-x64</SharedFxRid>
<SharedFxRid Condition=" '$(SharedFxRid)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">osx-x64</SharedFxRid>
<SharedFxRid Condition=" '$(SharedFxRid)' == '' AND $([MSBuild]::IsOSPlatform('Linux'))">linux-x64</SharedFxRid>
<!-- directories --> <!-- directories -->
<_WorkRoot>$(RepositoryRoot).w\$(SharedFxRID)\</_WorkRoot> <_WorkRoot>$(RepositoryRoot).w\$(SharedFxRID)\</_WorkRoot>
<_WorkLayoutDir>$(_WorkRoot).l\</_WorkLayoutDir> <_WorkLayoutDir>$(_WorkRoot).l\</_WorkLayoutDir>

2
build/artifacts.props
View File

@ -24,6 +24,8 @@
<PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" /> <PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.All" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.All" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.App" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.App" Category="ship" />
<PackageArtifact Include="runtime.$(SharedFxRid).Microsoft.AspNetCore.All" Category="noship" />
<PackageArtifact Include="runtime.$(SharedFxRid).Microsoft.AspNetCore.App" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModule" Category="noship" Condition=" '$(OS)' == 'Windows_NT' " /> <PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModule" Category="noship" Condition=" '$(OS)' == 'Windows_NT' " />

11
src/Framework/Directory.Build.targets
View File

@ -25,4 +25,15 @@
</NuspecProperties> </NuspecProperties>
</PropertyGroup> </PropertyGroup>
</Target> </Target>
<Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)">
<ItemGroup Condition=" '$(IsPackable)' == 'true' AND '$(PackageId)' != '' ">
<ArtifactInfo Include="$(TargetPath)">
<ArtifactType>NuGetPackage</ArtifactType>
<PackageId>$(PackageId)</PackageId>
<Version>$(PackageVersion)</Version>
</ArtifactInfo>
</ItemGroup>
</Target>
</Project> </Project>

10
src/Framework/Metapackage.targets
View File

@ -43,16 +43,6 @@
</ItemGroup> </ItemGroup>
</Target> </Target>
<Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)">
<ItemGroup Condition=" '$(IsPackable)' == 'true' AND '$(PackageId)' != '' ">
<ArtifactInfo Include="$(TargetPath)">
<ArtifactType>NuGetPackage</ArtifactType>
<PackageId>$(PackageId)</PackageId>
<Version>$(PackageVersion)</Version>
</ArtifactInfo>
</ItemGroup>
</Target>
<Target Name="CopyFilesToOutputDirectory" /> <Target Name="CopyFilesToOutputDirectory" />
<Target Name="CoreCompile" /> <Target Name="CoreCompile" />
<Target Name="CreateManifestResourceNames" /> <Target Name="CreateManifestResourceNames" />