[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/irony-daxnet/files/, eclass/, app-shells/pash/, ...

[Mikhail Pukhlikov]

commit:     f6bb8d55eb4bbcc5d5206b19c9ba289f9d2b22b4
Author:     ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github 
<DOT> com>
AuthorDate: Fri Oct 13 15:14:36 2017 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 15:14:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=f6bb8d55

version and resources added

 app-shells/pash/pash-0.0_p2016060606.ebuild                  |  7 ++-----
 dev-dotnet/irony-daxnet/files/template.csproj                | 12 +++++++++---
 .../irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild       |  2 +-
 eclass/gac.eclass                                            |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app-shells/pash/pash-0.0_p2016060606.ebuild 
b/app-shells/pash/pash-0.0_p2016060606.ebuild
index dc9136e..162685b 100644
--- a/app-shells/pash/pash-0.0_p2016060606.ebuild
+++ b/app-shells/pash/pash-0.0_p2016060606.ebuild
@@ -33,7 +33,7 @@ DEPEND="${CDEPEND}
 
 PROJECT1_PATH=Source/System.Management
 PROJECT1_NAME=System.Management
-PROJECT1_OUT=System.Management
+PROJECT1_OUT=System.Management.Automation
 
 PROJECT2_PATH=Source/Microsoft.PowerShell.Security
 PROJECT2_NAME=Microsoft.PowerShell.Security
@@ -52,6 +52,7 @@ PROJECT5_NAME=PashConsole
 PROJECT5_OUT=Pash
 
 src_prepare() {
+       sed -i "s/new Version(1, 0, 0, 
0)/System.Reflection.Assembly.GetExecutingAssembly().GetName().Version/" 
Source/System.Management/Pash/Implementation/LocalHost.cs || die
        sed -i "/Version/d" "${S}/${PROJECT1_PATH}/Properties/AssemblyInfo.cs" 
|| die
        sed -i "/Version/d" "${S}/${PROJECT2_PATH}/Properties/AssemblyInfo.cs" 
|| die
        sed -i "/Version/d" "${S}/${PROJECT3_PATH}/Properties/AssemblyInfo.cs" 
|| die
@@ -84,10 +85,6 @@ src_prepare() {
 }
 
 src_compile() {
-       #emsbuild "/p:AssemblyName=${PROJECT1_OUT}" 
"${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj"
-       #emsbuild "/p:AssemblyName=${PROJECT2_OUT}" 
"${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj"
-       #emsbuild "/p:AssemblyName=${PROJECT3_OUT}" 
"${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj"
-       #emsbuild "/p:AssemblyName=${PROJECT4_OUT}" 
"${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj"
        emsbuild "/p:VersionNumber=1.0.2016.606" 
"${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj"
 }
 

diff --git a/dev-dotnet/irony-daxnet/files/template.csproj 
b/dev-dotnet/irony-daxnet/files/template.csproj
index 9c49b91..07558fb 100644
--- a/dev-dotnet/irony-daxnet/files/template.csproj
+++ b/dev-dotnet/irony-daxnet/files/template.csproj
@@ -6,6 +6,7 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <AssemblyName>$(AssemblyName)</AssemblyName>
     <OutputType>$(OutputType)</OutputType>
+    <RootNamespace>$(RootNamespace)</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' 
">
     <OutputPath>bin\Debug</OutputPath>
@@ -26,8 +27,10 @@
     <!-- Reference -->
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="**/*.cs" />
-    <Compile Include="AssemblyVersion.cs" />
+    <Compile Include="**/*.cs" Exclude="AssemblyVersion.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="**/*.resx" />
   </ItemGroup>
   <ItemGroup>
     <!-- ProjectReference -->
@@ -39,9 +42,12 @@
       <VersionNumber>1.0.0.0</VersionNumber>
     </PropertyGroup>
     <AssemblyInfo CodeLanguage="C#"
-      OutputFile="AssemblyVersion.cs" 
+      OutputFile="$(MSBuildThisFileDirectory)/AssemblyVersion.cs" 
       AssemblyVersion="$(VersionNumber)" 
       AssemblyFileVersion="$(VersionNumber)"
     />
+    <CreateItem Include="$(MSBuildThisFileDirectory)/AssemblyVersion.cs">
+      <Output TaskParameter="Include" ItemName="Compile"/>
+    </CreateItem>
   </Target>
 </Project>

diff --git a/dev-dotnet/irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild 
b/dev-dotnet/irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild
index aaa7b01..48893c6 100644
--- a/dev-dotnet/irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild
+++ b/dev-dotnet/irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild
@@ -66,7 +66,7 @@ src_prepare() {
 }
 
 src_compile() {
-       emsbuild /p:SignAssembly=true /p:PublicSign=true 
"/p:AssemblyOriginatorKeyFile=${KEY2}" "/p:OutputName=${PROJECT_OUT}" 
"/p:OutputType=Library" "/p:VersionNumber=${ASSEMBLY_VERSION}" 
"${S}/${PROJECT_PATH}/${PROJECT_NAME}.csproj"
+       emsbuild /p:RootNamespace=Irony /p:SignAssembly=true /p:PublicSign=true 
"/p:AssemblyOriginatorKeyFile=${KEY2}" "/p:OutputName=${PROJECT_OUT}" 
"/p:OutputType=Library" "/p:VersionNumber=${ASSEMBLY_VERSION}" 
"${S}/${PROJECT_PATH}/${PROJECT_NAME}.csproj"
        sn -R "$(output_filename)" "${KEY2}" || die
 }
 

diff --git a/eclass/gac.eclass b/eclass/gac.eclass
index 031dcd8..676d9dc 100644
--- a/eclass/gac.eclass
+++ b/eclass/gac.eclass
@@ -61,7 +61,7 @@ egacdel() {
        if use gac; then
                GACROOT="${PREFIX}/usr/$(get_libdir)"
                GACDIR="/usr/$(get_libdir)/mono/gac"
-               einfo gacutil -u "${PREFIX}/${1}" -root "${GACROOT}" -gacdir 
"${GACDIR}"
+               einfo gacutil -u "${1}" -root "${GACROOT}" -gacdir "${GACDIR}"
                gacutil -u "${1}" \
                        -root ${GACROOT} \
                        -gacdir ${GACDIR}