[arch-commits] Commit in mono-msbuild/repos (7 files)
Maxime Gauduin
alucryd at archlinux.org
Tue Mar 16 08:45:00 UTC 2021
Date: Tuesday, March 16, 2021 @ 08:44:59
Author: alucryd
Revision: 891754
archrelease: copy trunk to community-staging-x86_64
Added:
mono-msbuild/repos/community-staging-x86_64/
mono-msbuild/repos/community-staging-x86_64/PKGBUILD
(from rev 891753, mono-msbuild/trunk/PKGBUILD)
mono-msbuild/repos/community-staging-x86_64/mono-msbuild-dead-urls.patch
(from rev 891753, mono-msbuild/trunk/mono-msbuild-dead-urls.patch)
mono-msbuild/repos/community-staging-x86_64/mono-msbuild-dotnetbits-case.patch
(from rev 891753, mono-msbuild/trunk/mono-msbuild-dotnetbits-case.patch)
mono-msbuild/repos/community-staging-x86_64/mono-msbuild-license-case.patch
(from rev 891753, mono-msbuild/trunk/mono-msbuild-license-case.patch)
mono-msbuild/repos/community-staging-x86_64/mono-msbuild-no-hostfxr.patch
(from rev 891753, mono-msbuild/trunk/mono-msbuild-no-hostfxr.patch)
mono-msbuild/repos/community-staging-x86_64/mono-msbuild-use-bash.patch
(from rev 891753, mono-msbuild/trunk/mono-msbuild-use-bash.patch)
------------------------------------+
PKGBUILD | 83 +++++++++++++++++++++++++++++++++++
mono-msbuild-dead-urls.patch | 41 +++++++++++++++++
mono-msbuild-dotnetbits-case.patch | 23 +++++++++
mono-msbuild-license-case.patch | 58 ++++++++++++++++++++++++
mono-msbuild-no-hostfxr.patch | 11 ++++
mono-msbuild-use-bash.patch | 42 +++++++++++++++++
6 files changed, 258 insertions(+)
Copied: mono-msbuild/repos/community-staging-x86_64/PKGBUILD (from rev 891753, mono-msbuild/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2021-03-16 08:44:59 UTC (rev 891754)
@@ -0,0 +1,83 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Florian Maunier <fmauneko at dissidence.ovh>
+# Contributor: jtmb <packaging at technologicalwizardry dot com>
+
+pkgbase=mono-msbuild
+pkgname=(
+ mono-msbuild
+ mono-msbuild-sdkresolver
+)
+pkgver=16.8.xamarinxplat.2020.07.30.15.02
+pkgrel=2
+pkgdesc='Xamarin implementation of the Microsoft build system'
+arch=(x86_64)
+url=https://github.com/mono/linux-packaging-msbuild
+license=(MIT)
+depends=(mono)
+makedepends=(
+ bash
+ git
+ dotnet-sdk
+ unzip
+)
+_tag=341aa916b0ba580e9d50fc0d00ce60e20a7e4a08
+source=(
+ mono-msbuild::git+https://github.com/mono/linux-packaging-msbuild#tag=${_tag}
+ mono-msbuild-license-case.patch
+ mono-msbuild-use-bash.patch
+ mono-msbuild-dead-urls.patch
+)
+b2sums=('SKIP'
+ '0eca24ffd366836975c722b32016bf734c73ae0906d2e81c9bdfce00338c0df655a8a98126049af2b59e23ef1f5bfa9bc0d531b9b0de6646388170e30a219241'
+ 'c495053e8d02b7bfcc199650ab947eb2f9198ea49ab07702e17ca10d7834e9fd62ad039fd4187116b25305d78d2676fb1e317251ca6b1e48e5172ca09623f171'
+ '8a8691c99a30bb5caea8be376465f550438a5eba228a86a3ba90e86bda2f432a7380e525c8c8b4df6c746b44a387a75076c85e01397389ff6aa219dc2f425e1f')
+
+pkgver() {
+ cd mono-msbuild
+
+ git describe --tags | sed 's/.*\///; s/+/./'
+}
+
+prepare() {
+ cd mono-msbuild
+
+ patch -Np1 -i ../mono-msbuild-license-case.patch
+ patch -Np1 -i ../mono-msbuild-use-bash.patch
+ patch -Np1 -i ../mono-msbuild-dead-urls.patch
+}
+
+build() {
+ cd mono-msbuild
+
+ export DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=/opt/dotnet
+ ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true
+ ./stage1/mono-msbuild/msbuild mono/build/install.proj /p:MonoInstallPrefix="${srcdir}"/target/usr /p:Configuration=Release-MONO /p:IgnoreDiffFailure=true
+ sed "s@${srcdir}/target@@g" -i "${srcdir}"/target/usr/bin/msbuild
+ find "${srcdir}"/target/usr/lib/mono/ -name Microsoft.DiaSymReader.Native.*dll -delete
+ find "${srcdir}"/target/usr/lib/mono/ -name *.dylib -delete
+ find "${srcdir}"/target/usr/lib/mono/ -name *.so -delete
+}
+
+package_mono-msbuild() {
+ conflicts=(msbuild)
+ provides=(msbuild)
+
+ cp -dr --no-preserve=ownership target/usr "${pkgdir}"/
+ rm -rf "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver
+ find "${pkgdir}" -name *.pdb -delete
+}
+
+package_mono-msbuild-sdkresolver() {
+ depends=(
+ mono-msbuild
+ dotnet-host
+ )
+ conflicts=(msbuild-sdkresolver)
+ provides=(msbuild-sdkresolver)
+
+ install -dm 755 "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers
+ cp -dr --no-preserve=ownership target/usr/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver "${pkgdir}"/usr/lib/mono/msbuild/Current/bin/SdkResolvers/
+ find "${pkgdir}" -name *.pdb -delete
+}
+
+# vim: ts=2 sw=2 et:
Copied: mono-msbuild/repos/community-staging-x86_64/mono-msbuild-dead-urls.patch (from rev 891753, mono-msbuild/trunk/mono-msbuild-dead-urls.patch)
===================================================================
--- community-staging-x86_64/mono-msbuild-dead-urls.patch (rev 0)
+++ community-staging-x86_64/mono-msbuild-dead-urls.patch 2021-03-16 08:44:59 UTC (rev 891754)
@@ -0,0 +1,41 @@
+From e2e4dfee543269ccb0a459263985b1c993feacec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger at outlook.com>
+Date: Fri, 15 Jan 2021 12:39:49 +0100
+Subject: [PATCH] Remove myget feeds and replace with AzDO feeds
+
+---
+ NuGet.config | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/NuGet.config b/NuGet.config
+index 739b645cb7..ae05fb7e65 100644
+--- a/NuGet.config
++++ b/NuGet.config
+@@ -2,23 +2,11 @@
+ <configuration>
+ <packageSources>
+ <clear />
+- <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+- <add key="darc-pub-dotnet-aspnetcore-tooling-5ecfad7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-5ecfad7e/nuget/v3/index.json" />
+- <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
+- <add key="aspnetcore-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
+- <add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
+- <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+- <add key="dotnet-core2" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+- <add key="container-tools" value="https://www.myget.org/F/container-tools-for-visual-studio/api/v3/index.json" />
+- <add key="linux-musl-bootstrap-feed" value="https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180420-03/aspnet-inputs/index.json" />
+- <add key="dotnet-msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
+ <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+ <add key="arcade" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+ <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+- <add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
+- <add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
+- <add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
+- <add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
+ <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
++ <add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
+ </packageSources>
+-</configuration>
++ <disabledPackageSources />
++</configuration>
+\ No newline at end of file
Copied: mono-msbuild/repos/community-staging-x86_64/mono-msbuild-dotnetbits-case.patch (from rev 891753, mono-msbuild/trunk/mono-msbuild-dotnetbits-case.patch)
===================================================================
--- community-staging-x86_64/mono-msbuild-dotnetbits-case.patch (rev 0)
+++ community-staging-x86_64/mono-msbuild-dotnetbits-case.patch 2021-03-16 08:44:59 UTC (rev 891754)
@@ -0,0 +1,23 @@
+Index: xamarin-pkg-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
+===================================================================
+--- xamarin-pkg-msbuild.orig/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
++++ xamarin-pkg-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
+@@ -1,6 +1,6 @@
+ <Project DefaultTargets="DeploySdksAndNuGets">
+ <Import Project="$(MSBuildThisFileDirectory)\..\common.props" />
+- <Import Project="$(MSBuildThisFileDirectory)\..\DotnetBitsVersions.props" />
++ <Import Project="$(MSBuildThisFileDirectory)\..\DotNetBitsVersions.props" />
+
+ <PropertyGroup>
+ <HostOSName Condition="'$(HostOSName)' == ''">osx</HostOSName>
+Index: xamarin-pkg-msbuild/mono/build/update_bundled_bits.proj
+===================================================================
+--- xamarin-pkg-msbuild.orig/mono/build/update_bundled_bits.proj
++++ xamarin-pkg-msbuild/mono/build/update_bundled_bits.proj
+@@ -1,5 +1,5 @@
+ <Project DefaultTargets="FetchAndUpdateSdksAndNuGets">
+- <Import Project="$(MSBuildThisFileDirectory)\DotnetBitsVersions.props" />
++ <Import Project="$(MSBuildThisFileDirectory)\DotNetBitsVersions.props" />
+
+ <Target Name="Build" DependsOnTargets="FetchAndUpdateSdksAndNuGets" />
+
Copied: mono-msbuild/repos/community-staging-x86_64/mono-msbuild-license-case.patch (from rev 891753, mono-msbuild/trunk/mono-msbuild-license-case.patch)
===================================================================
--- community-staging-x86_64/mono-msbuild-license-case.patch (rev 0)
+++ community-staging-x86_64/mono-msbuild-license-case.patch 2021-03-16 08:44:59 UTC (rev 891754)
@@ -0,0 +1,58 @@
+Index: xamarin-pkg-msbuild/LICENSE
+===================================================================
+--- xamarin-pkg-msbuild.orig/LICENSE
++++ /dev/null
+@@ -1,24 +0,0 @@
+-The MIT License (MIT)
+-
+-Copyright (c) .NET Foundation and contributors
+-
+-All rights reserved.
+-
+-Permission is hereby granted, free of charge, to any person obtaining a copy
+-of this software and associated documentation files (the "Software"), to deal
+-in the Software without restriction, including without limitation the rights
+-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-copies of the Software, and to permit persons to whom the Software is
+-furnished to do so, subject to the following conditions:
+-
+-The above copyright notice and this permission notice shall be included in all
+-copies or substantial portions of the Software.
+-
+-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-SOFTWARE.
+-
+Index: xamarin-pkg-msbuild/license
+===================================================================
+--- /dev/null
++++ xamarin-pkg-msbuild/license
+@@ -0,0 +1,24 @@
++The MIT License (MIT)
++
++Copyright (c) .NET Foundation and contributors
++
++All rights reserved.
++
++Permission is hereby granted, free of charge, to any person obtaining a copy
++of this software and associated documentation files (the "Software"), to deal
++in the Software without restriction, including without limitation the rights
++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++copies of the Software, and to permit persons to whom the Software is
++furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in all
++copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++SOFTWARE.
++
Copied: mono-msbuild/repos/community-staging-x86_64/mono-msbuild-no-hostfxr.patch (from rev 891753, mono-msbuild/trunk/mono-msbuild-no-hostfxr.patch)
===================================================================
--- community-staging-x86_64/mono-msbuild-no-hostfxr.patch (rev 0)
+++ community-staging-x86_64/mono-msbuild-no-hostfxr.patch 2021-03-16 08:44:59 UTC (rev 891754)
@@ -0,0 +1,11 @@
+diff -rupN mono-msbuild.orig/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj mono-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
+--- mono-msbuild.orig/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj 2020-07-03 19:37:07.112979921 +0200
++++ mono-msbuild/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj 2020-07-03 19:37:59.966877151 +0200
+@@ -61,7 +61,6 @@
+ Targets="Restore;Build"
+ Properties="OutputDirectory=$(DotNetOverlayDirectory)\nuget-support\msbuild-bin"/>
+
+- <Exec Command="$(MSBuildThisFileDirectory)/../extract_and_copy_hostfxr.sh $(DotNetSdkVersionForLibHostFxr) $(MSBuildSdkResolverOutDir)" />
+ <Exec Command="$(MSBuildThisFileDirectory)/../get_sdk_files.sh $(DotNetOverlayDirectory)\msbuild-bin" />
+ </Target>
+ </Project>
Copied: mono-msbuild/repos/community-staging-x86_64/mono-msbuild-use-bash.patch (from rev 891753, mono-msbuild/trunk/mono-msbuild-use-bash.patch)
===================================================================
--- community-staging-x86_64/mono-msbuild-use-bash.patch (rev 0)
+++ community-staging-x86_64/mono-msbuild-use-bash.patch 2021-03-16 08:44:59 UTC (rev 891754)
@@ -0,0 +1,42 @@
+Index: xamarin-pkg-msbuild/gen_build_info.sh
+===================================================================
+--- xamarin-pkg-msbuild.orig/gen_build_info.sh
++++ xamarin-pkg-msbuild/gen_build_info.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ if [ $# -ne 1 ]; then
+ echo "Usage: $0 <filename.cs>"
+Index: xamarin-pkg-msbuild/mono/create_bootstrap.sh
+===================================================================
+--- xamarin-pkg-msbuild.orig/mono/create_bootstrap.sh
++++ xamarin-pkg-msbuild/mono/create_bootstrap.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ # This creates a bootstrap from an exising mono installation
+ # This is just to ensure that we have the correct "matched" Roslyn
+Index: xamarin-pkg-msbuild/msbuild-deploy.in
+===================================================================
+--- xamarin-pkg-msbuild.orig/msbuild-deploy.in
++++ xamarin-pkg-msbuild/msbuild-deploy.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ ABSOLUTE_PATH=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)/`basename "${BASH_SOURCE[0]}"`
+ MSBUILD_SRC_DIR=`dirname $ABSOLUTE_PATH`
+ mono $MONO_OPTIONS $MSBUILD_SRC_DIR/MSBuild.exe $*
+Index: xamarin-pkg-msbuild/eng/cibuild_bootstrapped_msbuild.sh
+===================================================================
+--- xamarin-pkg-msbuild.orig/eng/cibuild_bootstrapped_msbuild.sh
++++ xamarin-pkg-msbuild/eng/cibuild_bootstrapped_msbuild.sh
+@@ -56,6 +56,7 @@ function DownloadMSBuildForMono {
+ unzip -q "$msbuild_zip" -d "$artifacts_dir"
+ # rename just to make it obvious when reading logs!
+ mv $artifacts_dir/msbuild $mono_msbuild_dir
++ sed -i 's#/sh$#/bash#' $artifacts_dir/mono-msbuild/msbuild
+ chmod +x $artifacts_dir/mono-msbuild/MSBuild.dll
+ rm "$msbuild_zip"
+ fi
More information about the arch-commits
mailing list