[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/system-reflection-metadata/files/, ...

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/system-reflection-metadata/files/, ...

[Mikhail Pukhlikov]

commit:     5dc9db913566f7938918a1cd43bfb2ee10bf9710
Author:     ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue Jan 30 17:34:32 2018 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 17:34:32 2018 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=5dc9db91

remove dependency

 .../files/mono-System.Reflection.Metadata.csproj   | 24 +++++++++++++++-------
 .../system-reflection-metadata-2.0.0_pre-r1.ebuild |  8 ++++----
 2 files changed, 21 insertions(+), 11 deletions(-)

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
index 6be48cd..afb18fd 100644
--- a/dev-dotnet/system-reflection-metadata/files/mono-System.Reflection.Metadata.csproj
+++ b/dev-dotnet/system-reflection-metadata/files/mono-System.Reflection.Metadata.csproj
@@ -250,18 +250,28 @@
     <Compile Include="System\Reflection\System.Reflection.cs" />
     <Compile Include="AV.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Collections.Immutable" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" />
   <Import Project="$(MSBuildExtensionsPath)\resources.targets" />
   <Target Name="BeforeBuild">
     <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
       <VersionNumber>2.0.0.0</VersionNumber>
     </PropertyGroup>
-    <AssemblyInfo CodeLanguage="C#" OutputFile="AV.cs" AssemblyVersion="$(VersionNumber)" AssemblyFileVersion="$(VersionNumber)" />
+    <ItemGroup>
+      <AssemblyAttributes Include="AssemblyVersion">
+        <_Parameter1>$(VersionNumber)</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyFileVersion">
+        <_Parameter1>$(VersionNumber)</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyInformationalVersion">
+        <_Parameter1>$(VersionNumber)</_Parameter1>
+      </AssemblyAttributes>   
+      </ItemGroup>
+    <WriteCodeFragment Language="C#" OutputFile="AV.cs" AssemblyAttributes="@(AssemblyAttributes)" />
   </Target>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Collections.Immutable" />
-  </ItemGroup>
 </Project>

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
index 9ff1ecf..8a57c08 100644
--- 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
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="6"
+
 RESTRICT="mirror"
 KEYWORDS="~amd64"
 SLOT="0"
@@ -10,7 +11,7 @@ SLOT="0"
 USE_DOTNET="net45"
 IUSE="+${USE_DOTNET} +gac developer debug doc"
 
-inherit gac dotnet
+inherit dotnet xbuild gac
 
 GITHUB_ACCOUNT="dotnet"
 GITHUB_PROJECTNAME="corefx"
@@ -29,7 +30,6 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	dev-dotnet/buildtools
-	>=dev-dotnet/msbuildtasks-1.5.0.240
 "
 
 PROJ1=System.Reflection.Metadata