[Pkg-cli-apps-commits] [monodevelop] 13/16: Fix NuGet solution

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/5.10.0.871-1
in repository monodevelop.

commit 251422af237f61d77f0e3ad09106c94b7299bdc4
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Tue Dec 15 11:39:55 2015 +0000

    Fix NuGet solution
---
 debian/patches/dont_bundle_aspnet_assemblies.patch | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/debian/patches/dont_bundle_aspnet_assemblies.patch b/debian/patches/dont_bundle_aspnet_assemblies.patch
index 0263b55..cef9758 100644
--- a/debian/patches/dont_bundle_aspnet_assemblies.patch
+++ b/debian/patches/dont_bundle_aspnet_assemblies.patch
@@ -66,6 +66,18 @@ Index: monodevelop/src/addins/AspNet/MonoDevelop.AspNet.csproj
    </ItemGroup>
    <ItemGroup>
      <Content Include="Html\Schemas\readme.txt">
+@@ -531,11 +481,4 @@
+     <Folder Include="Templates\Projects\" />
+     <Folder Include="Templates\images\" />
+   </ItemGroup>
+-  <Target Name="BeforeBuild">
+-    <PropertyGroup>
+-      <NuGet>$(SolutionDir)\external\nuget-binary\NuGet.exe</NuGet>
+-      <NuGet Condition="$(OS)=='Unix'">mono $(NuGet)</NuGet>
+-    </PropertyGroup>
+-    <Exec Condition="Exists('$(SolutionDir)\..\.git')" Command="$(NuGet) restore -SolutionDirectory $(SolutionDir)" />
+-  </Target>
+ </Project>
 Index: monodevelop/src/addins/AspNet/packages.config
 ===================================================================
 --- monodevelop.orig/src/addins/AspNet/packages.config
@@ -79,3 +91,20 @@ Index: monodevelop/src/addins/AspNet/packages.config
 -  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
 -</packages>
 \ No newline at end of file
+Index: monodevelop/src/addins/NUnit/MonoDevelop.NUnit.csproj
+===================================================================
+--- monodevelop.orig/src/addins/NUnit/MonoDevelop.NUnit.csproj
++++ monodevelop/src/addins/NUnit/MonoDevelop.NUnit.csproj
+@@ -266,11 +266,7 @@
+   </ItemGroup>
+   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+   <Target Name="BeforeBuild">
+-    <PropertyGroup>
+-      <NuGet>$(SolutionDir)\external\nuget-binary\NuGet.exe</NuGet>
+-      <NuGet Condition="$(OS)=='Unix'">mono $(NuGet)</NuGet>
+-    </PropertyGroup>
+-    <Exec Condition="Exists('$(SolutionDir)\..\.git')" Command="$(NuGet) restore -SolutionDirectory $(SolutionDir)" />
++    <Exec Command="nuget restore -ConfigFile /usr/lib/nuget/NuGet.buildd.Config -SolutionDirectory $(SolutionDir)" />
+   </Target>
+   <ItemGroup>
+     <Folder Include="templates\images\" />

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/monodevelop.git