<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3e4ea5dbd4e25733b97be39c8f40eb9ed4ec4448">https://github.com/macports/macports-ports/commit/3e4ea5dbd4e25733b97be39c8f40eb9ed4ec4448</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3e4ea5d msbuild: fix build on case-sensitive file systems
</span>3e4ea5d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3e4ea5dbd4e25733b97be39c8f40eb9ed4ec4448
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Dec 26 07:29:00 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> msbuild: fix build on case-sensitive file systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/59534
</span>---
devel/msbuild/Portfile | 5 +-
devel/msbuild/files/patch-case-sensitive.diff | 140 ++++++++++++++++++++++++++
2 files changed, 144 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/msbuild/Portfile b/devel/msbuild/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b35e55e..cf2825d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/msbuild/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/msbuild/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup github 1.0
</span> # see https://github.com/mono/mono/blob/mono-${mono_version}/packaging/MacSDK/msbuild.py for version
github.setup mono msbuild 619cbd0171a356dfbf5a526b8bee62071e22e9e8
version 20191127
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
platforms darwin
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,9 @@ checksums ${distname}${extract.suffix} \
</span>
extract.only ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#see https://trac.macports.org/ticket/59534
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-case-sensitive.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-extract {
# replicate the code in function DownloadMSBuildForMono found in file eng/cibuild_bootstrapped_msbuild.sh
xinstall -d -m 0755 ${worksrcpath}/artifacts
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/msbuild/files/patch-case-sensitive.diff b/devel/msbuild/files/patch-case-sensitive.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7ca9544
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/msbuild/files/patch-case-sensitive.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,140 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d482afec88b303303905958653fa906e65b2a1c2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ankit Jain <radical@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 18 Oct 2019 14:46:10 +0530
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [mono] Linux build fixes (#128)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* [mono] Fix casing for `DotNet*` to be consistent and match the file on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.. disk.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* [mono] Remove Microsoft.DotNet.MSBuildSdkResolver on linux for the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.. bootstrap build. This is because it depends on a native lib,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libhostfxr*, which is not present in the bootrap msbuild, which breaks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the resolver and thus the build. Removing this should be fine, because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+msbuild then just falls back to the bundled SDKs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* [mono] Run the dotnet-install.sh script with `bash` instead of `sh` as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.. it breaks for `set -o pipefail` on ubuntu 16.04 .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* [mono] Skip copying the native lib, libhostfxr* for Linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.. because this might or might not work on whatever distribution we are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+actually building on.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* [mono] Sort both canonical and new files list, as the order can differ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.. between linux and macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eng/cibuild_bootstrapped_msbuild.sh | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mono/build/extract_and_copy_hostfxr.sh | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mono/build/install.proj | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mono/build/sdks_and_nugets/dotnet_resolver.proj | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mono/build/sdks_and_nugets/update_sdks_and_nugets.proj | 9 ++++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mono/build/update_bundled_bits.proj | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6 files changed, 16 insertions(+), 8 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/eng/cibuild_bootstrapped_msbuild.sh b/eng/cibuild_bootstrapped_msbuild.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 44d64ce58a..d94bfda7bd 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- eng/cibuild_bootstrapped_msbuild.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ eng/cibuild_bootstrapped_msbuild.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,6 +62,11 @@ function DownloadMSBuildForMono {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rename just to make it obvious when reading logs!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mv $artifacts_dir/msbuild $mono_msbuild_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod +x $artifacts_dir/mono-msbuild/MSBuild.dll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [[ `uname -s` != 'Darwin' ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # with no .so available, this ends up breaking the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -Rf $mono_msbuild_dir/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm "$msbuild_zip"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/mono/build/extract_and_copy_hostfxr.sh b/mono/build/extract_and_copy_hostfxr.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f4281bd900..d4b70026b7 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mono/build/extract_and_copy_hostfxr.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mono/build/extract_and_copy_hostfxr.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@ OLDCWD=`pwd`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $TMPDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetDotNetInstallScript $TMPDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-sh ./dotnet-install.sh --version $1 --install-dir $DOTNET_DIR --architecture x64 --runtime dotnet --skip-non-versioned-files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bash ./dotnet-install.sh --version $1 --install-dir $DOTNET_DIR --architecture x64 --runtime dotnet --skip-non-versioned-files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find $DOTNET_DIR -name libhostfxr.dylib | xargs -I {} cp -v {} $DESTDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $OLDCWD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/mono/build/install.proj b/mono/build/install.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 93f5eeebb2..ed01b27d7c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mono/build/install.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mono/build/install.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,11 +186,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <Exec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Condition="Exists('$(AllInstalledFiles_FileCanonical)')"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IgnoreExitCode="$(IgnoreDiffFailure)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Command="sort -o $(AllInstalledFiles_File) $(AllInstalledFiles_File) ; diff -u $(AllInstalledFiles_FileCanonical) $(AllInstalledFiles_File)" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Command="sort -o $(AllInstalledFiles_FileCanonical) $(AllInstalledFiles_FileCanonical) ; sort -o $(AllInstalledFiles_File) $(AllInstalledFiles_File) ; diff -u $(AllInstalledFiles_FileCanonical) $(AllInstalledFiles_File)" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <Exec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Condition="Exists('$(RemainingFiles_FileCanonical)')"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IgnoreExitCode="$(IgnoreDiffFailure)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Command="sort -o $(RemainingFiles_File) $(RemainingFiles_File); diff -u $(RemainingFiles_FileCanonical) $(RemainingFiles_File)" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Command="sort -o $(RemainingFiles_FileCanonical) $(RemainingFiles_FileCanonical) ; sort -o $(RemainingFiles_File) $(RemainingFiles_File); diff -u $(RemainingFiles_FileCanonical) $(RemainingFiles_File)" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </Target>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </Project>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/mono/build/sdks_and_nugets/dotnet_resolver.proj b/mono/build/sdks_and_nugets/dotnet_resolver.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9606cac316..de689ce23d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mono/build/sdks_and_nugets/dotnet_resolver.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mono/build/sdks_and_nugets/dotnet_resolver.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <ItemGroup>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <FilesToCopy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Include="$(DependencyNuPkgPath)/lib/net472/**"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OutputDirectory="$(DotnetSdkResolverDir)" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OutputDirectory="$(DotNetSdkResolverDir)" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </ItemGroup>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </Target>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj b/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c3670ea1d2..9d7db18173 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <Project DefaultTargets="DeploySdksAndNuGets">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <Import Project="$(MSBuildThisFileDirectory)\..\common.props" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <Import Project="$(MSBuildThisFileDirectory)\..\DotnetBitsVersions.props" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <Import Project="$(MSBuildThisFileDirectory)\..\DotNetBitsVersions.props" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <PropertyGroup>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <HostOSName Condition="'$(HostOSName)' == ''">osx</HostOSName>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DependencyPackageName=Microsoft.DotNet.MSBuildSdkResolver;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DependencyPackageVersion=$(MicrosoftDotNetMSBuildSdkResolverVersion);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NuGetPackagesDir=$(NuGetPackagesDir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DotnetSdkResolverDir=$(MSBuildSdkResolverOutDir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DotNetSdkResolverDir=$(MSBuildSdkResolverOutDir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </Properties>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </NuGetsToBundle>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </ItemGroup>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,6 +61,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Targets="Restore;Build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Properties="OutputDirectory=$(DotNetOverlayDirectory)\nuget-support\msbuild-bin"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <Exec Command="$(MSBuildThisFileDirectory)/../extract_and_copy_hostfxr.sh $(DotNetSdkVersionForLibHostFxr) $(MSBuildSdkResolverOutDir)" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <!-- Ignoring the .so for linux, because it works on a smaller set of distributions -->
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <Exec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Condition="'$([MSBuild]::IsOSPlatform(OSX))'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Command="$(MSBuildThisFileDirectory)/../extract_and_copy_hostfxr.sh $(DotNetSdkVersionForLibHostFxr) $(MSBuildSdkResolverOutDir)" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </Target>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </Project>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/mono/build/update_bundled_bits.proj b/mono/build/update_bundled_bits.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index eb4cee4d72..0f9ebd3a1e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mono/build/update_bundled_bits.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mono/build/update_bundled_bits.proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <Project DefaultTargets="FetchAndUpdateSdksAndNuGets">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <Import Project="$(MSBuildThisFileDirectory)\DotnetBitsVersions.props" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <Import Project="$(MSBuildThisFileDirectory)\DotNetBitsVersions.props" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <Target Name="Build" DependsOnTargets="FetchAndUpdateSdksAndNuGets" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>