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

Move copying sharedfx to before publish of redist

Browse source
This commit is contained in:
Piotr Puszkiewicz 2017-02-23 01:12:32 -08:00
parent 27f89d6b7b
commit 7818348fc2
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;" />
<Target Name="CompileCLI">
<ItemGroup>
<SharedFramework Remove="*" />
<SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
</ItemGroup>
<RemoveDir Directories="$(StageDirectory)" />
<MakeDir Directories="$(StageDirectory)"/>
<!-- CopySharedFramework -->
<Copy SourceFiles="@(SharedFramework)"
DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
<!-- Publish DotNet -->
<DotNetPublish ToolPath="$(Stage0Directory)"
Configuration="$(Configuration)"

11
src/redist/redist.csproj
View file

@ -34,6 +34,17 @@
<ProjectReference Include="..\tool_nuget\tool_nuget.csproj" />
</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"
AfterTargets="Publish">
<RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"