[Pkg-cli-apps-commits] [monodevelop] 08/16: Don't use NuGet for unused nupkgs

[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 66d445a233cec0d24b75740225ac80725030245e
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Mon Dec 14 16:19:43 2015 +0000

    Don't use NuGet for unused nupkgs
---
 debian/patches/series                                |  1 +
 debian/patches/skip_unneeded_nugets.patch            | 20 ++++++++++++++++++++
 .../patches/use_local_nuget_with_buildd_config.patch | 17 +++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index e4436e4..b3d4e48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+skip_unneeded_nugets.patch
 fix_autoreconf.patch
 update_templates_for_gtk-sharp_2.12.patch
 boo_mimetype.patch
diff --git a/debian/patches/skip_unneeded_nugets.patch b/debian/patches/skip_unneeded_nugets.patch
new file mode 100644
index 0000000..2b637bb
--- /dev/null
+++ b/debian/patches/skip_unneeded_nugets.patch
@@ -0,0 +1,20 @@
+Index: monodevelop/external/libgit2sharp/LibGit2Sharp/packages.config
+===================================================================
+--- monodevelop.orig/external/libgit2sharp/LibGit2Sharp/packages.config
++++ /dev/null
+@@ -1,4 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<packages>
+-  <package id="LibGit2Sharp.NativeBinaries" version="1.0.81" targetFramework="net40" allowedVersions="[1.0.81]" />
+-</packages>
+\ No newline at end of file
+Index: monodevelop/external/mono-addins/Mono.Addins.Setup/packages.config
+===================================================================
+--- monodevelop.orig/external/mono-addins/Mono.Addins.Setup/packages.config
++++ /dev/null
+@@ -1,4 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<packages>
+-  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
+-</packages>
+\ No newline at end of file
diff --git a/debian/patches/use_local_nuget_with_buildd_config.patch b/debian/patches/use_local_nuget_with_buildd_config.patch
index e8419bd..56dcefc 100644
--- a/debian/patches/use_local_nuget_with_buildd_config.patch
+++ b/debian/patches/use_local_nuget_with_buildd_config.patch
@@ -40,3 +40,20 @@ Index: monodevelop/src/addins/NUnit/NUnitRunner/NUnitRunner.csproj
 +    <Exec Condition="Exists('$(SolutionDir)\..\.git')" Command="nuget restore -ConfigFile /usr/lib/nuget/NuGet.buildd.Config -SolutionDirectory $(SolutionDir)" />
    </Target>
  </Project>
+Index: monodevelop/tests/UserInterfaceTests/UserInterfaceTests.csproj
+===================================================================
+--- monodevelop.orig/tests/UserInterfaceTests/UserInterfaceTests.csproj
++++ monodevelop/tests/UserInterfaceTests/UserInterfaceTests.csproj
+@@ -127,11 +127,7 @@
+     <None Include="packages.config" />
+   </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)" />
++    <Exec Command="nuget restore -ConfigFile /usr/lib/nuget/NuGet.buildd.Config -SolutionDirectory $(SolutionDir)" />
+   </Target>
+   <ItemGroup>
+     <Folder Include="DialogTests\" />

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