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

Remove duplicated assemblies from .All shared framework

This commit is contained in:
John Luo 2018-01-22 20:01:15 -08:00
parent 3b7015f344
commit cc3c24417c
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/SharedFx.props
View File

@ -17,6 +17,12 @@
<PathSeparator Condition="'$(PathSeparator)' == ''">:</PathSeparator> <PathSeparator Condition="'$(PathSeparator)' == ''">:</PathSeparator>
<PathSeparator Condition="$(SharedFxRID.StartsWith('win'))">%3B</PathSeparator> <PathSeparator Condition="$(SharedFxRID.StartsWith('win'))">%3B</PathSeparator>
<LibPrefix Condition="$([MSBuild]::IsOSPlatform('Linux')) OR $([MSBuild]::IsOSPlatform('OSX'))">lib</LibPrefix>
<LibExtension>.so</LibExtension>
<LibExtension Condition="$([MSBuild]::IsOSPlatform('Windows'))">.dll</LibExtension>
<LibExtension Condition="$([MSBuild]::IsOSPlatform('OSX'))">.dylib</LibExtension>
<ExeExtension Condition="$([MSBuild]::IsOSPlatform('Windows'))">.exe</ExeExtension>
<!-- installers --> <!-- installers -->
<SharedFxInstallerName>aspnetcore-runtime</SharedFxInstallerName> <SharedFxInstallerName>aspnetcore-runtime</SharedFxInstallerName>
<!-- <!--
@ -24,9 +30,7 @@
Subsequent build steps will combine this with Microsoft.NETCore.App and produce final tarballs/zips. Subsequent build steps will combine this with Microsoft.NETCore.App and produce final tarballs/zips.
--> -->
<SharedFxIntermediateArchiveBaseName>$(SharedFxInstallerName)-internal</SharedFxIntermediateArchiveBaseName> <SharedFxIntermediateArchiveBaseName>$(SharedFxInstallerName)-internal</SharedFxIntermediateArchiveBaseName>
<DebConfigInFile>$(_PackagingDir)debian_config.json.in</DebConfigInFile> <DebConfigInFile>$(_PackagingDir)debian_config.json.in</DebConfigInFile>
<PublicCoreFeedPrefix>https://dotnetcli.blob.core.windows.net/dotnet/</PublicCoreFeedPrefix> <PublicCoreFeedPrefix>https://dotnetcli.blob.core.windows.net/dotnet/</PublicCoreFeedPrefix>
<!-- In an orchestrated build, this may be overriden to other Azure feeds. --> <!-- In an orchestrated build, this may be overriden to other Azure feeds. -->

16
build/SharedFx.targets
View File

@ -132,13 +132,13 @@
<Target Name="PrepareForSharedFx" DependsOnTargets="DefineSharedFxPrerequisites;ResolveCommitHash"> <Target Name="PrepareForSharedFx" DependsOnTargets="DefineSharedFxPrerequisites;ResolveCommitHash">
<PropertyGroup> <PropertyGroup>
<AppSharedFxProps>SharedFxWorkDirectory=$(AppSharedFxWorkDirectory)</AppSharedFxProps> <AppSharedFxProps>SharedFxWorkDirectory=$(AppSharedFxWorkDirectory)</AppSharedFxProps>
<AppSharedFxProps>$(AppSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp21PackageVersion)</AppSharedFxProps>
<AppSharedFxProps>$(AppSharedFxProps);SharedFxPackage=Microsoft.AspNetCore.App</AppSharedFxProps> <AppSharedFxProps>$(AppSharedFxProps);SharedFxPackage=Microsoft.AspNetCore.App</AppSharedFxProps>
<AppSharedFxProps>$(AppSharedFxProps);SharedFxBase=Microsoft.NETCore.App</AppSharedFxProps>
<AppSharedFxProps>$(AppSharedFxProps);SharedFxBaseVersion=$(MicrosoftNETCoreApp21PackageVersion)</AppSharedFxProps>
<AllSharedFxProps>SharedFxWorkDirectory=$(AllSharedFxWorkDirectory)</AllSharedFxProps> <AllSharedFxProps>SharedFxWorkDirectory=$(AllSharedFxWorkDirectory)</AllSharedFxProps>
<AllSharedFxProps>$(AllSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp21PackageVersion)</AllSharedFxProps>
<AllSharedFxProps>$(AllSharedFxProps);SharedFxPackage=Microsoft.AspNetCore.All</AllSharedFxProps> <AllSharedFxProps>$(AllSharedFxProps);SharedFxPackage=Microsoft.AspNetCore.All</AllSharedFxProps>
<AllSharedFxProps>$(AllSharedFxProps);SharedFxBase=Microsoft.AspNetCore.App</AllSharedFxProps> <AllSharedFxProps>$(AllSharedFxProps);SharedFxDep=Microsoft.AspNetCore.App</AllSharedFxProps>
<AllSharedFxProps>$(AllSharedFxProps);SharedFxBaseVersion=$(PackageVersion)</AllSharedFxProps> <AllSharedFxProps>$(AllSharedFxProps);SharedFxDepVersion=$(PackageVersion)</AllSharedFxProps>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -169,6 +169,9 @@
<ToDelete Include="$(SharedFxPublishDirectory)\SharedFx" /> <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx" />
<ToDelete Include="$(SharedFxPublishDirectory)\SharedFx.dll" /> <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx.dll" />
<ToDelete Include="$(SharedFxPublishDirectory)\SharedFx.pdb" /> <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx.pdb" />
<ToDelete Include="$(SharedFxPublishDirectory)\apphost$(ExeExtension)" />
<ToDelete Include="$(SharedFxPublishDirectory)\$(LibPrefix)hostfxr$(LibExtension)" />
<ToDelete Include="$(SharedFxPublishDirectory)\$(LibPrefix)hostpolicy$(LibExtension)" />
</ItemGroup> </ItemGroup>
<Delete Files="@(ToDelete)" /> <Delete Files="@(ToDelete)" />
@ -225,11 +228,6 @@
<RuntimePackageName>Microsoft.NETCore.App</RuntimePackageName> <RuntimePackageName>Microsoft.NETCore.App</RuntimePackageName>
<CrossGenTool>crossgen</CrossGenTool> <CrossGenTool>crossgen</CrossGenTool>
<CrossGenTool Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(CrossGenTool).exe</CrossGenTool> <CrossGenTool Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(CrossGenTool).exe</CrossGenTool>
<LibPrefix Condition="$([MSBuild]::IsOSPlatform('Linux')) OR $([MSBuild]::IsOSPlatform('OSX'))">lib</LibPrefix>
<LibExtension>.so</LibExtension>
<LibExtension Condition="$([MSBuild]::IsOSPlatform('Windows'))">.dll</LibExtension>
<LibExtension Condition="$([MSBuild]::IsOSPlatform('OSX'))">.dylib</LibExtension>
</PropertyGroup> </PropertyGroup>
<!-- Determine runtime location (via .App shared framework) --> <!-- Determine runtime location (via .App shared framework) -->

3
build/tools/templates/SharedFx/SharedFx.csproj
View File

@ -21,7 +21,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="$(SharedFxPackage)" Version="$(SharedFxPackageVersion)" ExcludeAssets="Build" /> <PackageReference Include="$(SharedFxPackage)" Version="$(SharedFxPackageVersion)" ExcludeAssets="Build" />
<PackageReference Include="$(SharedFxBase)" Version="$(SharedFxBaseVersion)"/> <PackageReference Include="$(SharedFxDep)" Version="$(SharedFxDepVersion)" Condition="'$(SharedFxDep)' != ''"/>
<PackageReference Include="Microsoft.NETCore.App" Version="$(RuntimeFrameworkVersion)"/>
</ItemGroup> </ItemGroup>
<Target Name="GetPackageDefinitions" Returns="@(_PackageDefinitions)"> <Target Name="GetPackageDefinitions" Returns="@(_PackageDefinitions)">