diff options
6 files changed, 12 insertions, 12 deletions
diff --git a/main/msbuild/MDBuildTasks.targets b/main/msbuild/MDBuildTasks.targets index 26ed06d13c..9e2912d836 100644 --- a/main/msbuild/MDBuildTasks.targets +++ b/main/msbuild/MDBuildTasks.targets @@ -94,12 +94,12 @@ <Target Name="DownloadNupkg" Condition="'@(DownloadNupkg)' != ''" - AfterTargets="Restore" + BeforeTargets="Build" DependsOnTargets="_DownloadNupkgPrepare;_DownloadNupkgIfNeeded" /> <Target Name="_DownloadNupkgPrepare"> <PropertyGroup> - <DownloadNupkgDirectory Condition="'$(DownloadNupkgDirectory)'==''">$(SolutionDir)packages\</DownloadNupkgDirectory> + <DownloadNupkgDirectory Condition="'$(DownloadNupkgDirectory)'==''">packages\</DownloadNupkgDirectory> <DownloadNupkgDirectory Condition="!HasTrailingSlash('$(DownloadNupkgDirectory)')">$(DownloadNupkgDirectory)\</DownloadNupkgDirectory> <_DownloadNupkgStamp>$(IntermediateOutputPath)MDDownloadFiles\stamp</_DownloadNupkgStamp> <_DownloadNupkgPkgCfg>$(IntermediateOutputPath)MDDownloadFiles\packages.config</_DownloadNupkgPkgCfg> diff --git a/main/msbuild/MonoDevelop.AfterCommon.props b/main/msbuild/MonoDevelop.AfterCommon.props index 187a860a21..9aaf378ab4 100644 --- a/main/msbuild/MonoDevelop.AfterCommon.props +++ b/main/msbuild/MonoDevelop.AfterCommon.props @@ -19,7 +19,7 @@ </PropertyGroup> <PropertyGroup> - <MDBuildTasks>$(MSBuildThisFileDirectory)</MDBuildTasks> + <DownloadNupkgDirectory>$(MSBuildThisFileDirectory)..\packages\</DownloadNupkgDirectory> </PropertyGroup> <!-- set a bunch of default value the project can override --> diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj index b2a965382c..3950f35d4b 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj @@ -238,13 +238,13 @@ </ItemGroup> <ItemGroup> <DownloadNupkg Include="Microsoft.AspNet.Mvc" Version="5.2.3" /> - <ExtensionContent Include="..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll" /> + <ExtensionContent Include="$(DownloadNupkgDirectory)Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll" /> <DownloadNupkg Include="Microsoft.AspNet.Razor" Version="3.2.3" /> - <ExtensionContent Include="..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll" /> + <ExtensionContent Include="$(DownloadNupkgDirectory)Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll" /> <DownloadNupkg Include="Microsoft.AspNet.WebPages" Version="3.2.3" /> - <ExtensionContent Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\*.dll" /> + <ExtensionContent Include="$(DownloadNupkgDirectory)Microsoft.AspNet.WebPages.3.2.3\lib\net45\*.dll" /> <DownloadNupkg Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" /> - <ExtensionContent Include="..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll" /> + <ExtensionContent Include="$(DownloadNupkgDirectory)Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll" /> <ExtensionContent Include="Razor\Razor-templates.xml" /> <ExtensionContent Include="CodeTemplates\**\*.*" /> <ExtensionContent Include="Templates\**\*.*" /> diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj index 15b7293ba3..1066fcdfd3 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj @@ -17,7 +17,7 @@ <PackageReference Include="NUnitV2.Core" Version="$(NuGetVersionNUnit2)" PrivateAssets="runtime" /> <!-- this is hacky but there is no package that exposes nunit.util.dll as a lib assembly --> <DownloadNupkg Include="NUnit.Runners" Version="$(NuGetVersionNUnit2)" /> - <Reference Include="nunit.util" HintPath="..\..\..\..\packages\NUnit.Runners.$(NuGetVersionNUnit2)\tools\lib\nunit.util.dll" /> + <Reference Include="nunit.util" HintPath="$(DownloadNupkgDirectory)NUnit.Runners.$(NuGetVersionNUnit2)\tools\lib\nunit.util.dll" /> </ItemGroup> <ItemGroup> <Compile Include="NUnitTestRunner.cs" /> diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index 87001e9607..57061dab26 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -151,11 +151,11 @@ <ItemGroup> <DownloadNupkg Include="Microsoft.TestPlatform" Version="$(NuGetVersionMicrosoftTestPlatform)" /> <ExtensionContent - Include="..\..\..\packages\Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\**\*.*" - Exclude="..\..\..\packages\Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\**\*.*" + Include="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\**\*.*" + Exclude="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\**\*.*" Link="VsTestConsole\Extensions\%(RecursiveDir)%(Filename)%(Extension)" /> <ExtensionContent - Include="..\..\..\packages\Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\**\*.*" + Include="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\**\*.*" Link="VsTestConsole\%(RecursiveDir)%(Filename)%(Extension)" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj index 9196ba3105..0691a23571 100644 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj +++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj @@ -65,7 +65,7 @@ <ItemGroup> <ExtensionContent Include="Templates\**\*.*" /> <DownloadNupkg Include="Mono.TextTemplating" Version="1.3.1" /> - <ExtensionContent Include="..\..\..\..\packages\Mono.TextTemplating.1.3.1\tools\TextTransform.exe" /> + <ExtensionContent Include="$(DownloadNupkgDirectory)Mono.TextTemplating.1.3.1\tools\TextTransform.exe" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> |