From 633fbcb0736da26ecfe717e5464c5df3f3849343 Mon Sep 17 00:00:00 2001
From: Mikayla Hutchinson <m.j.hutchinson@gmail.com>
Date: Fri, 8 Feb 2019 12:48:00 -0500
Subject: Get rid of spurious NU1108 errors in VS

---
 main/msbuild/CoreReferences.props             | 8 ++++++++
 main/msbuild/MonoDevelop.AfterCommon.props    | 7 -------
 main/msbuild/MonoDevelop.BeforeCommon.targets | 7 +++++++
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 main/msbuild/CoreReferences.props

(limited to 'main/msbuild')

diff --git a/main/msbuild/CoreReferences.props b/main/msbuild/CoreReferences.props
new file mode 100644
index 0000000000..f86242d7bb
--- /dev/null
+++ b/main/msbuild/CoreReferences.props
@@ -0,0 +1,8 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup>
+		<Reference Include="System.ComponentModel.Composition" />
+		<ProjectReference Include="$(MonoDevelopRootDir)src\core\MonoDevelop.Core\MonoDevelop.Core.csproj" Private="False" />
+		<ProjectReference Include="$(MonoDevelopRootDir)src\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj" Private="False" />
+		<ProjectReference Include="$(MonoDevelopRootDir)external\mono-addins\Mono.Addins\Mono.Addins.csproj" Private="False" />
+	</ItemGroup>
+</Project>
diff --git a/main/msbuild/MonoDevelop.AfterCommon.props b/main/msbuild/MonoDevelop.AfterCommon.props
index 12b8faf1fc..f6e0af599a 100644
--- a/main/msbuild/MonoDevelop.AfterCommon.props
+++ b/main/msbuild/MonoDevelop.AfterCommon.props
@@ -83,11 +83,4 @@
 		<EmbeddedResource Include="**\*.addin.xml" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
 	</ItemGroup>
 
-	<!-- default refs. the TargetFramework check is to exclude RefactoringEssentials  -->
-	<ItemGroup Condition="'$(AddMonoDevelopCoreReferences)' == 'true'">
-		<Reference Include="System.ComponentModel.Composition" />
-		<ProjectReference Include="$(MonoDevelopRootDir)src\core\MonoDevelop.Core\MonoDevelop.Core.csproj" Private="False" />
-		<ProjectReference Include="$(MonoDevelopRootDir)src\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj" Private="False" />
-		<ProjectReference Include="$(MonoDevelopRootDir)external\mono-addins\Mono.Addins\Mono.Addins.csproj" Private="False" />
-	</ItemGroup>
 </Project>
diff --git a/main/msbuild/MonoDevelop.BeforeCommon.targets b/main/msbuild/MonoDevelop.BeforeCommon.targets
index 7c4c96a266..638acb1d14 100644
--- a/main/msbuild/MonoDevelop.BeforeCommon.targets
+++ b/main/msbuild/MonoDevelop.BeforeCommon.targets
@@ -98,4 +98,11 @@
 		</Reference>
 	</ItemGroup>
 
+	<!--
+	Hide these refs behind an import so NuGet doesn't see them and generate spurious NU1108 "cycle detected" errors even when the condition is false.
+	This means that they have to be imported AFTER the project instead of before it, so the project can set AddMonoDevelopCoreReferences.
+	-->
+	<Import Project="$(MSBuildThisFileDirectory)CoreReferences.props" Condition="'$(AddMonoDevelopCoreReferences)' == 'true'" />
+
+
 </Project>
-- 
cgit v1.2.3