diff options
| author |   ArsenShnurkov <ArsenShnurkov@users.noreply.github.com> | 2018-01-29 20:36:42 +0300 |
|---|---|---|
| committer | ArsenShnurkov <ArsenShnurkov@users.noreply.github.com> | 2018-01-29 20:36:42 +0300 |
| commit | c3f93fbf0df88628c7e4c5b26e41f0f47747ecf9 (patch) | |
| tree | 7b166f5989a24c1ec2ccb41936e5d303c55500f9 /dev-util | |
| parent | Merge pull request #365 from madsl/master (diff) | |
| download | dotnet-c3f93fbf0df88628c7e4c5b26e41f0f47747ecf9.tar.gz dotnet-c3f93fbf0df88628c7e4c5b26e41f0f47747ecf9.tar.bz2 dotnet-c3f93fbf0df88628c7e4c5b26e41f0f47747ecf9.zip | |
dependency removed, version fixed
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/msbuild/files/mono-MSBuild.csproj | 16 | ||||
| -rw-r--r-- | dev-util/msbuild/files/mono-Microsoft.Build.csproj | 16 | ||||
| -rw-r--r-- | dev-util/msbuild/msbuild-15.3-r3.ebuild (renamed from dev-util/msbuild/msbuild-15.3-r2.ebuild) | 6 |
3 files changed, 29 insertions, 9 deletions
diff --git a/dev-util/msbuild/files/mono-MSBuild.csproj b/dev-util/msbuild/files/mono-MSBuild.csproj index e3134a1..d442f00 100644 --- a/dev-util/msbuild/files/mono-MSBuild.csproj +++ b/dev-util/msbuild/files/mono-MSBuild.csproj @@ -181,11 +181,21 @@ </Reference> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" /> <Target Name="BeforeBuild"> <PropertyGroup Condition=" '$(VersionNumber)' == '' "> - <VersionNumber>15.3</VersionNumber> + <VersionNumber>15.3.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> </Project> diff --git a/dev-util/msbuild/files/mono-Microsoft.Build.csproj b/dev-util/msbuild/files/mono-Microsoft.Build.csproj index 1501cb1..20892e1 100644 --- a/dev-util/msbuild/files/mono-Microsoft.Build.csproj +++ b/dev-util/msbuild/files/mono-Microsoft.Build.csproj @@ -624,11 +624,21 @@ <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" /> <Target Name="BeforeBuild"> <PropertyGroup Condition=" '$(VersionNumber)' == '' "> - <VersionNumber>15.3</VersionNumber> + <VersionNumber>15.3.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> </Project> diff --git a/dev-util/msbuild/msbuild-15.3-r2.ebuild b/dev-util/msbuild/msbuild-15.3-r3.ebuild index 8f0e41a..b6768b0 100644 --- a/dev-util/msbuild/msbuild-15.3-r2.ebuild +++ b/dev-util/msbuild/msbuild-15.3-r3.ebuild @@ -10,7 +10,7 @@ SLOT="0" USE_DOTNET="net46" IUSE="+${USE_DOTNET} +gac developer debug doc +roslyn" -inherit dotnet gac +inherit dotnet xbuild gac GITHUB_ACCOUNT="mono" GITHUB_PROJECTNAME="linux-packaging-msbuild" @@ -32,7 +32,6 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} dev-dotnet/buildtools - >=dev-dotnet/msbuildtasks-1.5.0.240-r1 " KEY2="${DISTDIR}/mono.snk" @@ -42,6 +41,8 @@ PROJ1_DIR=src/Build PROJ2=MSBuild PROJ2_DIR=src/MSBuild +VER=15.3.0.0 + src_prepare() { eapply "${FILESDIR}/dir.props.diff" eapply "${FILESDIR}/dir.targets.diff" @@ -76,7 +77,6 @@ src_compile() { fi fi - VER=1.0.27.0 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" sn -R "${PROJ1_DIR}/bin/${CONFIGURATION}/${PROJ1}.dll" "${KEY2}" || die |