<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/81d5eed759e881b9625537a871d1f1b30d6d2ab0">https://github.com/macports/macports-ports/commit/81d5eed759e881b9625537a871d1f1b30d6d2ab0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 81d5eed759e881b9625537a871d1f1b30d6d2ab0
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Fri Feb 5 12:03:43 2021 -0700

<span style='display:block; white-space:pre;color:#404040;'>    msbuild: update to 20210115
</span>---
 devel/msbuild/Portfile                        |  19 ++--
 devel/msbuild/files/patch-case-sensitive.diff | 140 --------------------------
 2 files changed, 8 insertions(+), 151 deletions(-)

<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 8d849426afb..8a1cbc63cf4 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;'>@@ -5,8 +5,8 @@ PortGroup               github 1.0
</span> 
 # mono_version is the version of port Mono
 # see https://github.com/mono/mono/blob/mono-${mono_version}/packaging/MacSDK/msbuild.py for version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup            mono msbuild c6ea25c52b1c5c5c142a53674aae2d03952cd136
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version                 20200220
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup            mono msbuild b2c271b4aef21c9b60d33e07161d9a22ca07bbe0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version                 20210115
</span> revision                0
 categories              devel
 platforms               darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,19 +24,16 @@ master_sites-append     https://github.com/mono/msbuild/releases/download/0.08/:
</span> distfiles-append        ${bootstrap_msbuild}.zip:bootstrap
 
 checksums               ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        rmd160  3af1d355d6ec72992397f83e9d73575cb12c0dd8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  249a2b5d843fee45c8f86ec62610d95df2918758477fc9bbb81aca6184b84622 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    9035337 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        rmd160  8d155d37f6ba4ce0c564feec9a876a4970573223 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  092a83ffdfcac9378cede26d559af6abb8c2c776e392f3bbf24e9fc5794d8075 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    9283724 \
</span>                         ${bootstrap_msbuild}.zip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        rmd160  28f672523376c34880fe5f4f32b3f60e0b4a06b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  b38fda1acf3e3abaa82ef4660dfdb7b07bc2165bed547c1c7c4e678ba40e3d71 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    21799773
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        rmd160  4d6d10b0d31c47cd2e7f38946cb1f19cdb664546 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  6f2489c2ff955d2c2ff68d5b198ca841f893960ce86e63a57f2d6f076dc56716 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    21277041
</span> 
 extract.only            ${distname}${extract.suffix}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#see https://trac.macports.org/ticket/59534
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append       patch-case-sensitive.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7ca9544784d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/msbuild/files/patch-case-sensitive.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,140 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d482afec88b303303905958653fa906e65b2a1c2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Ankit Jain <radical@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 18 Oct 2019 14:46:10 +0530
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] [mono] Linux build fixes (#128)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* [mono] Fix casing for `DotNet*` to be consistent and match the file on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.. disk.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* [mono] Remove Microsoft.DotNet.MSBuildSdkResolver on linux for the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.. bootstrap build. This is because it depends on a native lib,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libhostfxr*, which is not present in the bootrap msbuild, which breaks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the resolver and thus the build. Removing this should be fine, because
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-msbuild then just falls back to the bundled SDKs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* [mono] Run the dotnet-install.sh script with `bash` instead of `sh` as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.. it breaks for `set -o pipefail` on ubuntu 16.04 .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* [mono] Skip copying the native lib, libhostfxr* for Linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.. because this might or might not work on whatever distribution we are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-actually building on.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* [mono] Sort both canonical and new files list, as the order can differ
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.. between linux and macOS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eng/cibuild_bootstrapped_msbuild.sh                    | 5 +++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mono/build/extract_and_copy_hostfxr.sh                 | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mono/build/install.proj                                | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mono/build/sdks_and_nugets/dotnet_resolver.proj        | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mono/build/sdks_and_nugets/update_sdks_and_nugets.proj | 9 ++++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mono/build/update_bundled_bits.proj                    | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6 files changed, 16 insertions(+), 8 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/eng/cibuild_bootstrapped_msbuild.sh b/eng/cibuild_bootstrapped_msbuild.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 44d64ce58a..d94bfda7bd 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- eng/cibuild_bootstrapped_msbuild.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ eng/cibuild_bootstrapped_msbuild.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,6 +62,11 @@ function DownloadMSBuildForMono {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     # rename just to make it obvious when reading logs!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     mv $artifacts_dir/msbuild $mono_msbuild_dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     chmod +x $artifacts_dir/mono-msbuild/MSBuild.dll
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    if [[ `uname -s` != 'Darwin' ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        # with no .so available, this ends up breaking the build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        rm -Rf $mono_msbuild_dir/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     rm "$msbuild_zip"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index f4281bd900..d4b70026b7 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mono/build/extract_and_copy_hostfxr.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mono/build/extract_and_copy_hostfxr.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +44,7 @@ OLDCWD=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd $TMPDIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GetDotNetInstallScript $TMPDIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--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:#ffe0e0;'>-+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:#ffe0e0;'>- find $DOTNET_DIR -name libhostfxr.dylib | xargs -I {} cp -v {} $DESTDIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd $OLDCWD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/mono/build/install.proj b/mono/build/install.proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 93f5eeebb2..ed01b27d7c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mono/build/install.proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mono/build/install.proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,11 +186,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         <Exec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             Condition="Exists('$(AllInstalledFiles_FileCanonical)')"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             IgnoreExitCode="$(IgnoreDiffFailure)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            Command="sort -o $(AllInstalledFiles_File) $(AllInstalledFiles_File) ; diff -u $(AllInstalledFiles_FileCanonical) $(AllInstalledFiles_File)" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            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:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         <Exec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             Condition="Exists('$(RemainingFiles_FileCanonical)')"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             IgnoreExitCode="$(IgnoreDiffFailure)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            Command="sort -o $(RemainingFiles_File) $(RemainingFiles_File); diff -u $(RemainingFiles_FileCanonical) $(RemainingFiles_File)" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            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:#ffe0e0;'>-     </Target>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </Project>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 9606cac316..de689ce23d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mono/build/sdks_and_nugets/dotnet_resolver.proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mono/build/sdks_and_nugets/dotnet_resolver.proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           <ItemGroup>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   <FilesToCopy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 Include="$(DependencyNuPkgPath)/lib/net472/**"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                OutputDirectory="$(DotnetSdkResolverDir)" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                OutputDirectory="$(DotNetSdkResolverDir)" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           </ItemGroup>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     </Target>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index c3670ea1d2..9d7db18173 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <Project DefaultTargets="DeploySdksAndNuGets">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     <Import Project="$(MSBuildThisFileDirectory)\..\common.props" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    <Import Project="$(MSBuildThisFileDirectory)\..\DotnetBitsVersions.props" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    <Import Project="$(MSBuildThisFileDirectory)\..\DotNetBitsVersions.props" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     <PropertyGroup>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         <HostOSName Condition="'$(HostOSName)' == ''">osx</HostOSName>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     DependencyPackageName=Microsoft.DotNet.MSBuildSdkResolver;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     DependencyPackageVersion=$(MicrosoftDotNetMSBuildSdkResolverVersion);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     NuGetPackagesDir=$(NuGetPackagesDir);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    DotnetSdkResolverDir=$(MSBuildSdkResolverOutDir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                    DotNetSdkResolverDir=$(MSBuildSdkResolverOutDir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 </Properties>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             </NuGetsToBundle>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         </ItemGroup>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,6 +61,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             Targets="Restore;Build"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             Properties="OutputDirectory=$(DotNetOverlayDirectory)\nuget-support\msbuild-bin"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        <Exec Command="$(MSBuildThisFileDirectory)/../extract_and_copy_hostfxr.sh $(DotNetSdkVersionForLibHostFxr) $(MSBuildSdkResolverOutDir)" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        <!-- Ignoring the .so for linux, because it works on a smaller set of distributions -->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        <Exec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            Condition="'$([MSBuild]::IsOSPlatform(OSX))'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            Command="$(MSBuildThisFileDirectory)/../extract_and_copy_hostfxr.sh $(DotNetSdkVersionForLibHostFxr) $(MSBuildSdkResolverOutDir)" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     </Target>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </Project>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index eb4cee4d72..0f9ebd3a1e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mono/build/update_bundled_bits.proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mono/build/update_bundled_bits.proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <Project DefaultTargets="FetchAndUpdateSdksAndNuGets">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    <Import Project="$(MSBuildThisFileDirectory)\DotnetBitsVersions.props" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    <Import Project="$(MSBuildThisFileDirectory)\DotNetBitsVersions.props" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     <Target Name="Build" DependsOnTargets="FetchAndUpdateSdksAndNuGets" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span></pre><pre style='margin:0'>

</pre>