diff options
| author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-02-08 20:48:00 +0300 |
|---|---|---|
| committer | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-02-08 21:52:43 +0300 |
| commit | 633fbcb0736da26ecfe717e5464c5df3f3849343 (patch) | |
| tree | 40c134fb08a8bc7a2c7003a7724ab4de4b60840e /main/msbuild | |
| parent | 8d825985453682252219a3dbb08a8c53008e5ba6 (diff) | |
Get rid of spurious NU1108 errors in VS
Diffstat (limited to 'main/msbuild')
| -rw-r--r-- | main/msbuild/CoreReferences.props | 8 | ||||
| -rw-r--r-- | main/msbuild/MonoDevelop.AfterCommon.props | 7 | ||||
| -rw-r--r-- | main/msbuild/MonoDevelop.BeforeCommon.targets | 7 |
3 files changed, 15 insertions, 7 deletions
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> |