Gentoo Archives: gentoo-commits

From: Mikhail Pukhlikov <cynede@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/dotnet:master commit in: dev-util/mono-packaging-tools/files/, dev-util/mono-packaging-tools/
Date: Fri, 02 Jun 2017 08:19:45
Message-Id: 1495903791.5ee94a2591011e45b822949baf5d118e84f8b1d5.cynede@gentoo
1 commit: 5ee94a2591011e45b822949baf5d118e84f8b1d5
2 Author: ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com>
3 AuthorDate: Sat May 27 16:49:51 2017 +0000
4 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
5 CommitDate: Sat May 27 16:49:51 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=5ee94a25
7
8 change path
9
10 .../files/MSBuildExtensionsPath.patch | 85 ++++++++++++++++++++++
11 .../mono-packaging-tools-1.4.2.2-r1.ebuild | 2 +
12 2 files changed, 87 insertions(+)
13
14 diff --git a/dev-util/mono-packaging-tools/files/MSBuildExtensionsPath.patch b/dev-util/mono-packaging-tools/files/MSBuildExtensionsPath.patch
15 new file mode 100644
16 index 0000000..3bd17df
17 --- /dev/null
18 +++ b/dev-util/mono-packaging-tools/files/MSBuildExtensionsPath.patch
19 @@ -0,0 +1,85 @@
20 +diff -r -u a/mpt-core/mpt-core.csproj b/mpt-core/mpt-core.csproj
21 +--- a/mpt-core/mpt-core.csproj 2017-01-21 22:02:23.000000000 +0300
22 ++++ b/mpt-core/mpt-core.csproj 2017-05-27 19:40:00.326902285 +0300
23 +@@ -80,7 +80,7 @@
24 + <Folder Include="02_EditableXml\" />
25 + </ItemGroup>
26 + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
27 +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" />
28 ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" />
29 + <Target Name="BeforeBuild">
30 + <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
31 + <VersionNumber>1.0.0.0</VersionNumber>
32 +diff -r -u a/mpt-csproj/mpt-csproj.csproj b/mpt-csproj/mpt-csproj.csproj
33 +--- a/mpt-csproj/mpt-csproj.csproj 2017-01-21 22:02:23.000000000 +0300
34 ++++ b/mpt-csproj/mpt-csproj.csproj 2017-05-27 19:38:33.885585408 +0300
35 +@@ -66,7 +66,7 @@
36 + </ProjectReference>
37 + </ItemGroup>
38 + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
39 +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" />
40 ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" />
41 + <Target Name="BeforeBuild">
42 + <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
43 + <VersionNumber>1.0.0.0</VersionNumber>
44 +diff -r -u a/mpt-csproj.tests/test.csproj b/mpt-csproj.tests/test.csproj
45 +--- a/mpt-csproj.tests/test.csproj 2017-01-21 22:02:23.000000000 +0300
46 ++++ b/mpt-csproj.tests/test.csproj 2017-05-27 19:44:42.642210182 +0300
47 +@@ -56,7 +56,7 @@
48 + </ProjectReference>
49 + </ItemGroup>
50 + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
51 +- <Import Project="/usr/lib64/mono/4.5/MSBuild.Community.Tasks.Targets" Condition="Exists('/usr/lib64/mono/4.5/MSBuild.Community.Tasks.Targets')" />
52 ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" Condition="Exists('$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets')" />
53 + <Target Name="BeforeBuild">
54 + <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
55 + <VersionNumber>1.0.0.0</VersionNumber>
56 +Only in a/mpt-csproj.tests: test.csproj.orig
57 +diff -r -u a/mpt-gitmodules/mpt-gitmodules.csproj b/mpt-gitmodules/mpt-gitmodules.csproj
58 +--- a/mpt-gitmodules/mpt-gitmodules.csproj 2017-01-21 22:02:23.000000000 +0300
59 ++++ b/mpt-gitmodules/mpt-gitmodules.csproj 2017-05-27 19:40:16.270145168 +0300
60 +@@ -57,7 +57,7 @@
61 + <EmbeddedResource Include="Resources\syntax4.ebnf" />
62 + </ItemGroup>
63 + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
64 +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" />
65 ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" />
66 + <Target Name="BeforeBuild">
67 + <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
68 + <VersionNumber>1.0.0.0</VersionNumber>
69 +diff -r -u a/mpt-machine/mpt-machine.csproj b/mpt-machine/mpt-machine.csproj
70 +--- a/mpt-machine/mpt-machine.csproj 2017-01-21 22:02:23.000000000 +0300
71 ++++ b/mpt-machine/mpt-machine.csproj 2017-05-27 19:40:30.302358943 +0300
72 +@@ -53,7 +53,7 @@
73 + <Folder Include="Properties\" />
74 + </ItemGroup>
75 + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
76 +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" />
77 ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" />
78 + <Target Name="BeforeBuild">
79 + <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
80 + <VersionNumber>1.0.0.0</VersionNumber>
81 +diff -r -u a/mpt-nuget/mpt-nuget.csproj b/mpt-nuget/mpt-nuget.csproj
82 +--- a/mpt-nuget/mpt-nuget.csproj 2017-01-21 22:02:23.000000000 +0300
83 ++++ b/mpt-nuget/mpt-nuget.csproj 2017-05-27 19:40:46.967612830 +0300
84 +@@ -52,7 +52,7 @@
85 + </ProjectReference>
86 + </ItemGroup>
87 + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
88 +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" />
89 ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" />
90 + <Target Name="BeforeBuild">
91 + <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
92 + <VersionNumber>1.0.0.0</VersionNumber>
93 +diff -r -u a/mpt-sln/mpt-sln.csproj b/mpt-sln/mpt-sln.csproj
94 +--- a/mpt-sln/mpt-sln.csproj 2017-01-21 22:02:23.000000000 +0300
95 ++++ b/mpt-sln/mpt-sln.csproj 2017-05-27 19:41:00.287815753 +0300
96 +@@ -55,7 +55,7 @@
97 + <Folder Include="Properties\" />
98 + </ItemGroup>
99 + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
100 +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" />
101 ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" />
102 + <Target Name="BeforeBuild">
103 + <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
104 + <VersionNumber>1.0.0.0</VersionNumber>
105
106 diff --git a/dev-util/mono-packaging-tools/mono-packaging-tools-1.4.2.2-r1.ebuild b/dev-util/mono-packaging-tools/mono-packaging-tools-1.4.2.2-r1.ebuild
107 index 26b584c..56baa3a 100644
108 --- a/dev-util/mono-packaging-tools/mono-packaging-tools-1.4.2.2-r1.ebuild
109 +++ b/dev-util/mono-packaging-tools/mono-packaging-tools-1.4.2.2-r1.ebuild
110 @@ -69,6 +69,8 @@ NUSPEC_FILENAME="${PN}.nuspec"
111 #ICON_PATH="$(get_nuget_trusted_icons_location)/${ICON_FINALNAME}"
112
113 src_prepare() {
114 + eapply "${FILESDIR}/MSBuildExtensionsPath.patch"
115 +
116 #change version in .nuspec
117 # PV = Package version (excluding revision, if any), for example 6.3.
118 # It should reflect the upstream versioning scheme