From 5906cf0436717f79f01f6dda39e1aaeccf267809 Mon Sep 17 00:00:00 2001
From: VladD2 <vc@rsdn.ru>
Date: Sun, 21 Feb 2016 20:39:42 +0300
Subject: [PATCH] [Nitra.LanguageCompiler] Fix ExternalDependency SMBuild
 property.

---
 .nuget/packages.config                        |  1 -
 .../Nitra.LanguageCompiler.nproj              | 22 ++++++++++---------
 .../Nitra.Ide.Macros.Tests.nproj              |  9 ++++++++
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.nuget/packages.config b/.nuget/packages.config
index caf8493c7..037b768bb 100644
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Wave" version="1.0.0.0" />
 </packages>
\ No newline at end of file
diff --git a/Nitra.LanguageCompiler/Nitra.LanguageCompiler.nproj b/Nitra.LanguageCompiler/Nitra.LanguageCompiler.nproj
index 939a99644..62d614128 100644
--- a/Nitra.LanguageCompiler/Nitra.LanguageCompiler.nproj
+++ b/Nitra.LanguageCompiler/Nitra.LanguageCompiler.nproj
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
     <CommonFilesPath Condition=" '$(CommonFilesPath)' == '' ">..\Common</CommonFilesPath>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -250,16 +252,16 @@
   <Import Project="$(Nemerle)\Nemerle.MSBuild.targets" />
   <ItemGroup>
     <ExternalDependency Include="..\$(OutDir)Stage2\Nemerle.dll" />
-    <ExternalDependency Include="..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Microsoft.VisualStudio.ExtensionManager.dll" />
-    <ExternalDependency Include="..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Microsoft.VisualStudio.ExtensionManager.Implementation.dll" />
-    <ExternalDependency Include="..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Shell.Interop.dll" />
-    <ExternalDependency Include="..\Ide\Nitra.MSBuild.Tasks\$(OutDir)Nitra.MSBuild.Tasks.dll" />
-    <ExternalDependency Include="..\packages\VSSDK.Shell.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll" />
-    <ExternalDependency Include="..\packages\VSSDK.Settings.12.12.0.4\lib\net40\Microsoft.VisualStudio.Settings.12.0.dll" />
-    <ExternalDependency Include="..\$(OutDir)Stage2\Nemerle.dll" />
-    <ExternalDependency Include="..\$(OutDir)Stage2\Nitra.Runtime.dll" />
-    <ExternalDependency Include="..\Ide\Nitra.VisualStudio\$(OutDir)Nemerle.Diff.dll" />
-    <ExternalDependency Include="..\Ide\Nitra.VisualStudio\$(OutDir)Nitra.VisualStudio.dll" />
+    <ExternalDependency Include="$(SolutionDir)ExternalTools\VSSDK2013\PrivateAssemblies\Microsoft.VisualStudio.ExtensionManager.dll" />
+    <ExternalDependency Include="$(SolutionDir)ExternalTools\VSSDK2013\PrivateAssemblies\Microsoft.VisualStudio.ExtensionManager.Implementation.dll" />
+    <ExternalDependency Include="$(SolutionDir)Ide\Nitra.MSBuild.Tasks\$(OutDir)Shell.Interop.dll" />
+    <ExternalDependency Include="$(SolutionDir)Ide\Nitra.MSBuild.Tasks\$(OutDir)Nitra.MSBuild.Tasks.dll" />
+    <ExternalDependency Include="$(SolutionDir)Ide\Nitra.VisualStudio\$(OutDir)Nemerle.Diff.dll" />
+    <ExternalDependency Include="$(SolutionDir)Ide\Nitra.VisualStudio\$(OutDir)Nitra.VisualStudio.dll" />
+    <ExternalDependency Include="$(SolutionDir)packages\VSSDK.Shell.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll" />
+    <ExternalDependency Include="$(SolutionDir)packages\VSSDK.Settings.12.12.0.4\lib\net40\Microsoft.VisualStudio.Settings.12.0.dll" />
+    <ExternalDependency Include="$(SolutionDir)$(OutDir)Stage2\Nemerle.dll" />
+    <ExternalDependency Include="$(SolutionDir)$(OutDir)Stage2\Nitra.Runtime.dll" />
   </ItemGroup>
   <ItemGroup>
     <VSSDK Include="$(ProjectDir)..\ExternalTools\VSSDK2013\**\*.*" />
diff --git a/Tests/Nitra.Ide.Macros.Tests/Nitra.Ide.Macros.Tests.nproj b/Tests/Nitra.Ide.Macros.Tests/Nitra.Ide.Macros.Tests.nproj
index f36159933..5fe6805fb 100644
--- a/Tests/Nitra.Ide.Macros.Tests/Nitra.Ide.Macros.Tests.nproj
+++ b/Tests/Nitra.Ide.Macros.Tests/Nitra.Ide.Macros.Tests.nproj
@@ -17,6 +17,8 @@
     <NemerleBinPathRoot Condition=" '$(NemerleBinPathRoot)' == '' ">$(ProgramFiles)\Nemerle</NemerleBinPathRoot>
     <Nemerle Condition=" '$(Nemerle)' == '' ">$(NemerleBinPathRoot)\$(NemerleVersion)</Nemerle>
     <Name>Nitra.Ide.Macros.Tests</Name>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -88,6 +90,13 @@
     </Content>
   </ItemGroup>
   <Import Project="$(Nemerle)\Nemerle.MSBuild.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
   <!--
 		To modify your build process, add your task inside one of the targets below and uncomment it. 
 		Other similar extension points exist, see Microsoft.Common.targets.