commit: 5ee94a2591011e45b822949baf5d118e84f8b1d5 Author: ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com> AuthorDate: Sat May 27 16:49:51 2017 +0000 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> CommitDate: Sat May 27 16:49:51 2017 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=5ee94a25
change path .../files/MSBuildExtensionsPath.patch | 85 ++++++++++++++++++++++ .../mono-packaging-tools-1.4.2.2-r1.ebuild | 2 + 2 files changed, 87 insertions(+) diff --git a/dev-util/mono-packaging-tools/files/MSBuildExtensionsPath.patch b/dev-util/mono-packaging-tools/files/MSBuildExtensionsPath.patch new file mode 100644 index 0000000..3bd17df --- /dev/null +++ b/dev-util/mono-packaging-tools/files/MSBuildExtensionsPath.patch @@ -0,0 +1,85 @@ +diff -r -u a/mpt-core/mpt-core.csproj b/mpt-core/mpt-core.csproj +--- a/mpt-core/mpt-core.csproj 2017-01-21 22:02:23.000000000 +0300 ++++ b/mpt-core/mpt-core.csproj 2017-05-27 19:40:00.326902285 +0300 +@@ -80,7 +80,7 @@ + <Folder Include="02_EditableXml\" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" /> ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" /> + <Target Name="BeforeBuild"> + <PropertyGroup Condition=" '$(VersionNumber)' == '' "> + <VersionNumber>1.0.0.0</VersionNumber> +diff -r -u a/mpt-csproj/mpt-csproj.csproj b/mpt-csproj/mpt-csproj.csproj +--- a/mpt-csproj/mpt-csproj.csproj 2017-01-21 22:02:23.000000000 +0300 ++++ b/mpt-csproj/mpt-csproj.csproj 2017-05-27 19:38:33.885585408 +0300 +@@ -66,7 +66,7 @@ + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" /> ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" /> + <Target Name="BeforeBuild"> + <PropertyGroup Condition=" '$(VersionNumber)' == '' "> + <VersionNumber>1.0.0.0</VersionNumber> +diff -r -u a/mpt-csproj.tests/test.csproj b/mpt-csproj.tests/test.csproj +--- a/mpt-csproj.tests/test.csproj 2017-01-21 22:02:23.000000000 +0300 ++++ b/mpt-csproj.tests/test.csproj 2017-05-27 19:44:42.642210182 +0300 +@@ -56,7 +56,7 @@ + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +- <Import Project="/usr/lib64/mono/4.5/MSBuild.Community.Tasks.Targets" Condition="Exists('/usr/lib64/mono/4.5/MSBuild.Community.Tasks.Targets')" /> ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" Condition="Exists('$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets')" /> + <Target Name="BeforeBuild"> + <PropertyGroup Condition=" '$(VersionNumber)' == '' "> + <VersionNumber>1.0.0.0</VersionNumber> +Only in a/mpt-csproj.tests: test.csproj.orig +diff -r -u a/mpt-gitmodules/mpt-gitmodules.csproj b/mpt-gitmodules/mpt-gitmodules.csproj +--- a/mpt-gitmodules/mpt-gitmodules.csproj 2017-01-21 22:02:23.000000000 +0300 ++++ b/mpt-gitmodules/mpt-gitmodules.csproj 2017-05-27 19:40:16.270145168 +0300 +@@ -57,7 +57,7 @@ + <EmbeddedResource Include="Resources\syntax4.ebnf" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" /> ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" /> + <Target Name="BeforeBuild"> + <PropertyGroup Condition=" '$(VersionNumber)' == '' "> + <VersionNumber>1.0.0.0</VersionNumber> +diff -r -u a/mpt-machine/mpt-machine.csproj b/mpt-machine/mpt-machine.csproj +--- a/mpt-machine/mpt-machine.csproj 2017-01-21 22:02:23.000000000 +0300 ++++ b/mpt-machine/mpt-machine.csproj 2017-05-27 19:40:30.302358943 +0300 +@@ -53,7 +53,7 @@ + <Folder Include="Properties\" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" /> ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" /> + <Target Name="BeforeBuild"> + <PropertyGroup Condition=" '$(VersionNumber)' == '' "> + <VersionNumber>1.0.0.0</VersionNumber> +diff -r -u a/mpt-nuget/mpt-nuget.csproj b/mpt-nuget/mpt-nuget.csproj +--- a/mpt-nuget/mpt-nuget.csproj 2017-01-21 22:02:23.000000000 +0300 ++++ b/mpt-nuget/mpt-nuget.csproj 2017-05-27 19:40:46.967612830 +0300 +@@ -52,7 +52,7 @@ + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" /> ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" /> + <Target Name="BeforeBuild"> + <PropertyGroup Condition=" '$(VersionNumber)' == '' "> + <VersionNumber>1.0.0.0</VersionNumber> +diff -r -u a/mpt-sln/mpt-sln.csproj b/mpt-sln/mpt-sln.csproj +--- a/mpt-sln/mpt-sln.csproj 2017-01-21 22:02:23.000000000 +0300 ++++ b/mpt-sln/mpt-sln.csproj 2017-05-27 19:41:00.287815753 +0300 +@@ -55,7 +55,7 @@ + <Folder Include="Properties\" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +- <Import Project="$(MSBuildToolsPath)\MSBuild.Community.Tasks.Targets" /> ++ <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" /> + <Target Name="BeforeBuild"> + <PropertyGroup Condition=" '$(VersionNumber)' == '' "> + <VersionNumber>1.0.0.0</VersionNumber> 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 index 26b584c..56baa3a 100644 --- 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 @@ -69,6 +69,8 @@ NUSPEC_FILENAME="${PN}.nuspec" #ICON_PATH="$(get_nuget_trusted_icons_location)/${ICON_FINALNAME}" src_prepare() { + eapply "${FILESDIR}/MSBuildExtensionsPath.patch" + #change version in .nuspec # PV = Package version (excluding revision, if any), for example 6.3. # It should reflect the upstream versioning scheme