Merge pull request #18844 from jtattermusch/backport_18714

Backport #18714 to v1.20.0x

templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template

@@ -25,12 +25,18 @@
   cp -r /var/local/jenkins/service_account $HOME || true
 
   cd /var/local/git/grpc-dotnet
-  
+
   # If needed, update dotnet SDK and put it on path
   ./build/get-dotnet.sh
-  if [ -f $HOME/.dotnet/dotnet ]
+  # Normally we would source ./activate.sh
+  # to add dotnet to PATH, but that would only
+  # work for the build and not for a subsequent
+  # dotnet run from a different shell,
+  # so we create a symlink instead.
+  # TODO(jtattermusch): Come up with a cleaner solution.
+  if [ -f $(pwd)/.dotnet/dotnet ]
   then
-    ln -s $HOME/.dotnet/dotnet /usr/local/bin/dotnet
+    ln -s $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet
   fi
   
   ./build/get-grpc.sh

tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh

@@ -26,9 +26,15 @@ cd /var/local/git/grpc-dotnet
 
 # If needed, update dotnet SDK and put it on path
 ./build/get-dotnet.sh
-if [ -f $HOME/.dotnet/dotnet ]
+# Normally we would source ./activate.sh
+# to add dotnet to PATH, but that would only
+# work for the build and not for a subsequent
+# dotnet run from a different shell,
+# so we create a symlink instead.
+# TODO(jtattermusch): Come up with a cleaner solution.
+if [ -f $(pwd)/.dotnet/dotnet ]
 then
-  ln -s $HOME/.dotnet/dotnet /usr/local/bin/dotnet
+  ln -s $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet
 fi
 
 ./build/get-grpc.sh