| 1 |
commit: f6bb8d55eb4bbcc5d5206b19c9ba289f9d2b22b4 |
| 2 |
Author: ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com> |
| 3 |
AuthorDate: Fri Oct 13 15:14:36 2017 +0000 |
| 4 |
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 13 15:14:36 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=f6bb8d55 |
| 7 |
|
| 8 |
version and resources added |
| 9 |
|
| 10 |
app-shells/pash/pash-0.0_p2016060606.ebuild | 7 ++----- |
| 11 |
dev-dotnet/irony-daxnet/files/template.csproj | 12 +++++++++--- |
| 12 |
.../irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild | 2 +- |
| 13 |
eclass/gac.eclass | 2 +- |
| 14 |
4 files changed, 13 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-shells/pash/pash-0.0_p2016060606.ebuild b/app-shells/pash/pash-0.0_p2016060606.ebuild |
| 17 |
index dc9136e..162685b 100644 |
| 18 |
--- a/app-shells/pash/pash-0.0_p2016060606.ebuild |
| 19 |
+++ b/app-shells/pash/pash-0.0_p2016060606.ebuild |
| 20 |
@@ -33,7 +33,7 @@ DEPEND="${CDEPEND} |
| 21 |
|
| 22 |
PROJECT1_PATH=Source/System.Management |
| 23 |
PROJECT1_NAME=System.Management |
| 24 |
-PROJECT1_OUT=System.Management |
| 25 |
+PROJECT1_OUT=System.Management.Automation |
| 26 |
|
| 27 |
PROJECT2_PATH=Source/Microsoft.PowerShell.Security |
| 28 |
PROJECT2_NAME=Microsoft.PowerShell.Security |
| 29 |
@@ -52,6 +52,7 @@ PROJECT5_NAME=PashConsole |
| 30 |
PROJECT5_OUT=Pash |
| 31 |
|
| 32 |
src_prepare() { |
| 33 |
+ sed -i "s/new Version(1, 0, 0, 0)/System.Reflection.Assembly.GetExecutingAssembly().GetName().Version/" Source/System.Management/Pash/Implementation/LocalHost.cs || die |
| 34 |
sed -i "/Version/d" "${S}/${PROJECT1_PATH}/Properties/AssemblyInfo.cs" || die |
| 35 |
sed -i "/Version/d" "${S}/${PROJECT2_PATH}/Properties/AssemblyInfo.cs" || die |
| 36 |
sed -i "/Version/d" "${S}/${PROJECT3_PATH}/Properties/AssemblyInfo.cs" || die |
| 37 |
@@ -84,10 +85,6 @@ src_prepare() { |
| 38 |
} |
| 39 |
|
| 40 |
src_compile() { |
| 41 |
- #emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" |
| 42 |
- #emsbuild "/p:AssemblyName=${PROJECT2_OUT}" "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" |
| 43 |
- #emsbuild "/p:AssemblyName=${PROJECT3_OUT}" "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" |
| 44 |
- #emsbuild "/p:AssemblyName=${PROJECT4_OUT}" "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" |
| 45 |
emsbuild "/p:VersionNumber=1.0.2016.606" "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" |
| 46 |
} |
| 47 |
|
| 48 |
|
| 49 |
diff --git a/dev-dotnet/irony-daxnet/files/template.csproj b/dev-dotnet/irony-daxnet/files/template.csproj |
| 50 |
index 9c49b91..07558fb 100644 |
| 51 |
--- a/dev-dotnet/irony-daxnet/files/template.csproj |
| 52 |
+++ b/dev-dotnet/irony-daxnet/files/template.csproj |
| 53 |
@@ -6,6 +6,7 @@ |
| 54 |
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> |
| 55 |
<AssemblyName>$(AssemblyName)</AssemblyName> |
| 56 |
<OutputType>$(OutputType)</OutputType> |
| 57 |
+ <RootNamespace>$(RootNamespace)</RootNamespace> |
| 58 |
</PropertyGroup> |
| 59 |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
| 60 |
<OutputPath>bin\Debug</OutputPath> |
| 61 |
@@ -26,8 +27,10 @@ |
| 62 |
<!-- Reference --> |
| 63 |
</ItemGroup> |
| 64 |
<ItemGroup> |
| 65 |
- <Compile Include="**/*.cs" /> |
| 66 |
- <Compile Include="AssemblyVersion.cs" /> |
| 67 |
+ <Compile Include="**/*.cs" Exclude="AssemblyVersion.cs" /> |
| 68 |
+ </ItemGroup> |
| 69 |
+ <ItemGroup> |
| 70 |
+ <EmbeddedResource Include="**/*.resx" /> |
| 71 |
</ItemGroup> |
| 72 |
<ItemGroup> |
| 73 |
<!-- ProjectReference --> |
| 74 |
@@ -39,9 +42,12 @@ |
| 75 |
<VersionNumber>1.0.0.0</VersionNumber> |
| 76 |
</PropertyGroup> |
| 77 |
<AssemblyInfo CodeLanguage="C#" |
| 78 |
- OutputFile="AssemblyVersion.cs" |
| 79 |
+ OutputFile="$(MSBuildThisFileDirectory)/AssemblyVersion.cs" |
| 80 |
AssemblyVersion="$(VersionNumber)" |
| 81 |
AssemblyFileVersion="$(VersionNumber)" |
| 82 |
/> |
| 83 |
+ <CreateItem Include="$(MSBuildThisFileDirectory)/AssemblyVersion.cs"> |
| 84 |
+ <Output TaskParameter="Include" ItemName="Compile"/> |
| 85 |
+ </CreateItem> |
| 86 |
</Target> |
| 87 |
</Project> |
| 88 |
|
| 89 |
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 |
| 90 |
index aaa7b01..48893c6 100644 |
| 91 |
--- a/dev-dotnet/irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild |
| 92 |
+++ b/dev-dotnet/irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild |
| 93 |
@@ -66,7 +66,7 @@ src_prepare() { |
| 94 |
} |
| 95 |
|
| 96 |
src_compile() { |
| 97 |
- 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" |
| 98 |
+ 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" |
| 99 |
sn -R "$(output_filename)" "${KEY2}" || die |
| 100 |
} |
| 101 |
|
| 102 |
|
| 103 |
diff --git a/eclass/gac.eclass b/eclass/gac.eclass |
| 104 |
index 031dcd8..676d9dc 100644 |
| 105 |
--- a/eclass/gac.eclass |
| 106 |
+++ b/eclass/gac.eclass |
| 107 |
@@ -61,7 +61,7 @@ egacdel() { |
| 108 |
if use gac; then |
| 109 |
GACROOT="${PREFIX}/usr/$(get_libdir)" |
| 110 |
GACDIR="/usr/$(get_libdir)/mono/gac" |
| 111 |
- einfo gacutil -u "${PREFIX}/${1}" -root "${GACROOT}" -gacdir "${GACDIR}" |
| 112 |
+ einfo gacutil -u "${1}" -root "${GACROOT}" -gacdir "${GACDIR}" |
| 113 |
gacutil -u "${1}" \ |
| 114 |
-root ${GACROOT} \ |
| 115 |
-gacdir ${GACDIR} |
Archives