| 1 |
commit: c3f93fbf0df88628c7e4c5b26e41f0f47747ecf9 |
| 2 |
Author: ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com> |
| 3 |
AuthorDate: Mon Jan 29 17:36:42 2018 +0000 |
| 4 |
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 29 17:36:42 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=c3f93fbf |
| 7 |
|
| 8 |
dependency removed, version fixed |
| 9 |
|
| 10 |
dev-util/msbuild/files/mono-MSBuild.csproj | 16 +++++++++++++--- |
| 11 |
dev-util/msbuild/files/mono-Microsoft.Build.csproj | 16 +++++++++++++--- |
| 12 |
.../{msbuild-15.3-r2.ebuild => msbuild-15.3-r3.ebuild} | 6 +++--- |
| 13 |
3 files changed, 29 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-util/msbuild/files/mono-MSBuild.csproj b/dev-util/msbuild/files/mono-MSBuild.csproj |
| 16 |
index e3134a1..d442f00 100644 |
| 17 |
--- a/dev-util/msbuild/files/mono-MSBuild.csproj |
| 18 |
+++ b/dev-util/msbuild/files/mono-MSBuild.csproj |
| 19 |
@@ -181,11 +181,21 @@ |
| 20 |
</Reference> |
| 21 |
</ItemGroup> |
| 22 |
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 23 |
- <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" /> |
| 24 |
<Target Name="BeforeBuild"> |
| 25 |
<PropertyGroup Condition=" '$(VersionNumber)' == '' "> |
| 26 |
- <VersionNumber>15.3</VersionNumber> |
| 27 |
+ <VersionNumber>15.3.0.0</VersionNumber> |
| 28 |
</PropertyGroup> |
| 29 |
- <AssemblyInfo CodeLanguage="C#" OutputFile="AV.cs" AssemblyVersion="$(VersionNumber)" AssemblyFileVersion="$(VersionNumber)" /> |
| 30 |
+ <ItemGroup> |
| 31 |
+ <AssemblyAttributes Include="AssemblyVersion"> |
| 32 |
+ <_Parameter1>$(VersionNumber)</_Parameter1> |
| 33 |
+ </AssemblyAttributes> |
| 34 |
+ <AssemblyAttributes Include="AssemblyFileVersion"> |
| 35 |
+ <_Parameter1>$(VersionNumber)</_Parameter1> |
| 36 |
+ </AssemblyAttributes> |
| 37 |
+ <AssemblyAttributes Include="AssemblyInformationalVersion"> |
| 38 |
+ <_Parameter1>$(VersionNumber)</_Parameter1> |
| 39 |
+ </AssemblyAttributes> |
| 40 |
+ </ItemGroup> |
| 41 |
+ <WriteCodeFragment Language="C#" OutputFile="AV.cs" AssemblyAttributes="@(AssemblyAttributes)" /> |
| 42 |
</Target> |
| 43 |
</Project> |
| 44 |
|
| 45 |
diff --git a/dev-util/msbuild/files/mono-Microsoft.Build.csproj b/dev-util/msbuild/files/mono-Microsoft.Build.csproj |
| 46 |
index 1501cb1..20892e1 100644 |
| 47 |
--- a/dev-util/msbuild/files/mono-Microsoft.Build.csproj |
| 48 |
+++ b/dev-util/msbuild/files/mono-Microsoft.Build.csproj |
| 49 |
@@ -624,11 +624,21 @@ |
| 50 |
<Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> |
| 51 |
</ItemGroup> |
| 52 |
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 53 |
- <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" /> |
| 54 |
<Target Name="BeforeBuild"> |
| 55 |
<PropertyGroup Condition=" '$(VersionNumber)' == '' "> |
| 56 |
- <VersionNumber>15.3</VersionNumber> |
| 57 |
+ <VersionNumber>15.3.0.0</VersionNumber> |
| 58 |
</PropertyGroup> |
| 59 |
- <AssemblyInfo CodeLanguage="C#" OutputFile="AV.cs" AssemblyVersion="$(VersionNumber)" AssemblyFileVersion="$(VersionNumber)" /> |
| 60 |
+ <ItemGroup> |
| 61 |
+ <AssemblyAttributes Include="AssemblyVersion"> |
| 62 |
+ <_Parameter1>$(VersionNumber)</_Parameter1> |
| 63 |
+ </AssemblyAttributes> |
| 64 |
+ <AssemblyAttributes Include="AssemblyFileVersion"> |
| 65 |
+ <_Parameter1>$(VersionNumber)</_Parameter1> |
| 66 |
+ </AssemblyAttributes> |
| 67 |
+ <AssemblyAttributes Include="AssemblyInformationalVersion"> |
| 68 |
+ <_Parameter1>$(VersionNumber)</_Parameter1> |
| 69 |
+ </AssemblyAttributes> |
| 70 |
+ </ItemGroup> |
| 71 |
+ <WriteCodeFragment Language="C#" OutputFile="AV.cs" AssemblyAttributes="@(AssemblyAttributes)" /> |
| 72 |
</Target> |
| 73 |
</Project> |
| 74 |
|
| 75 |
diff --git a/dev-util/msbuild/msbuild-15.3-r2.ebuild b/dev-util/msbuild/msbuild-15.3-r3.ebuild |
| 76 |
similarity index 98% |
| 77 |
rename from dev-util/msbuild/msbuild-15.3-r2.ebuild |
| 78 |
rename to dev-util/msbuild/msbuild-15.3-r3.ebuild |
| 79 |
index 8f0e41a..b6768b0 100644 |
| 80 |
--- a/dev-util/msbuild/msbuild-15.3-r2.ebuild |
| 81 |
+++ b/dev-util/msbuild/msbuild-15.3-r3.ebuild |
| 82 |
@@ -10,7 +10,7 @@ SLOT="0" |
| 83 |
USE_DOTNET="net46" |
| 84 |
IUSE="+${USE_DOTNET} +gac developer debug doc +roslyn" |
| 85 |
|
| 86 |
-inherit dotnet gac |
| 87 |
+inherit dotnet xbuild gac |
| 88 |
|
| 89 |
GITHUB_ACCOUNT="mono" |
| 90 |
GITHUB_PROJECTNAME="linux-packaging-msbuild" |
| 91 |
@@ -32,7 +32,6 @@ RDEPEND="${COMMON_DEPEND} |
| 92 |
" |
| 93 |
DEPEND="${COMMON_DEPEND} |
| 94 |
dev-dotnet/buildtools |
| 95 |
- >=dev-dotnet/msbuildtasks-1.5.0.240-r1 |
| 96 |
" |
| 97 |
|
| 98 |
KEY2="${DISTDIR}/mono.snk" |
| 99 |
@@ -42,6 +41,8 @@ PROJ1_DIR=src/Build |
| 100 |
PROJ2=MSBuild |
| 101 |
PROJ2_DIR=src/MSBuild |
| 102 |
|
| 103 |
+VER=15.3.0.0 |
| 104 |
+ |
| 105 |
src_prepare() { |
| 106 |
eapply "${FILESDIR}/dir.props.diff" |
| 107 |
eapply "${FILESDIR}/dir.targets.diff" |
| 108 |
@@ -76,7 +77,6 @@ src_compile() { |
| 109 |
fi |
| 110 |
fi |
| 111 |
|
| 112 |
- VER=1.0.27.0 |
| 113 |
|
| 114 |
exbuild_raw /v:detailed /p:TargetFrameworkVersion=v4.6 "/p:Configuration=${CONFIGURATION}" ${SARGS} "/p:VersionNumber=${VER}" "/p:RootPath=${S}" "/p:SignAssembly=true" "/p:AssemblyOriginatorKeyFile=${KEY2}" "${S}/${PROJ2_DIR}/mono-${PROJ2}.csproj" |
| 115 |
sn -R "${PROJ1_DIR}/bin/${CONFIGURATION}/${PROJ1}.dll" "${KEY2}" || die |
Archives