mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #5812 from piotrpMSFT/piotrpMSFT/infra/redistPublishFx

Browse source 
Move copying sharedfx to before publish of redist
This commit is contained in:
Piotr Puszkiewicz 2017-02-23 02:14:18 -08:00 • committed by GitHub
commit ab7cbab3bf
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build/Compile.targets
View file

@ -15,18 +15,9 @@
GetNuGetPackagesArchive;" /> GetNuGetPackagesArchive;" />
<Target Name="CompileCLI"> <Target Name="CompileCLI">
<ItemGroup>
<SharedFramework Remove="*" />
<SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
</ItemGroup>
<RemoveDir Directories="$(StageDirectory)" /> <RemoveDir Directories="$(StageDirectory)" />
<MakeDir Directories="$(StageDirectory)"/> <MakeDir Directories="$(StageDirectory)"/>
<!-- CopySharedFramework -->
<Copy SourceFiles="@(SharedFramework)"
DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
<!-- Publish DotNet --> <!-- Publish DotNet -->
<DotNetPublish ToolPath="$(Stage0Directory)" <DotNetPublish ToolPath="$(Stage0Directory)"
Configuration="$(Configuration)" Configuration="$(Configuration)"

11
src/redist/redist.csproj
View file

@ -34,6 +34,17 @@
<ProjectReference Include="..\tool_nuget\tool_nuget.csproj" /> <ProjectReference Include="..\tool_nuget\tool_nuget.csproj" />
</ItemGroup> </ItemGroup>
<Target Name="PublishSharedFramework"
BeforeTargets="Publish">
<ItemGroup>
<SharedFramework Remove="*" />
<SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
</ItemGroup>
<Copy SourceFiles="@(SharedFramework)"
DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<Target Name="GenerateCliRuntimeConfigurationFiles" <Target Name="GenerateCliRuntimeConfigurationFiles"
AfterTargets="Publish"> AfterTargets="Publish">
<RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json" <RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"