commit: 5e5b144d513022c869826dbd1f9a3b77bc3acaf5
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Mon Oct 3 09:51:42 2016 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Mon Oct 3 09:51:42 2016 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=5e5b144d
autofac v3.5.2
...1.ebuild => autofac-configuration-3.5.2.ebuild} | 21 ++++---
.../autofac-configuration-4.0.1.ebuild | 1 +
.../files/Autofac.Configuration.csproj-3.5.2.patch | 72 ++++++++++++++++++++++
.../{autofac-4.1.1.ebuild => autofac-3.5.2.ebuild} | 21 ++++---
dev-dotnet/autofac/autofac-4.1.1.ebuild | 2 +-
.../autofac/files/Autofac.csproj-3.5.2.patch | 31 ++++++++++
.../autofac/files/reflection-extension-3.5.2.patch | 20 ++++++
7 files changed, 147 insertions(+), 21 deletions(-)
diff --git
a/dev-dotnet/autofac-configuration/autofac-configuration-4.0.1.ebuild
b/dev-dotnet/autofac-configuration/autofac-configuration-3.5.2.ebuild
similarity index 62%
copy from dev-dotnet/autofac-configuration/autofac-configuration-4.0.1.ebuild
copy to dev-dotnet/autofac-configuration/autofac-configuration-3.5.2.ebuild
index c8932b1..161c6c3 100644
--- a/dev-dotnet/autofac-configuration/autofac-configuration-4.0.1.ebuild
+++ b/dev-dotnet/autofac-configuration/autofac-configuration-3.5.2.ebuild
@@ -3,16 +3,20 @@
# $Id$
EAPI=6
-SLOT="4"
+SLOT="3"
KEYWORDS="~amd64 ~ppc ~x86"
USE_DOTNET="net45"
inherit gac dotnet
-SRC_URI="https://github.com/autofac/Autofac.Configuration/archive/v${PV}.tar.gz
-> ${PN}-${PV}.tar.gz"
+NAME="Autofac.Configuration"
+HOMEPAGE="https://github.com/Autofac/${NAME}";
+
+EGIT_COMMIT="ce3c12c67600a145ba31a21f3b3be27c4473f2f3"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz"
RESTRICT="mirror"
-S="${WORKDIR}/Autofac.Configuration-${PV}"
+S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
HOMEPAGE="https://github.com/autofac/Autofac.Configuration";
DESCRIPTION="Configuration support for Autofac IoC"
@@ -21,6 +25,7 @@ LICENSE="MIT" #
https://github.com/autofac/Autofac.Configuration/blob/develop/LI
IUSE="+${USE_DOTNET} +debug developer doc"
COMMON_DEPEND=">=dev-lang/mono-4.0.2.5
+ dev-dotnet/autofac:3
dev-dotnet/aspnet-configuration
"
RDEPEND="${COMMON_DEPEND}
@@ -28,17 +33,13 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
"
-src_unpack() {
- default
- tar xzvpf "${FILESDIR}/Autofac.Configuration.csproj-${PV}.tar.gz" -C
"${S}" || die
-}
-
src_prepare() {
+ eapply "${FILESDIR}/Autofac.Configuration.csproj-3.5.2.patch"
eapply_user
}
src_compile() {
- exbuild_strong /p:VersionNumber=${PV}
"src/Autofac.Configuration/Autofac.Configuration.csproj"
+ exbuild_strong /p:VersionNumber=${PV} "Autofac.Configuration.csproj"
}
src_install() {
@@ -47,6 +48,6 @@ src_install() {
else
DIR="Release"
fi
- egacinstall
"src/Autofac.Configuration/bin/${DIR}/Autofac.Configuration.dll"
+ egacinstall "bin/${DIR}/Autofac.Configuration.dll"
einstall_pc_file "${PN}" "${PV}" "Autofac.Configuration.dll"
}
diff --git
a/dev-dotnet/autofac-configuration/autofac-configuration-4.0.1.ebuild
b/dev-dotnet/autofac-configuration/autofac-configuration-4.0.1.ebuild
index c8932b1..aa321ef 100644
--- a/dev-dotnet/autofac-configuration/autofac-configuration-4.0.1.ebuild
+++ b/dev-dotnet/autofac-configuration/autofac-configuration-4.0.1.ebuild
@@ -21,6 +21,7 @@ LICENSE="MIT" #
https://github.com/autofac/Autofac.Configuration/blob/develop/LI
IUSE="+${USE_DOTNET} +debug developer doc"
COMMON_DEPEND=">=dev-lang/mono-4.0.2.5
+ dev-dotnet/autofac:4
dev-dotnet/aspnet-configuration
"
RDEPEND="${COMMON_DEPEND}
diff --git
a/dev-dotnet/autofac-configuration/files/Autofac.Configuration.csproj-3.5.2.patch
b/dev-dotnet/autofac-configuration/files/Autofac.Configuration.csproj-3.5.2.patch
new file mode 100644
index 0000000..9d84685
--- /dev/null
+++
b/dev-dotnet/autofac-configuration/files/Autofac.Configuration.csproj-3.5.2.patch
@@ -0,0 +1,72 @@
+--- a/Autofac.Configuration.csproj
++++ b/Autofac.Configuration.csproj
+@@ -10,10 +10,10 @@
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Autofac.Configuration</RootNamespace>
+ <AssemblyName>Autofac.Configuration</AssemblyName>
+- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
++ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <SignAssembly>true</SignAssembly>
+-
<AssemblyOriginatorKeyFile>..\..\..\Build\SharedKey.snk</AssemblyOriginatorKeyFile>
++ <AssemblyOriginatorKeyFile>Autofac.snk</AssemblyOriginatorKeyFile>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
">
+@@ -40,24 +40,16 @@
+
<DocumentationFile>bin\Release\Autofac.Configuration.xml</DocumentationFile>
+ </PropertyGroup>
+ <ItemGroup>
+- <Reference Include="Autofac, Version=3.3.0.0, Culture=neutral,
PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+- <SpecificVersion>False</SpecificVersion>
+-
<HintPath>..\..\..\packages\Autofac.3.3.1\lib\net40\Autofac.dll</HintPath>
+- </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.configuration" />
+ <Reference Include="System.Core">
+- <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="System.XML" />
++ <Reference Include="Autofac, Version=3.0.0.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756">
++ <Package>autofac-3.5.2</Package>
++ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+- <Compile Include="..\..\..\GlobalAssemblyInfo.cs">
+- <Link>Properties\GlobalAssemblyInfo.cs</Link>
+- </Compile>
+- <Compile Include="..\..\..\ProductAssemblyInfo.cs">
+- <Link>Properties\ProductAssemblyInfo.cs</Link>
+- </Compile>
+ <CodeAnalysisDictionary
Include="..\..\..\Build\CodeAnalysisDictionary.xml">
+ <Link>CodeAnalysisDictionary.xml</Link>
+ </CodeAnalysisDictionary>
+@@ -113,11 +105,21 @@
+ <None Include="packages.config" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+- <!-- To modify your build process, add your task inside one of the targets
below and uncomment it.
+- Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
++ <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
++ <VersionNumber>1.0.0.0</VersionNumber>
++ </PropertyGroup>
++ <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="Properties/VersionAssemblyInfo.cs"
AssemblyAttributes="@(AssemblyAttributes)" />
+ </Target>
+- <Target Name="AfterBuild">
+- </Target>
+- -->
+-</Project>
+\ No newline at end of file
++</Project>
diff --git a/dev-dotnet/autofac/autofac-4.1.1.ebuild
b/dev-dotnet/autofac/autofac-3.5.2.ebuild
similarity index 59%
copy from dev-dotnet/autofac/autofac-4.1.1.ebuild
copy to dev-dotnet/autofac/autofac-3.5.2.ebuild
index f598bd5..7496837 100644
--- a/dev-dotnet/autofac/autofac-4.1.1.ebuild
+++ b/dev-dotnet/autofac/autofac-3.5.2.ebuild
@@ -3,16 +3,20 @@
# $Id$
EAPI=6
-SLOT="0"
+SLOT="3"
KEYWORDS="~amd64 ~ppc ~x86"
USE_DOTNET="net45"
inherit gac dotnet
-SRC_URI="https://github.com/autofac/Autofac/archive/v4.1.1.tar.gz ->
${PN}-${PV}.tar.gz"
+NAME="Autofac"
+HOMEPAGE="https://github.com/Autofac/${NAME}";
+
+EGIT_COMMIT="c985cda5483dcd4d2fbc395a4001be12cc07ee84"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz"
RESTRICT="mirror"
-S="${WORKDIR}/Autofac-${PV}"
+S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
HOMEPAGE="https://github.com/autofac/Autofac";
DESCRIPTION="An addictive .NET IoC container"
@@ -27,17 +31,14 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
"
-src_unpack() {
- default
- gunzip --decompress --stdout "${FILESDIR}/Autofac.csproj-${PV}.gz"
>"${S}/src/Autofac/Autofac.csproj" || die
-}
-
src_prepare() {
+ eapply "${FILESDIR}/Autofac.csproj-3.5.2.patch"
+ eapply "${FILESDIR}/reflection-extension-3.5.2.patch"
eapply_user
}
src_compile() {
- exbuild_strong /p:VersionNumber=${PV} "src/Autofac/Autofac.csproj"
+ exbuild_strong /p:VersionNumber=${PV}
"Core/Source/Autofac/Autofac.csproj"
}
src_install() {
@@ -46,6 +47,6 @@ src_install() {
else
DIR="Release"
fi
- egacinstall "src/Autofac/bin/${DIR}/Autofac.dll"
+ egacinstall "Core/Source/Autofac/bin/${DIR}/Autofac.dll"
einstall_pc_file "${PN}" "${PV}" "Autofac"
}
diff --git a/dev-dotnet/autofac/autofac-4.1.1.ebuild
b/dev-dotnet/autofac/autofac-4.1.1.ebuild
index f598bd5..81ff199 100644
--- a/dev-dotnet/autofac/autofac-4.1.1.ebuild
+++ b/dev-dotnet/autofac/autofac-4.1.1.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=6
-SLOT="0"
+SLOT="4"
KEYWORDS="~amd64 ~ppc ~x86"
USE_DOTNET="net45"
diff --git a/dev-dotnet/autofac/files/Autofac.csproj-3.5.2.patch
b/dev-dotnet/autofac/files/Autofac.csproj-3.5.2.patch
new file mode 100644
index 0000000..39a26cc
--- /dev/null
+++ b/dev-dotnet/autofac/files/Autofac.csproj-3.5.2.patch
@@ -0,0 +1,31 @@
+--- a/Core/Source/Autofac/Autofac.csproj
++++ b/Core/Source/Autofac/Autofac.csproj
+@@ -12,9 +12,7 @@
+ <SignAssembly>true</SignAssembly>
+
<AssemblyOriginatorKeyFile>..\..\..\Build\SharedKey.snk</AssemblyOriginatorKeyFile>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+- <TargetFrameworkProfile>Profile328</TargetFrameworkProfile>
+ <FileAlignment>512</FileAlignment>
+-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
">
+@@ -40,6 +38,9 @@
+ <DocumentationFile>bin\Release\Autofac.xml</DocumentationFile>
+ <RunCodeAnalysis>true</RunCodeAnalysis>
+ </PropertyGroup>
++ <ItemGroup>
++ <Reference Include="System" />
++ </ItemGroup>
+ <ItemGroup>
+ <!-- A reference to the entire .NET Framework is automatically included
-->
+ <Compile Include="Core\AutoActivateService.cs" />
+@@ -548,7 +549,7 @@
+ <LastGenOutput>ReflectionExtensionsResources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+- <Import
Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets"
/>
++ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets
below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
diff --git a/dev-dotnet/autofac/files/reflection-extension-3.5.2.patch
b/dev-dotnet/autofac/files/reflection-extension-3.5.2.patch
new file mode 100644
index 0000000..0daa867
--- /dev/null
+++ b/dev-dotnet/autofac/files/reflection-extension-3.5.2.patch
@@ -0,0 +1,20 @@
+--- a/Core/Source/Autofac/Util/ReflectionExtensions.cs
++++ b/Core/Source/Autofac/Util/ReflectionExtensions.cs
+@@ -116,17 +116,5 @@
+ return callExpression.Constructor;
+ }
+
+- /// <summary>
+- /// Retrieves a custom attribute of a specified type that is applied
to a specified member,
+- /// and optionally inspects the ancestors of that member.
+- /// </summary>
+- /// <typeparam name="T">The type of attribute to search
for.</typeparam>
+- /// <param name="element">The member to inspect.</param>
+- /// <param name="inherit"><c>true</c> to inspect the ancestors of
element; otherwise, <c>false</c>.</param>
+- /// <returns>A custom attribute that matches <typeparamref
name="T"/>, or <c>null</c> if no such attribute is found.</returns>
+- public static T GetCustomAttribute<T>(this MemberInfo element, bool
inherit) where T : Attribute
+- {
+- return (T)Attribute.GetCustomAttribute(element, typeof(T),
inherit);
+- }
+ }
+ }
