Skip to content

Commit f83d81a

Browse files
authored
Consolidate MSBuild Dataflow versions and add dependency so it builds after Dataflow is built. (#794)
* Consolidate MSBuild Dataflow versions. * Update prebuilt baseline.
1 parent 8e38275 commit f83d81a

File tree

3 files changed

+41
-4
lines changed

3 files changed

+41
-4
lines changed
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From b89e2a26623c89c5ac71e0a10435f8af6db3d3d7 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <crummel@microsoft.com>
3+
Date: Thu, 27 Sep 2018 17:24:52 -0500
4+
Subject: [PATCH] Consolidate versions of System.Threading.Tasks.Dataflow.
5+
6+
---
7+
src/Build/Microsoft.Build.csproj | 2 +-
8+
src/Tasks/Microsoft.Build.Tasks.csproj | 2 +-
9+
2 files changed, 2 insertions(+), 2 deletions(-)
10+
11+
diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
12+
index fb46bc4..61cc31a 100644
13+
--- a/src/Build/Microsoft.Build.csproj
14+
+++ b/src/Build/Microsoft.Build.csproj
15+
@@ -39,7 +39,7 @@
16+
17+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
18+
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(VisualStudioSetupInteropVersion)" />
19+
- <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.5.24.0" />
20+
+ <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.6.0" />
21+
22+
<Reference Include="System.Configuration" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
23+
</ItemGroup>
24+
diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj
25+
index aafdf92..4da0a22 100644
26+
--- a/src/Tasks/Microsoft.Build.Tasks.csproj
27+
+++ b/src/Tasks/Microsoft.Build.Tasks.csproj
28+
@@ -955,7 +955,7 @@
29+
</ItemGroup>
30+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
31+
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(VisualStudioSetupInteropVersion)" />
32+
- <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.5.24.0" />
33+
+ <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.6.0" />
34+
35+
<!-- Reference compilers package without using assets, so we can copy them to the output directory under the Roslyn folder -->
36+
<PackageReference Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)" ExcludeAssets="All" />
37+
--
38+
2.9.5
39+

tools-local/prebuilt-baseline-offline.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,6 @@
635635
<Usage Id="System.Threading.Tasks" Version="4.0.11-rc2-24027" />
636636
<Usage Id="System.Threading.Tasks" Version="4.0.11" />
637637
<Usage Id="System.Threading.Tasks" Version="4.3.0" />
638-
<Usage Id="System.Threading.Tasks.Dataflow" Version="4.5.24" />
639638
<Usage Id="System.Threading.Tasks.Dataflow" Version="4.6.0" />
640639
<Usage Id="System.Threading.Tasks.Dataflow" Version="4.7.0" />
641640
<Usage Id="System.Threading.Tasks.Extensions" Version="4.0.0" />
@@ -698,4 +697,4 @@
698697
<Usage Id="xunit.runner.visualstudio" Version="2.3.0" />
699698
<Usage Id="xunit.runner.visualstudio" Version="2.3.1" />
700699
</Usages>
701-
</UsageData>
700+
</UsageData>

tools-local/prebuilt-baseline-online.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,6 @@
633633
<Usage Id="System.Threading.Tasks" Version="4.0.11-rc2-24027" />
634634
<Usage Id="System.Threading.Tasks" Version="4.0.11" />
635635
<Usage Id="System.Threading.Tasks" Version="4.3.0" />
636-
<Usage Id="System.Threading.Tasks.Dataflow" Version="4.5.24" />
637636
<Usage Id="System.Threading.Tasks.Dataflow" Version="4.6.0" />
638637
<Usage Id="System.Threading.Tasks.Dataflow" Version="4.7.0" />
639638
<Usage Id="System.Threading.Tasks.Extensions" Version="4.0.0" />
@@ -696,4 +695,4 @@
696695
<Usage Id="xunit.runner.visualstudio" Version="2.3.0" />
697696
<Usage Id="xunit.runner.visualstudio" Version="2.3.1" />
698697
</Usages>
699-
</UsageData>
698+
</UsageData>

0 commit comments

Comments
 (0)