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