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-dotnet/system-reflection-metadata/files/, ...
Date: Wed, 31 Jan 2018 07:48:32
Message-Id: 1517333672.5dc9db913566f7938918a1cd43bfb2ee10bf9710.cynede@gentoo
1 commit: 5dc9db913566f7938918a1cd43bfb2ee10bf9710
2 Author: ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com>
3 AuthorDate: Tue Jan 30 17:34:32 2018 +0000
4 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 30 17:34:32 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=5dc9db91
7
8 remove dependency
9
10 .../files/mono-System.Reflection.Metadata.csproj | 24 +++++++++++++++-------
11 .../system-reflection-metadata-2.0.0_pre-r1.ebuild | 8 ++++----
12 2 files changed, 21 insertions(+), 11 deletions(-)
13
14 diff --git a/dev-dotnet/system-reflection-metadata/files/mono-System.Reflection.Metadata.csproj b/dev-dotnet/system-reflection-metadata/files/mono-System.Reflection.Metadata.csproj
15 index 6be48cd..afb18fd 100644
16 --- a/dev-dotnet/system-reflection-metadata/files/mono-System.Reflection.Metadata.csproj
17 +++ b/dev-dotnet/system-reflection-metadata/files/mono-System.Reflection.Metadata.csproj
18 @@ -250,18 +250,28 @@
19 <Compile Include="System\Reflection\System.Reflection.cs" />
20 <Compile Include="AV.cs" />
21 </ItemGroup>
22 + <ItemGroup>
23 + <Reference Include="System" />
24 + <Reference Include="System.Core" />
25 + <Reference Include="System.Collections.Immutable" />
26 + </ItemGroup>
27 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
28 - <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" />
29 <Import Project="$(MSBuildExtensionsPath)\resources.targets" />
30 <Target Name="BeforeBuild">
31 <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
32 <VersionNumber>2.0.0.0</VersionNumber>
33 </PropertyGroup>
34 - <AssemblyInfo CodeLanguage="C#" OutputFile="AV.cs" AssemblyVersion="$(VersionNumber)" AssemblyFileVersion="$(VersionNumber)" />
35 + <ItemGroup>
36 + <AssemblyAttributes Include="AssemblyVersion">
37 + <_Parameter1>$(VersionNumber)</_Parameter1>
38 + </AssemblyAttributes>
39 + <AssemblyAttributes Include="AssemblyFileVersion">
40 + <_Parameter1>$(VersionNumber)</_Parameter1>
41 + </AssemblyAttributes>
42 + <AssemblyAttributes Include="AssemblyInformationalVersion">
43 + <_Parameter1>$(VersionNumber)</_Parameter1>
44 + </AssemblyAttributes>
45 + </ItemGroup>
46 + <WriteCodeFragment Language="C#" OutputFile="AV.cs" AssemblyAttributes="@(AssemblyAttributes)" />
47 </Target>
48 - <ItemGroup>
49 - <Reference Include="System" />
50 - <Reference Include="System.Core" />
51 - <Reference Include="System.Collections.Immutable" />
52 - </ItemGroup>
53 </Project>
54
55 diff --git a/dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre-r1.ebuild b/dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre-r1.ebuild
56 index 9ff1ecf..8a57c08 100644
57 --- a/dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre-r1.ebuild
58 +++ b/dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre-r1.ebuild
59 @@ -1,8 +1,9 @@
60 -# Copyright 1999-2017 Gentoo Foundation
61 +# Copyright 1999-2018 Gentoo Foundation
62 # Distributed under the terms of the GNU General Public License v2
63 # $Id$
64
65 -EAPI=6
66 +EAPI="6"
67 +
68 RESTRICT="mirror"
69 KEYWORDS="~amd64"
70 SLOT="0"
71 @@ -10,7 +11,7 @@ SLOT="0"
72 USE_DOTNET="net45"
73 IUSE="+${USE_DOTNET} +gac developer debug doc"
74
75 -inherit gac dotnet
76 +inherit dotnet xbuild gac
77
78 GITHUB_ACCOUNT="dotnet"
79 GITHUB_PROJECTNAME="corefx"
80 @@ -29,7 +30,6 @@ RDEPEND="${COMMON_DEPEND}
81 "
82 DEPEND="${COMMON_DEPEND}
83 dev-dotnet/buildtools
84 - >=dev-dotnet/msbuildtasks-1.5.0.240
85 "
86
87 PROJ1=System.Reflection.Metadata