add aspnetcore backport commit

add the conflicting commit which fixed it to avoid errors
fix copy path
Signed-off-by: Sanjam Panda <sanjam.panda@ibm.com>

Author: saitama951

dotnet-build

@@ -189,8 +189,8 @@ function build_sdk {
     fi
     if [ -z ${SKIP_PACKAGE_SDK+x} ] && [ ! -e .skip-package ]; then
         mkdir -p "$DOWNLOADDIR/Sdk/$SDK_VERSION"
-        if git merge-base --is-ancestor 140ff5e HEAD; then
-            cp "artifacts/packages/Release/NonShipping/dotnet-toolset-internal-$SDK_VERSION-ci.zip" "$DOWNLOADDIR/Sdk/$SDK_VERSION"
+        if ! git merge-base --is-ancestor 140ff5e HEAD; then
+            cp "artifacts/packages/Release/NonShipping/dotnet-toolset-internal-$SDK_VERSION"@(-ci|)".zip" "$DOWNLOADDIR/Sdk/$SDK_VERSION"
         fi
         cp "artifacts/packages/$sdk_conf/Shipping/dotnet-sdk-$SDK_VERSION-linux-$ARCH.tar.gz" "$OUTPUTDIR"
     fi

dotnet-prepare

@@ -170,7 +170,7 @@ function prepare_sdk {
 function prepare_aspnetcore {
     pushd aspnetcore
     # https://github.com/dotnet/aspnetcore/commit/0547a0a2c8341a496ca534661942919a0b154a8f
-    backport 1368813 "../aspnetcore-patches/0001-Update-baseline-SDK-branding.patch"
+    backport 1368813 "../aspnetcore-patches/0001-Update-baseline-SDK-branding.patch 0547a0a2c8341a496ca534661942919a0b154a8f"
     update_nuget_config
     popd
 }