Skip to content

Add Incremental publishing #3957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 13, 2019
+394 −1
Merged

Add Incremental publishing #3957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68ba80d
Adding first test and basic structure for incremental publish
sfoslund Nov 21, 2019
9460d2f
Expanding tests for incremental publishing, adding single file support
sfoslund Nov 22, 2019
bee4ae0
Fixing PR feedback for incremental publishing
sfoslund Nov 25, 2019
7b8596d
Updating for incremental publishing PR feedback, fixing casing on tes…
sfoslund Nov 26, 2019
17bb9a9
PR feedback: updating Condition for including executable in increment…
sfoslund Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 86 additions & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,93 @@ Copyright (c) .NET Foundation. All rights reserved.
============================================================
-->
<Target Name="CopyFilesToPublishDirectory"
DependsOnTargets="_CopyResolvedFilesToPublishPreserveNewest;
DependsOnTargets="_IncrementalCleanPublishDirectory;
_CopyResolvedFilesToPublishPreserveNewest;
_CopyResolvedFilesToPublishAlways" />

<!--
============================================================
_IncrementalCleanPublishDirectory

Remove files that were produced in a prior publish but weren't produced in the current publish.
============================================================
-->
<Target Name="_IncrementalCleanPublishDirectory"
DependsOnTargets="_GetCurrentAndPriorPublishFileWrites">

<!-- Subtract list of files produced in the prior publish from list of files produced in this publish. -->
<ItemGroup>
<_OrphanPublishFileWrites Include="@(_PriorPublishFileWrites)" Exclude="@(_CurrentPublishFileWrites)"/>
</ItemGroup>

<!-- Delete the orphaned files. -->
<Delete
Files="@(_OrphanPublishFileWrites)"
TreatErrorsAsWarnings="true">
<Output TaskParameter="DeletedFiles" ItemName="_OrphanFilesDeleted"/>
</Delete>

<!-- Write new list of current files back to clean file. -->
<WriteLinesToFile
File="$(IntermediateOutputPath)$(_PublishCleanFile)"
Lines="@(_CurrentPublishFileWrites)"
Overwrite="true"/>
</Target>

<!--
============================================================
_GetCurrentAndPriorPublishFileWrites
Get the list of files written in the previous publish and the list of files to be written in this publish.
============================================================
-->
<Target Name="_GetCurrentAndPriorPublishFileWrites" >
<PropertyGroup>
<_NormalizedPublishDir>$([MSBuild]::NormalizeDirectory($(PublishDir)))</_NormalizedPublishDir>
</PropertyGroup>

<Hash ItemstoHash="$(_NormalizedPublishDir)">
<Output TaskParameter="HashResult" PropertyName="_NormalizedPublishDirHash" />
</Hash>
<PropertyGroup>
<_PublishCleanFile Condition="'$(PublishCleanFile)'==''">PublishOutputs.$(_NormalizedPublishDirHash.Substring(0, 10)).txt</_PublishCleanFile>
</PropertyGroup>

<!-- Read in writes made by prior publish. -->
<ReadLinesFromFile File="$(IntermediateOutputPath)$(_PublishCleanFile)">
<Output TaskParameter="Lines" ItemName="_UnfilteredPriorPublishFileWrites"/>
</ReadLinesFromFile>

<ConvertToAbsolutePath Paths="@(_UnfilteredPriorPublishFileWrites)">
<Output TaskParameter="AbsolutePaths" ItemName="_UnfilteredAbsolutePriorPublishFileWrites"/>
</ConvertToAbsolutePath>

<!-- Find all files in the final output directory. -->
<FindUnderPath Path="$(_NormalizedPublishDir)" Files="@(_UnfilteredAbsolutePriorPublishFileWrites)" UpdateToAbsolutePaths="true">
<Output TaskParameter="InPath" ItemName="_PriorPublishFileWritesInOuput"/>
</FindUnderPath>

<!-- Remove duplicates from files produced in the previous publish. -->
<RemoveDuplicates Inputs="@(_PriorPublishFileWritesInOuput)" >
<Output TaskParameter="Filtered" ItemName="_PriorPublishFileWrites"/>
</RemoveDuplicates>

<ItemGroup>
<_CurrentPublishFileWritesUnfiltered Include="@(ResolvedFileToPublish->'$(_NormalizedPublishDir)%(RelativePath)')" Condition="'$(PublishSingleFile)' != 'true'"/>
<_CurrentPublishFileWritesUnfiltered Include="@(ResolvedFileToPublish->'$(_NormalizedPublishDir)%(RelativePath)')"
Condition="'$(PublishSingleFile)' == 'true' And '%(ResolvedFileToPublish.ExcludeFromSingleFile)' == 'true'"/>
<_CurrentPublishFileWritesUnfiltered Include="$(_NormalizedPublishDir)$(AssemblyName)$(_NativeExecutableExtension)" Condition="'$(UseAppHost)' == 'true'"/>
<_CurrentPublishFileWritesUnfiltered Include="$(_NormalizedPublishDir)$(ProjectDepsFileName)" Condition="'$(GenerateDependencyFile)' == 'true' And '$(PublishSingleFile)' != 'true'"/>
</ItemGroup>

<ConvertToAbsolutePath Paths="@(_CurrentPublishFileWritesUnfiltered)">
<Output TaskParameter="AbsolutePaths" ItemName="_CurrentAbsolutePublishFileWritesUnfiltered"/>
</ConvertToAbsolutePath>

<!-- Remove duplicates from the files produced in this publish-->
<RemoveDuplicates Inputs="@(_CurrentAbsolutePublishFileWritesUnfiltered)" >
<Output TaskParameter="Filtered" ItemName="_CurrentPublishFileWrites"/>
</RemoveDuplicates>
</Target>

<!--
============================================================
Expand Down
Loading