Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikayla Hutchinson <m.j.hutchinson@gmail.com>2019-01-11 05:05:22 +0300
committerMikayla Hutchinson <m.j.hutchinson@gmail.com>2019-01-11 05:05:22 +0300
commit072bd1411a534d21258fabe0992c7813f43ae24f (patch)
treea7673558ed02e7ea61bae87908f40e59a3e8e2ff /main/msbuild
parent8b2acd7970d5805fa3d4f074bb97315392fb52bf (diff)
Fix restoring RoslynCodeTaskFactory
Apparently PackageReference items have to come before the common targets.
Diffstat (limited to 'main/msbuild')
-rw-r--r--main/msbuild/MDBuildTasks.targets7
-rw-r--r--main/msbuild/MonoDevelop.BeforeCommon.targets8
2 files changed, 8 insertions, 7 deletions
diff --git a/main/msbuild/MDBuildTasks.targets b/main/msbuild/MDBuildTasks.targets
index 18cfa63b43..6e6170cf4a 100644
--- a/main/msbuild/MDBuildTasks.targets
+++ b/main/msbuild/MDBuildTasks.targets
@@ -3,13 +3,6 @@
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
- <ItemGroup>
- <!--
- the one built into MSBuild 15.98+ is broken:
- https://github.com/Microsoft/msbuild/issues/3726
- -->
- <PackageReference Include="RoslynCodeTaskFactory" Version="2.0.7" />
- </ItemGroup>
<UsingTask
TaskName="DownloadFiles"
TaskFactory="CodeTaskFactory"
diff --git a/main/msbuild/MonoDevelop.BeforeCommon.targets b/main/msbuild/MonoDevelop.BeforeCommon.targets
index 2a78fc6d35..7bcb851328 100644
--- a/main/msbuild/MonoDevelop.BeforeCommon.targets
+++ b/main/msbuild/MonoDevelop.BeforeCommon.targets
@@ -75,4 +75,12 @@
<Analyzer Remove="@(Analyzer->WithMetadataValue('Filename', 'Microsoft.CodeAnalysis.Analyzers'))" />
</ItemGroup>
</Target>
+
+ <ItemGroup>
+ <!--
+ the one built into MSBuild 15.98+ is broken:
+ https://github.com/Microsoft/msbuild/issues/3726
+ -->
+ <PackageReference Include="RoslynCodeTaskFactory" Version="2.0.7" />
+ </ItemGroup>
</Project>