Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 087f183

Browse files
author
John Beisner
committed
The 'Coherent' property needs to be available for 'FinishBuild' and 'PublishArtifacts' targets.
1 parent ade5cf6 commit 087f183

File tree

3 files changed

+29
-23
lines changed

3 files changed

+29
-23
lines changed

build/Publish.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
<Import Project="$(MSBuildThisFileDirectory)/publish/PublishDebian.targets" />
66
<Import Project="$(MSBuildThisFileDirectory)/publish/Badge.targets" />
77
<Import Project="$(MSBuildThisFileDirectory)/publish/Checksum.targets" />
8-
8+
<Import Project="$(MSBuildThisFileDirectory)/publish/RuntimeCoherence.targets" />
9+
910
<!-- PUBLISH_TO_AZURE_BLOB env variable set by CI -->
1011
<Target Name="Publish"
1112
Condition=" '$(PUBLISH_TO_AZURE_BLOB)' != '' "
1213
DependsOnTargets="Init;
1314
Package;
15+
RuntimeCoherence;
1416
PublishArtifacts;
1517
FinishBuild" />
1618

build/publish/FinishBuild.targets

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="FinishBuild"
44
DependsOnTargets="CheckIfAllBuildsHavePublished;
5-
EvaluateRuntimeCoherence;
65
FinalizeBuild" />
76

87
<Target Name="CheckIfAllBuildsHavePublished">
@@ -14,27 +13,6 @@
1413
<Output TaskParameter="HaveAllBuildsPublished" PropertyName="HaveAllBuildsPublished" />
1514
</CheckIfAllBuildsHavePublished>
1615
</Target>
17-
18-
<Target Name="EvaluateRuntimeCoherence"
19-
DependsOnTargets="ReadAspNetCoreSharedRuntimeVersionFile"
20-
BeforeTargets="FinalizeBuild">
21-
<PropertyGroup>
22-
<Coherent>false</Coherent>
23-
<Coherent Condition=" '$(CLI_SharedFrameworkVersion)' == '@(AspNetCoreSharedRuntimeVersion)' ">true</Coherent>
24-
</PropertyGroup>
25-
</Target>
26-
27-
<Target Name="ReadAspNetCoreSharedRuntimeVersionFile"
28-
DependsOnTargets="DownloadHostAndSharedFxArtifacts">
29-
<ItemGroup>
30-
<File Include="$(AspNetCoreSharedRuntimeVersionFile)" />
31-
</ItemGroup>
32-
<ReadLinesFromFile File="@(File)">
33-
<Output
34-
TaskParameter="Lines"
35-
ItemName="AspNetCoreSharedRuntimeVersion"/>
36-
</ReadLinesFromFile>
37-
</Target>
3816

3917
<Target Name="FinalizeBuild"
4018
Condition=" '$(HaveAllBuildsPublished)' == 'True' ">
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Target Name="RuntimeCoherence"
4+
DependsOnTargets="ReadAspNetCoreSharedRuntimeVersionFile;
5+
EvaluateRuntimeCoherence" />
6+
7+
<Target Name="ReadAspNetCoreSharedRuntimeVersionFile"
8+
DependsOnTargets="DownloadHostAndSharedFxArtifacts">
9+
<ItemGroup>
10+
<File Include="$(AspNetCoreSharedRuntimeVersionFile)" />
11+
</ItemGroup>
12+
<ReadLinesFromFile File="@(File)">
13+
<Output
14+
TaskParameter="Lines"
15+
ItemName="AspNetCoreSharedRuntimeVersion"/>
16+
</ReadLinesFromFile>
17+
</Target>
18+
19+
<Target Name="EvaluateRuntimeCoherence"
20+
DependsOnTargets="ReadAspNetCoreSharedRuntimeVersionFile">
21+
<PropertyGroup>
22+
<Coherent>false</Coherent>
23+
<Coherent Condition=" '$(CLI_SharedFrameworkVersion)' == '@(AspNetCoreSharedRuntimeVersion)' ">true</Coherent>
24+
</PropertyGroup>
25+
</Target>
26+
</Project>

0 commit comments

Comments
 (0)